Commit 8d01b66b 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 changes from Olof Johansson:
 "Here's our branch of ARM64 contents for this merge window.

  Most of this is DT contents for new SoCs (or those who have seen new
  device support added).  Maybe we should stop separating out the arm64
  contents here to avoid the kind of internal conflicts as we got this
  time around, where 32- and 64-bit contents conflicted.

  Anyhow, on the actual contents:

  New SoCs:

   - Broadcom North Star 2 (ns2)
   - Marvell Berlin4CT
   - Mediatek MT6795
   - Rockchip RK3368

  In addition, there are enhancements for the following platforms:

   - Mediatek MT8173: cpuidle-dt updates, misc other additions
   - ZyncMP: A bunch of devices added to the existing DTSI
   - Qualcomm MSM8916 and APQ8016 updates for USB, etc.

  + a handful of other updates for various platforms"

* tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (47 commits)
  ARM64: dts: vexpress: Use assigned-clock-parents for sp810
  ARM64: dts: mt6795: enable basic SMP bringup for MT6795
  arm64: Enable Marvell Berlin SoC family in defconfig
  arm64: Enable Marvell Berlin SoC family in Kconfig
  arm64: dts: Add dts files for Marvell Berlin4CT SoC
  ARM64: zynqmp: Move SPI nodes to the right location
  ARM64: zynqmp: Move uart and ttcs to the right location
  ARM64: zynqmp: Enable spi flashes on ep108
  ARM64: zynqmp: Add eeprom memories on i2c bus
  ARM64: zynqmp: Enable sdhci on ep108
  ARM64: zynqmp: Enable watchdog on ep108
  ARM64: zynqmp: Add DWC3 usb support
  ARM64: zynqmp: Add SMMU support
  ARM64: zynqmp: Add CANs node for platform
  ARM64: zynqmp: Use zynqmp specific compatible string for gpio
  devicetree: xilinx: zynqmp: add sata node
  PCI: iproc: Fix BCMA dependency in Kconfig
  arm64: dts: Add Broadcom North Star 2 support
  arm64: Add Broadcom iProc family support
  PCI: iproc: Fix ARM64 dependency in Kconfig
  ...
parents 2faf962d 341a670a

Documentation/devicetree/bindings/arm/bcm/ns2.txt

0 → 100644
+9 −0
Original line number Diff line number Diff line 
Broadcom North Star 2 (NS2) device tree bindings

------------------------------------------------



Boards with NS2 shall have the following properties:



Required root node property:



NS2 SVK board

compatible = "brcm,ns2-svk", "brcm,ns2";

Documentation/devicetree/bindings/arm/mediatek.txt

+7 −2
Original line number Diff line number Diff line 
MediaTek mt65xx & mt81xx Platforms Device Tree Bindings

MediaTek mt65xx, mt67xx & mt81xx Platforms Device Tree Bindings



Boards with a MediaTek mt65xx/mt81xx SoC shall have the following property:

Boards with a MediaTek mt65xx/mt67xx/mt81xx SoC shall have the

following property:



Required root node property:
@@ -8,6 +9,7 @@ compatible: Must contain one of 
   "mediatek,mt6580"

   "mediatek,mt6589"

   "mediatek,mt6592"

   "mediatek,mt6795"

   "mediatek,mt8127"

   "mediatek,mt8135"

   "mediatek,mt8173"
@@ -24,6 +26,9 @@ Supported boards: 
- Evaluation board for MT6592:

    Required root node properties:

      - compatible = "mediatek,mt6592-evb", "mediatek,mt6592";

- Evaluation board for MT6795(Helio X10):

    Required root node properties:

      - compatible = "mediatek,mt6795-evb", "mediatek,mt6795";

- MTK mt8127 tablet moose EVB:

    Required root node properties:

      - compatible = "mediatek,mt8127-moose", "mediatek,mt8127";

Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt

+2 −1
Original line number Diff line number Diff line 
Mediatek 65xx/81xx sysirq

+Mediatek 65xx/67xx/81xx sysirq



Mediatek SOCs sysirq support controllable irq inverter for each GIC SPI

interrupt.
@@ -8,6 +8,7 @@ Required properties: 
	"mediatek,mt8173-sysirq"

	"mediatek,mt8135-sysirq"

	"mediatek,mt8127-sysirq"

	"mediatek,mt6795-sysirq"

	"mediatek,mt6592-sysirq"

	"mediatek,mt6589-sysirq"

	"mediatek,mt6582-sysirq"

Documentation/devicetree/bindings/serial/mtk-uart.txt

+3 −2
Original line number Diff line number Diff line
@@ -5,11 +5,12 @@ Required properties: 
  * "mediatek,mt8135-uart" for MT8135 compatible UARTS

  * "mediatek,mt8127-uart" for MT8127 compatible UARTS

  * "mediatek,mt8173-uart" for MT8173 compatible UARTS

  * "mediatek,mt6795-uart" for MT6795 compatible UARTS

  * "mediatek,mt6589-uart" for MT6589 compatible UARTS

  * "mediatek,mt6582-uart" for MT6582 compatible UARTS

  * "mediatek,mt6580-uart" for MT6580 compatible UARTS

  * "mediatek,mt6577-uart" for all compatible UARTS (MT8173, MT6589, MT6582, 

	MT6580, MT6577)

  * "mediatek,mt6577-uart" for all compatible UARTS (MT8173, MT6795,

        MT6589, MT6582, MT6580, MT6577)



- reg: The base address of the UART register bank.

arch/arm64/Kconfig

+1 −104
Original line number Diff line number Diff line
@@ -160,110 +160,7 @@ source "init/Kconfig" 


source "kernel/Kconfig.freezer"



menu "Platform selection"



config ARCH_EXYNOS

	bool

	help

	  This enables support for Samsung Exynos SoC family



config ARCH_EXYNOS7

	bool "ARMv8 based Samsung Exynos7"

	select ARCH_EXYNOS

	select COMMON_CLK_SAMSUNG

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS

	select PINCTRL

	select PINCTRL_EXYNOS



	help

	  This enables support for Samsung Exynos7 SoC family



config ARCH_FSL_LS2085A

	bool "Freescale LS2085A SOC"

	help

	  This enables support for Freescale LS2085A SOC.



config ARCH_HISI

	bool "Hisilicon SoC Family"

	help

	  This enables support for Hisilicon ARMv8 SoC family



config ARCH_MEDIATEK

	bool "Mediatek MT65xx & MT81xx ARMv8 SoC"

	select ARM_GIC

	select PINCTRL

	help

	  Support for Mediatek MT65xx & MT81xx ARMv8 SoCs



config ARCH_QCOM

	bool "Qualcomm Platforms"

	select PINCTRL

	help

	  This enables support for the ARMv8 based Qualcomm chipsets.



config ARCH_SEATTLE

	bool "AMD Seattle SoC Family"

	help

	  This enables support for AMD Seattle SOC Family



config ARCH_TEGRA

	bool "NVIDIA Tegra SoC Family"

	select ARCH_HAS_RESET_CONTROLLER

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_OF

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select PINCTRL

	select RESET_CONTROLLER

	help

	  This enables support for the NVIDIA Tegra SoC family.



config ARCH_TEGRA_132_SOC

	bool "NVIDIA Tegra132 SoC"

	depends on ARCH_TEGRA

	select PINCTRL_TEGRA124

	select USB_ULPI if USB_PHY

	select USB_ULPI_VIEWPORT if USB_PHY

	help

	  Enable support for NVIDIA Tegra132 SoC, based on the Denver

	  ARMv8 CPU.  The Tegra132 SoC is similar to the Tegra124 SoC,

	  but contains an NVIDIA Denver CPU complex in place of

	  Tegra124's "4+1" Cortex-A15 CPU complex.



config ARCH_SPRD

	bool "Spreadtrum SoC platform"

	help

	  Support for Spreadtrum ARM based SoCs



config ARCH_THUNDER

	bool "Cavium Inc. Thunder SoC Family"

	help

	  This enables support for Cavium's Thunder Family of SoCs.



config ARCH_VEXPRESS

	bool "ARMv8 software model (Versatile Express)"

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLK_VERSATILE

	select POWER_RESET_VEXPRESS

	select VEXPRESS_CONFIG

	help

	  This enables support for the ARMv8 software model (Versatile

	  Express).



config ARCH_XGENE

	bool "AppliedMicro X-Gene SOC Family"

	help

	  This enables support for AppliedMicro X-Gene SOC Family



config ARCH_ZYNQMP

	bool "Xilinx ZynqMP Family"

	help

	  This enables support for Xilinx ZynqMP Family



endmenu

source "arch/arm64/Kconfig.platforms"



menu "Bus support"

CRA Git | Maintained and supported by SUSTech CRA and CCSE