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

Merge tag '64bit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC 64-bit changes and additions from Olof Johansson:
 "The 64-bit set of updates this release cycle adds support for three
  new platforms:

   - Samsunc Exynos 7
   - Freescale LS2085a
   - Mediatek MT8173

  For all these, the changes mostly consititude additions of DT
  contents, but also some Kconfig entries to allow dependency/selection
  of drivers per-platform, etc"

* tag '64bit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  arm64: Kconfig: clean up two no-op Kconfig options from CONFIG_ARCH_TEGRA*
  arm64: Fix sort of platform Kconfig entries
  arm64: Add support for FSL's LS2085A SoC in Kconfig and defconfig
  arm64: Add DTS support for FSL's LS2085A SoC
  arm64: mediatek: Add MT8173 SoC Kconfig and defconfig
  arm64: dts: Add mediatek MT8173 SoC and evaluation board dts and Makefile
  Document: DT: Add bindings for mediatek MT8173 SoC Platform
  arm64: Add Tegra132 support
  arm64: Enable ARMv8 based exynos7 SoC support
  arm64: dts: Add nodes for mmc, i2c, rtc, watchdog, adc on exynos7
  arm64: dts: Add PMU DT node for exynos7 SoC
  arm64: dts: Add initial pinctrl support to exynos7
  arm64: dts: Add initial device tree support for exynos7
parents 03a40e29 0d2fdcd7

Documentation/devicetree/bindings/arm/mediatek.txt

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ compatible: Must contain one of 
   "mediatek,mt6592"

   "mediatek,mt8127"

   "mediatek,mt8135"

   "mediatek,mt8173"





Supported boards:
@@ -25,3 +26,6 @@ Supported boards: 
- MTK mt8135 tablet EVB:

    Required root node properties:

      - compatible = "mediatek,mt8135-evbp1", "mediatek,mt8135";

- MTK mt8173 tablet EVB:

    Required root node properties:

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

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

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ interrupt. 


Required properties:

- compatible: should be one of:

	"mediatek,mt8173-sysirq"

	"mediatek,mt8135-sysirq"

	"mediatek,mt8127-sysirq"

	"mediatek,mt6592-sysirq"

Documentation/devicetree/bindings/arm/samsung/pmu.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Properties: 
		   - "samsung,exynos5260-pmu" - for Exynos5260 SoC.

		   - "samsung,exynos5410-pmu" - for Exynos5410 SoC,

		   - "samsung,exynos5420-pmu" - for Exynos5420 SoC.

		   - "samsung,exynos7-pmu" - for Exynos7 SoC.

		second value must be always "syscon".



 - reg : offset and length of the register set.

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

+3 −1
Original line number Diff line number Diff line
@@ -4,9 +4,11 @@ Required properties: 
- compatible should contain:

  * "mediatek,mt8135-uart" for MT8135 compatible UARTS

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

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

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

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

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

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

	MT6577)



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

arch/arm64/Kconfig

+54 −0
Original line number Diff line number Diff line
@@ -149,11 +149,65 @@ 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_MEDIATEK

	bool "Mediatek MT65xx & MT81xx ARMv8 SoC"

	select ARM_GIC

	help

	  Support for Mediatek MT65xx & MT81xx ARMv8 SoCs



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_THUNDER

	bool "Cavium Inc. Thunder SoC Family"

	help

CRA Git | Maintained and supported by SUSTech CRA and CCSE