diff options
author | Tom Rini <trini@konsulko.com> | 2016-07-21 18:54:58 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-07-21 18:54:58 -0400 |
commit | 9f84da8de1873593d9b708aa4a8a24f46e67c744 (patch) | |
tree | b1c27779a2aa36c02dc2ae507fcd3e9354658fb1 /arch/arm/dts | |
parent | 95d52733036af7438a5285d729d53844ec48c63e (diff) | |
parent | 2a5f7f20747637cd1f94d4accfd7caa99a7c6035 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Diffstat (limited to 'arch/arm/dts')
-rw-r--r-- | arch/arm/dts/Makefile | 3 | ||||
-rw-r--r-- | arch/arm/dts/tegra186-p2771-0000-a02.dts | 8 | ||||
-rw-r--r-- | arch/arm/dts/tegra186-p2771-0000-b00.dts | 8 | ||||
-rw-r--r-- | arch/arm/dts/tegra186-p2771-0000.dtsi (renamed from arch/arm/dts/tegra186-p2771-0000.dts) | 2 | ||||
-rw-r--r-- | arch/arm/dts/tegra186.dtsi | 2 |
5 files changed, 19 insertions, 4 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index acecb7c359..ca8712a7a7 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -53,7 +53,8 @@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \ tegra124-jetson-tk1.dtb \ tegra124-nyan-big.dtb \ tegra124-venice2.dtb \ - tegra186-p2771-0000.dtb \ + tegra186-p2771-0000-a02.dtb \ + tegra186-p2771-0000-b00.dtb \ tegra210-e2220-1170.dtb \ tegra210-p2371-0000.dtb \ tegra210-p2371-2180.dtb \ diff --git a/arch/arm/dts/tegra186-p2771-0000-a02.dts b/arch/arm/dts/tegra186-p2771-0000-a02.dts new file mode 100644 index 0000000000..70f4326c09 --- /dev/null +++ b/arch/arm/dts/tegra186-p2771-0000-a02.dts @@ -0,0 +1,8 @@ +/dts-v1/; + +#include "tegra186-p2771-0000.dtsi" + +/ { + model = "NVIDIA P2771-0000 A02"; + compatible = "nvidia,p2771-0000-a02", "nvidia,p2771-0000", "nvidia,tegra186"; +}; diff --git a/arch/arm/dts/tegra186-p2771-0000-b00.dts b/arch/arm/dts/tegra186-p2771-0000-b00.dts new file mode 100644 index 0000000000..2384a65e87 --- /dev/null +++ b/arch/arm/dts/tegra186-p2771-0000-b00.dts @@ -0,0 +1,8 @@ +/dts-v1/; + +#include "tegra186-p2771-0000.dtsi" + +/ { + model = "NVIDIA P2771-0000 B00"; + compatible = "nvidia,p2771-0000-b00", "nvidia,p2771-0000", "nvidia,tegra186"; +}; diff --git a/arch/arm/dts/tegra186-p2771-0000.dts b/arch/arm/dts/tegra186-p2771-0000.dtsi index 5f29ee4501..87f0427e80 100644 --- a/arch/arm/dts/tegra186-p2771-0000.dts +++ b/arch/arm/dts/tegra186-p2771-0000.dtsi @@ -1,5 +1,3 @@ -/dts-v1/; - #include "tegra186.dtsi" / { diff --git a/arch/arm/dts/tegra186.dtsi b/arch/arm/dts/tegra186.dtsi index fce34fa650..99d49254b3 100644 --- a/arch/arm/dts/tegra186.dtsi +++ b/arch/arm/dts/tegra186.dtsi @@ -1,5 +1,5 @@ #include "skeleton.dtsi" -#include <dt-bindings/gpio/tegra-gpio.h> +#include <dt-bindings/gpio/tegra186-gpio.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/mailbox/tegra-hsp.h> |