Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19964541 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a9ceea26 96f63027

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -1697,6 +1697,13 @@ M: Lennert Buytenhek <kernel@wantstofly.org> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained



ARM/REALTEK ARCHITECTURE

M:	Andreas Färber <afaerber@suse.de>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm64/boot/dts/realtek/

F:	Documentation/devicetree/bindings/arm/realtek.txt



ARM/RENESAS ARM64 ARCHITECTURE

M:	Simon Horman <horms@verge.net.au>

M:	Magnus Damm <magnus.damm@gmail.com>

arch/arm64/Kconfig.platforms

+17 −4
Original line number Diff line number Diff line 
menu "Platform selection"



config ARCH_ACTIONS

	bool "Actions Semi Platforms"

	select OWL_TIMER

	help

	  This enables support for the Actions Semiconductor S900 SoC family.



config ARCH_SUNXI

	bool "Allwinner sunxi 64-bit SoC Family"

	select ARCH_HAS_RESET_CONTROLLER
@@ -108,11 +114,15 @@ config ARCH_MVEBU 
	select ARMADA_37XX_CLK

	select GPIOLIB

	select GPIOLIB_IRQCHIP

	select MVEBU_GICP

	select MVEBU_ICU

	select MVEBU_ODMI

	select MVEBU_PIC

	select OF_GPIO

	select PINCTRL

	select PINCTRL_ARMADA_37XX

	select PINCTRL_ARMADA_AP806

	select PINCTRL_ARMADA_CP110

	help

	  This enables support for Marvell EBU familly, including:

	   - Armada 3700 SoC Family
@@ -126,6 +136,12 @@ config ARCH_QCOM 
	help

	  This enables support for the ARMv8 based Qualcomm chipsets.



config ARCH_REALTEK

	bool "Realtek Platforms"

	help

	  This enables support for the ARMv8 based Realtek chipsets,

	  like the RTD1295.



config ARCH_ROCKCHIP

	bool "Rockchip Platforms"

	select ARCH_HAS_RESET_CONTROLLER
@@ -225,10 +241,7 @@ config ARCH_VEXPRESS 
	  Express).



config ARCH_VULCAN

	bool "Broadcom Vulcan SOC Family"

	select GPIOLIB

	help

	  This enables support for Broadcom Vulcan SoC Family

	def_bool n



config ARCH_XGENE

	bool "AppliedMicro X-Gene SOC Family"

arch/arm64/configs/defconfig

+24 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ CONFIG_ARCH_ALPINE=y 
CONFIG_ARCH_BCM2835=y

CONFIG_ARCH_BCM_IPROC=y

CONFIG_ARCH_BERLIN=y

CONFIG_ARCH_BRCMSTB=y

CONFIG_ARCH_EXYNOS=y

CONFIG_ARCH_LAYERSCAPE=y

CONFIG_ARCH_LG1K=y
@@ -56,12 +57,14 @@ CONFIG_ARCH_THUNDER=y 
CONFIG_ARCH_THUNDER2=y

CONFIG_ARCH_UNIPHIER=y

CONFIG_ARCH_VEXPRESS=y

CONFIG_ARCH_VULCAN=y

CONFIG_ARCH_XGENE=y

CONFIG_ARCH_ZX=y

CONFIG_ARCH_ZYNQMP=y

CONFIG_PCI=y

CONFIG_HOTPLUG_PCI_PCIE=y

CONFIG_PCI_IOV=y

CONFIG_HOTPLUG_PCI=y

CONFIG_HOTPLUG_PCI_ACPI=y

CONFIG_PCI_LAYERSCAPE=y

CONFIG_PCI_HISI=y

CONFIG_PCIE_QCOM=y
@@ -90,6 +93,7 @@ CONFIG_CPU_FREQ=y 
CONFIG_CPUFREQ_DT=y

CONFIG_ARM_BIG_LITTLE_CPUFREQ=y

CONFIG_ARM_SCPI_CPUFREQ=y

CONFIG_ACPI_CPPC_CPUFREQ=m

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -153,6 +157,7 @@ CONFIG_MTD_SPI_NOR=y 
CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_NBD=m

CONFIG_VIRTIO_BLK=y

CONFIG_BLK_DEV_NVME=m

CONFIG_SRAM=y

CONFIG_EEPROM_AT25=m

# CONFIG_SCSI_PROC_FS is not set
@@ -187,11 +192,14 @@ CONFIG_IGBVF=y 
CONFIG_MVNETA=y

CONFIG_MVPP2=y

CONFIG_SKY2=y

CONFIG_QCOM_EMAC=m

CONFIG_RAVB=y

CONFIG_SMC91X=y

CONFIG_SMSC911X=y

CONFIG_STMMAC_ETH=m

CONFIG_MDIO_BUS_MUX_MMIOREG=y

CONFIG_AT803X_PHY=m

CONFIG_MARVELL_PHY=m

CONFIG_MESON_GXL_PHY=m

CONFIG_MICREL_PHY=y

CONFIG_REALTEK_PHY=m
@@ -260,9 +268,10 @@ CONFIG_I2C_UNIPHIER_F=y 
CONFIG_I2C_RCAR=y

CONFIG_I2C_CROS_EC_TUNNEL=y

CONFIG_SPI=y

CONFIG_SPI_MESON_SPICC=m

CONFIG_SPI_MESON_SPIFC=m

CONFIG_SPI_BCM2835=m

CONFIG_SPI_BCM2835AUX=m

CONFIG_SPI_MESON_SPIFC=m

CONFIG_SPI_ORION=y

CONFIG_SPI_PL022=y

CONFIG_SPI_QUP=y
@@ -327,6 +336,11 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y 
CONFIG_MEDIA_ANALOG_TV_SUPPORT=y

CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

CONFIG_MEDIA_RC_SUPPORT=y

CONFIG_RC_CORE=m

CONFIG_RC_DEVICES=y

CONFIG_RC_DECODERS=y

CONFIG_IR_MESON=m

CONFIG_VIDEO_V4L2_SUBDEV_API=y

# CONFIG_DVB_NET is not set

CONFIG_V4L_MEM2MEM_DRIVERS=y
@@ -368,6 +382,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m 
CONFIG_SND_SOC_SAMSUNG=y

CONFIG_SND_SOC_RCAR=y

CONFIG_SND_SOC_AK4613=y

CONFIG_SND_SIMPLE_CARD=y

CONFIG_USB=y

CONFIG_USB_OTG=y

CONFIG_USB_XHCI_HCD=y
@@ -422,6 +437,7 @@ CONFIG_LEDS_SYSCON=y 
CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_CPU=y

CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

CONFIG_EDAC=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_MAX77686=y

CONFIG_RTC_DRV_RK808=m
@@ -496,9 +512,15 @@ CONFIG_PHY_ROCKCHIP_EMMC=y 
CONFIG_PHY_ROCKCHIP_PCIE=m

CONFIG_PHY_XGENE=y

CONFIG_PHY_TEGRA_XUSB=y

CONFIG_QCOM_L2_PMU=y

CONFIG_QCOM_L3_PMU=y

CONFIG_ARM_SCPI_PROTOCOL=y

CONFIG_RASPBERRYPI_FIRMWARE=y

CONFIG_EFI_CAPSULE_LOADER=y

CONFIG_ACPI=y

CONFIG_ACPI_APEI=y

CONFIG_ACPI_APEI_GHES=y

CONFIG_ACPI_APEI_PCIEAER=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y