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

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
...@@ -13,57 +13,5 @@ menuconfig ARCH_TEGRA ...@@ -13,57 +13,5 @@ menuconfig ARCH_TEGRA
select ARCH_HAS_RESET_CONTROLLER select ARCH_HAS_RESET_CONTROLLER
select RESET_CONTROLLER select RESET_CONTROLLER
select SOC_BUS select SOC_BUS
select USB_ULPI if USB_PHY
select USB_ULPI_VIEWPORT if USB_PHY
help help
This enables support for NVIDIA Tegra based systems. 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
...@@ -231,8 +231,11 @@ ENDPROC(tegra20_cpu_is_resettable_soon) ...@@ -231,8 +231,11 @@ ENDPROC(tegra20_cpu_is_resettable_soon)
* tegra20_tear_down_core in IRAM * tegra20_tear_down_core in IRAM
*/ */
ENTRY(tegra20_sleep_core_finish) ENTRY(tegra20_sleep_core_finish)
mov r4, r0
/* Flush, disable the L1 data cache and exit SMP */ /* Flush, disable the L1 data cache and exit SMP */
mov r0, #TEGRA_FLUSH_CACHE_ALL
bl tegra_disable_clean_inv_dcache bl tegra_disable_clean_inv_dcache
mov r0, r4
mov32 r3, tegra_shut_off_mmu mov32 r3, tegra_shut_off_mmu
add r3, r3, r0 add r3, r3, r0
......
...@@ -242,8 +242,11 @@ ENDPROC(tegra30_cpu_shutdown) ...@@ -242,8 +242,11 @@ ENDPROC(tegra30_cpu_shutdown)
* tegra30_tear_down_core in IRAM * tegra30_tear_down_core in IRAM
*/ */
ENTRY(tegra30_sleep_core_finish) ENTRY(tegra30_sleep_core_finish)
mov r4, r0
/* Flush, disable the L1 data cache and exit SMP */ /* Flush, disable the L1 data cache and exit SMP */
mov r0, #TEGRA_FLUSH_CACHE_ALL
bl tegra_disable_clean_inv_dcache bl tegra_disable_clean_inv_dcache
mov r0, r4
/* /*
* Preload all the address literals that are needed for the * Preload all the address literals that are needed for the
......
...@@ -105,18 +105,6 @@ config ARCH_TEGRA ...@@ -105,18 +105,6 @@ config ARCH_TEGRA
help help
This enables support for the NVIDIA Tegra SoC family. 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 config ARCH_SPRD
bool "Spreadtrum SoC platform" bool "Spreadtrum SoC platform"
help help
......
...@@ -9,6 +9,7 @@ dts-dirs += freescale ...@@ -9,6 +9,7 @@ dts-dirs += freescale
dts-dirs += hisilicon dts-dirs += hisilicon
dts-dirs += marvell dts-dirs += marvell
dts-dirs += mediatek dts-dirs += mediatek
dts-dirs += nvidia
dts-dirs += qcom dts-dirs += qcom
dts-dirs += renesas dts-dirs += renesas
dts-dirs += rockchip dts-dirs += rockchip
......
dtb-$(CONFIG_ARCH_TEGRA_132_SOC) += tegra132-norrin.dtb
dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2371-0000.dtb
dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2371-2180.dtb
dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2571.dtb
always := $(dtb-y)
clean-files := *.dtb
This diff is collapsed.
This diff is collapsed.
#include "tegra210.dtsi"
/ {
model = "NVIDIA Jetson TX1";
compatible = "nvidia,p2180", "nvidia,tegra210";
aliases {
rtc1 = "/rtc@0,7000e000";
serial0 = &uarta;
};
memory {
device_type = "memory";
reg = <0x0 0x80000000 0x1 0x0>;
};
/* debug port */
serial@0,70006000 {
status = "okay";
};
pmc@0,7000e400 {
nvidia,invert-interrupt;
};
/* eMMC */
sdhci@0,700b0600 {
status = "okay";
bus-width = <8>;
non-removable;
};
clocks {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
clk32k_in: clock@0 {
compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>;
clock-frequency = <32768>;
};
};
};
/dts-v1/;
#include "tegra210-p2530.dtsi"
#include "tegra210-p2595.dtsi"
/ {
model = "NVIDIA Tegra210 P2371 (P2530/P2595) reference design";
compatible = "nvidia,p2371-0000", "nvidia,tegra210";
};
/dts-v1/;
#include "tegra210-p2180.dtsi"
#include "tegra210-p2597.dtsi"
/ {
model = "NVIDIA Jetson TX1 Developer Kit";
compatible = "nvidia,p2371-2180", "nvidia,tegra210";
};
#include "tegra210.dtsi"
/ {
model = "NVIDIA Tegra210 P2530 main board";
compatible = "nvidia,p2530", "nvidia,tegra210";
aliases {
rtc1 = "/rtc@0,7000e000";
serial0 = &uarta;
};
memory {
device_type = "memory";
reg = <0x0 0x80000000 0x0 0xc0000000>;
};
/* debug port */
serial@0,70006000 {
status = "okay";
};
i2c@0,7000d000 {
status = "okay";
clock-frequency = <400000>;
};
pmc@0,7000e400 {
nvidia,invert-interrupt;
};
/* eMMC */
sdhci@0,700b0600 {
status = "okay";
bus-width = <8>;
non-removable;
};
clocks {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
clk32k_in: clock@0 {
compatible = "fixed-clock";
reg = <0>;
#clock-cells = <0>;
clock-frequency = <32768>;
};
};
};
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -4,7 +4,7 @@ config ARM_AMBA ...@@ -4,7 +4,7 @@ config ARM_AMBA
if ARM_AMBA if ARM_AMBA
config TEGRA_AHB config TEGRA_AHB
bool "Enable AHB driver for NVIDIA Tegra SoCs" bool
default y if ARCH_TEGRA default y if ARCH_TEGRA
help help
Adds AHB configuration functionality for NVIDIA Tegra SoCs, Adds AHB configuration functionality for NVIDIA Tegra SoCs,
......
...@@ -7,6 +7,7 @@ source "drivers/soc/mediatek/Kconfig" ...@@ -7,6 +7,7 @@ source "drivers/soc/mediatek/Kconfig"
source "drivers/soc/qcom/Kconfig" source "drivers/soc/qcom/Kconfig"
source "drivers/soc/rockchip/Kconfig" source "drivers/soc/rockchip/Kconfig"
source "drivers/soc/sunxi/Kconfig" source "drivers/soc/sunxi/Kconfig"
source "drivers/soc/tegra/Kconfig"
source "drivers/soc/ti/Kconfig" source "drivers/soc/ti/Kconfig"
source "drivers/soc/versatile/Kconfig" source "drivers/soc/versatile/Kconfig"
......
This diff is collapsed.
...@@ -229,6 +229,8 @@ config USB_EHCI_TEGRA ...@@ -229,6 +229,8 @@ config USB_EHCI_TEGRA
depends on ARCH_TEGRA depends on ARCH_TEGRA
select USB_EHCI_ROOT_HUB_TT select USB_EHCI_ROOT_HUB_TT
select USB_PHY select USB_PHY
select USB_ULPI
select USB_ULPI_VIEWPORT
help help
This driver enables support for the internal USB Host Controllers This driver enables support for the internal USB Host Controllers
found in NVIDIA Tegra SoCs. The controllers are EHCI compliant. found in NVIDIA Tegra SoCs. The controllers are EHCI compliant.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment