Skip to content

Commit 1996454

Browse files
committed
Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC 64-bit updates from Arnd Bergmann: "Changes to platform code for 64-bit ARM platforms. Andreas Färber adds two new platforms with initial code: Realtek RTD1295 and Action Semi S900. Both are fairly similar chips, used mainly in set-top-boxes, but with other possible applications, and additional members in the respective product families that could be added in the future. The code here is fairly minimal, as all the interesting parts are in device drivers and dts files. The Broadcom Vulcan platform gets dropped, as no products ever became available, and Cavium integrated the platform under a new name. Among some other defconfig changes, Timur Tabi enables a number of options that are typically required for server platforms" * tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: arm64: defconfig: remove duplicate entry arm64: defconfig: enable Qualcomm Technologies EMAC and some PHY drivers arm64: defconfig: enable QCOM_L2_PMU and QCOM_L3_PMU arm64: defconfig: enable EDAC options arm64: defconfig: enable APEI and GHES features arm64: defconfig: enable support for PCIe hotplug arm64: defconfig: enable EFI_CAPSULE_LOADER arm64: defconfig: enable BLK_DEV_NVME arm64: defconfig: enable ACPI_CPPC_CPUFREQ arm64: marvell: enable ICU and GICP drivers arm64: marvell: enable the Armada 7K/8K pinctrl driver arm64: Prepare Actions Semi S900 ARM64: defconfig: enable meson SPICC as module ARM64: defconfig: enable IR core, decoders and Meson IR device arm64: defconfig: enable Simple Sound Card support arm64: defconfig: Enable ARCH_BRCMSTB arm64: defconfig: drop ARCH_VULCAN arm64: disable Broadcom Vulcan platform MAINTAINERS: Add Realtek section ARM64: Prepare Realtek RTD1295
2 parents a9ceea2 + 96f6302 commit 1996454

File tree

3 files changed

+48
-6
lines changed

3 files changed

+48
-6
lines changed

MAINTAINERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1697,6 +1697,13 @@ M: Lennert Buytenhek <[email protected]>
16971697
L: [email protected] (moderated for non-subscribers)
16981698
S: Maintained
16991699

1700+
ARM/REALTEK ARCHITECTURE
1701+
M: Andreas Färber <[email protected]>
1702+
L: [email protected] (moderated for non-subscribers)
1703+
S: Maintained
1704+
F: arch/arm64/boot/dts/realtek/
1705+
F: Documentation/devicetree/bindings/arm/realtek.txt
1706+
17001707
ARM/RENESAS ARM64 ARCHITECTURE
17011708
M: Simon Horman <[email protected]>
17021709
M: Magnus Damm <[email protected]>

arch/arm64/Kconfig.platforms

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
menu "Platform selection"
22

3+
config ARCH_ACTIONS
4+
bool "Actions Semi Platforms"
5+
select OWL_TIMER
6+
help
7+
This enables support for the Actions Semiconductor S900 SoC family.
8+
39
config ARCH_SUNXI
410
bool "Allwinner sunxi 64-bit SoC Family"
511
select ARCH_HAS_RESET_CONTROLLER
@@ -108,11 +114,15 @@ config ARCH_MVEBU
108114
select ARMADA_37XX_CLK
109115
select GPIOLIB
110116
select GPIOLIB_IRQCHIP
117+
select MVEBU_GICP
118+
select MVEBU_ICU
111119
select MVEBU_ODMI
112120
select MVEBU_PIC
113121
select OF_GPIO
114122
select PINCTRL
115123
select PINCTRL_ARMADA_37XX
124+
select PINCTRL_ARMADA_AP806
125+
select PINCTRL_ARMADA_CP110
116126
help
117127
This enables support for Marvell EBU familly, including:
118128
- Armada 3700 SoC Family
@@ -126,6 +136,12 @@ config ARCH_QCOM
126136
help
127137
This enables support for the ARMv8 based Qualcomm chipsets.
128138

139+
config ARCH_REALTEK
140+
bool "Realtek Platforms"
141+
help
142+
This enables support for the ARMv8 based Realtek chipsets,
143+
like the RTD1295.
144+
129145
config ARCH_ROCKCHIP
130146
bool "Rockchip Platforms"
131147
select ARCH_HAS_RESET_CONTROLLER
@@ -225,10 +241,7 @@ config ARCH_VEXPRESS
225241
Express).
226242

227243
config ARCH_VULCAN
228-
bool "Broadcom Vulcan SOC Family"
229-
select GPIOLIB
230-
help
231-
This enables support for Broadcom Vulcan SoC Family
244+
def_bool n
232245

233246
config ARCH_XGENE
234247
bool "AppliedMicro X-Gene SOC Family"

arch/arm64/configs/defconfig

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ CONFIG_ARCH_ALPINE=y
3636
CONFIG_ARCH_BCM2835=y
3737
CONFIG_ARCH_BCM_IPROC=y
3838
CONFIG_ARCH_BERLIN=y
39+
CONFIG_ARCH_BRCMSTB=y
3940
CONFIG_ARCH_EXYNOS=y
4041
CONFIG_ARCH_LAYERSCAPE=y
4142
CONFIG_ARCH_LG1K=y
@@ -56,12 +57,14 @@ CONFIG_ARCH_THUNDER=y
5657
CONFIG_ARCH_THUNDER2=y
5758
CONFIG_ARCH_UNIPHIER=y
5859
CONFIG_ARCH_VEXPRESS=y
59-
CONFIG_ARCH_VULCAN=y
6060
CONFIG_ARCH_XGENE=y
6161
CONFIG_ARCH_ZX=y
6262
CONFIG_ARCH_ZYNQMP=y
6363
CONFIG_PCI=y
64+
CONFIG_HOTPLUG_PCI_PCIE=y
6465
CONFIG_PCI_IOV=y
66+
CONFIG_HOTPLUG_PCI=y
67+
CONFIG_HOTPLUG_PCI_ACPI=y
6568
CONFIG_PCI_LAYERSCAPE=y
6669
CONFIG_PCI_HISI=y
6770
CONFIG_PCIE_QCOM=y
@@ -90,6 +93,7 @@ CONFIG_CPU_FREQ=y
9093
CONFIG_CPUFREQ_DT=y
9194
CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
9295
CONFIG_ARM_SCPI_CPUFREQ=y
96+
CONFIG_ACPI_CPPC_CPUFREQ=m
9397
CONFIG_NET=y
9498
CONFIG_PACKET=y
9599
CONFIG_UNIX=y
@@ -153,6 +157,7 @@ CONFIG_MTD_SPI_NOR=y
153157
CONFIG_BLK_DEV_LOOP=y
154158
CONFIG_BLK_DEV_NBD=m
155159
CONFIG_VIRTIO_BLK=y
160+
CONFIG_BLK_DEV_NVME=m
156161
CONFIG_SRAM=y
157162
CONFIG_EEPROM_AT25=m
158163
# CONFIG_SCSI_PROC_FS is not set
@@ -187,11 +192,14 @@ CONFIG_IGBVF=y
187192
CONFIG_MVNETA=y
188193
CONFIG_MVPP2=y
189194
CONFIG_SKY2=y
195+
CONFIG_QCOM_EMAC=m
190196
CONFIG_RAVB=y
191197
CONFIG_SMC91X=y
192198
CONFIG_SMSC911X=y
193199
CONFIG_STMMAC_ETH=m
194200
CONFIG_MDIO_BUS_MUX_MMIOREG=y
201+
CONFIG_AT803X_PHY=m
202+
CONFIG_MARVELL_PHY=m
195203
CONFIG_MESON_GXL_PHY=m
196204
CONFIG_MICREL_PHY=y
197205
CONFIG_REALTEK_PHY=m
@@ -260,9 +268,10 @@ CONFIG_I2C_UNIPHIER_F=y
260268
CONFIG_I2C_RCAR=y
261269
CONFIG_I2C_CROS_EC_TUNNEL=y
262270
CONFIG_SPI=y
271+
CONFIG_SPI_MESON_SPICC=m
272+
CONFIG_SPI_MESON_SPIFC=m
263273
CONFIG_SPI_BCM2835=m
264274
CONFIG_SPI_BCM2835AUX=m
265-
CONFIG_SPI_MESON_SPIFC=m
266275
CONFIG_SPI_ORION=y
267276
CONFIG_SPI_PL022=y
268277
CONFIG_SPI_QUP=y
@@ -327,6 +336,11 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
327336
CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
328337
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
329338
CONFIG_MEDIA_CONTROLLER=y
339+
CONFIG_MEDIA_RC_SUPPORT=y
340+
CONFIG_RC_CORE=m
341+
CONFIG_RC_DEVICES=y
342+
CONFIG_RC_DECODERS=y
343+
CONFIG_IR_MESON=m
330344
CONFIG_VIDEO_V4L2_SUBDEV_API=y
331345
# CONFIG_DVB_NET is not set
332346
CONFIG_V4L_MEM2MEM_DRIVERS=y
@@ -368,6 +382,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m
368382
CONFIG_SND_SOC_SAMSUNG=y
369383
CONFIG_SND_SOC_RCAR=y
370384
CONFIG_SND_SOC_AK4613=y
385+
CONFIG_SND_SIMPLE_CARD=y
371386
CONFIG_USB=y
372387
CONFIG_USB_OTG=y
373388
CONFIG_USB_XHCI_HCD=y
@@ -422,6 +437,7 @@ CONFIG_LEDS_SYSCON=y
422437
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
423438
CONFIG_LEDS_TRIGGER_CPU=y
424439
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
440+
CONFIG_EDAC=y
425441
CONFIG_RTC_CLASS=y
426442
CONFIG_RTC_DRV_MAX77686=y
427443
CONFIG_RTC_DRV_RK808=m
@@ -496,9 +512,15 @@ CONFIG_PHY_ROCKCHIP_EMMC=y
496512
CONFIG_PHY_ROCKCHIP_PCIE=m
497513
CONFIG_PHY_XGENE=y
498514
CONFIG_PHY_TEGRA_XUSB=y
515+
CONFIG_QCOM_L2_PMU=y
516+
CONFIG_QCOM_L3_PMU=y
499517
CONFIG_ARM_SCPI_PROTOCOL=y
500518
CONFIG_RASPBERRYPI_FIRMWARE=y
519+
CONFIG_EFI_CAPSULE_LOADER=y
501520
CONFIG_ACPI=y
521+
CONFIG_ACPI_APEI=y
522+
CONFIG_ACPI_APEI_GHES=y
523+
CONFIG_ACPI_APEI_PCIEAER=y
502524
CONFIG_EXT2_FS=y
503525
CONFIG_EXT3_FS=y
504526
CONFIG_EXT4_FS_POSIX_ACL=y

0 commit comments

Comments
 (0)