Commit 79d24532 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-tegra' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC support for Tegra platforms from Olof Johansson:
 "Here's a single-SoC topic branch that we've staged separately.  Mainly
  because it was hard to sort the branch contents in a way that fit our
  existing branches due to some refactorings.

  The code has been in -next for quite a while, but we staged it in
  arm-soc a bit late, which is why we've kept it separate from the other
  updates and are sending it separately here"

* tag 'armsoc-tegra' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  arm64: tegra: Add NVIDIA Jetson TX1 Developer Kit support
  arm64: tegra: Add NVIDIA P2597 I/O board support
  arm64: tegra: Add NVIDIA Jetson TX1 support
  arm64: tegra: Add NVIDIA P2571 board support
  arm64: tegra: Add NVIDIA P2371 board support
  arm64: tegra: Add NVIDIA P2595 I/O board support
  arm64: tegra: Add NVIDIA P2530 main board support
  arm64: tegra: Add Tegra210 support
  arm64: tegra: Add NVIDIA Tegra132 Norrin support
  arm64: tegra: Add Tegra132 support
  ARM: tegra: select USB_ULPI from EHCI rather than platform
  ARM: tegra: Ensure entire dcache is flushed on entering LP0/1
  amba: Hide TEGRA_AHB symbol
  soc/tegra: Add Tegra210 support
  soc/tegra: Provide per-SoC Kconfig symbols
parents 1b8ee1ec 5f4900bd

arch/arm/mach-tegra/Kconfig

+0 −52
Original line number Diff line number Diff line
@@ -13,57 +13,5 @@ menuconfig ARCH_TEGRA 
	select ARCH_HAS_RESET_CONTROLLER

	select RESET_CONTROLLER

	select SOC_BUS

	select USB_ULPI if USB_PHY

	select USB_ULPI_VIEWPORT if USB_PHY

	help

	  This enables support for NVIDIA Tegra based systems.
 


if ARCH_TEGRA



config ARCH_TEGRA_2x_SOC

	bool "Enable support for Tegra20 family"

	select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP

	select ARM_ERRATA_720789

	select ARM_ERRATA_754327 if SMP

	select ARM_ERRATA_764369 if SMP

	select PINCTRL_TEGRA20

	select PL310_ERRATA_727915 if CACHE_L2X0

	select PL310_ERRATA_769419 if CACHE_L2X0

	select TEGRA_TIMER

	help

	  Support for NVIDIA Tegra AP20 and T20 processors, based on the

	  ARM CortexA9MP CPU and the ARM PL310 L2 cache controller



config ARCH_TEGRA_3x_SOC

	bool "Enable support for Tegra30 family"

	select ARM_ERRATA_754322

	select ARM_ERRATA_764369 if SMP

	select PINCTRL_TEGRA30

	select PL310_ERRATA_769419 if CACHE_L2X0

	select TEGRA_TIMER

	help

	  Support for NVIDIA Tegra T30 processor family, based on the

	  ARM CortexA9MP CPU and the ARM PL310 L2 cache controller



config ARCH_TEGRA_114_SOC

	bool "Enable support for Tegra114 family"

	select ARM_ERRATA_798181 if SMP

	select ARM_L1_CACHE_SHIFT_6

	select HAVE_ARM_ARCH_TIMER

	select PINCTRL_TEGRA114

	select TEGRA_TIMER

	help

	  Support for NVIDIA Tegra T114 processor family, based on the

	  ARM CortexA15MP CPU



config ARCH_TEGRA_124_SOC

	bool "Enable support for Tegra124 family"

	select ARM_L1_CACHE_SHIFT_6

	select HAVE_ARM_ARCH_TIMER

	select PINCTRL_TEGRA124

	select TEGRA_TIMER

	help

	  Support for NVIDIA Tegra T124 processor family, based on the

	  ARM CortexA15MP CPU



endif

arch/arm/mach-tegra/sleep-tegra20.S

+3 −0
Original line number Diff line number Diff line
@@ -231,8 +231,11 @@ ENDPROC(tegra20_cpu_is_resettable_soon) 
 * tegra20_tear_down_core in IRAM

 */

ENTRY(tegra20_sleep_core_finish)

	mov     r4, r0

	/* Flush, disable the L1 data cache and exit SMP */

	mov     r0, #TEGRA_FLUSH_CACHE_ALL

	bl	tegra_disable_clean_inv_dcache

	mov     r0, r4



	mov32	r3, tegra_shut_off_mmu

	add	r3, r3, r0

arch/arm/mach-tegra/sleep-tegra30.S

+3 −0
Original line number Diff line number Diff line
@@ -242,8 +242,11 @@ ENDPROC(tegra30_cpu_shutdown) 
 * tegra30_tear_down_core in IRAM

 */

ENTRY(tegra30_sleep_core_finish)

	mov	r4, r0

	/* Flush, disable the L1 data cache and exit SMP */

	mov	r0, #TEGRA_FLUSH_CACHE_ALL

	bl	tegra_disable_clean_inv_dcache

	mov	r0, r4



	/*

	 * Preload all the address literals that are needed for the

arch/arm64/Kconfig.platforms

+0 −12
Original line number Diff line number Diff line
@@ -105,18 +105,6 @@ config ARCH_TEGRA 
	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

arch/arm64/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ dts-dirs += freescale 
dts-dirs += hisilicon

dts-dirs += marvell

dts-dirs += mediatek

dts-dirs += nvidia

dts-dirs += qcom

dts-dirs += renesas

dts-dirs += rockchip

CRA Git | Maintained and supported by SUSTech CRA and CCSE