summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/Makefile1
-rw-r--r--arch/arm/boot/dts/tegra124-loki-02-cell-battery.dts2
-rw-r--r--arch/arm/boot/dts/tegra124-loki-03-cell-battery.dts2
-rw-r--r--arch/arm/boot/dts/tegra124-loki-common.dtsi (renamed from arch/arm/boot/dts/tegra124-loki.dts)0
-rw-r--r--arch/arm/boot/dts/tegra124-loki-e2530-a01.dts2
-rw-r--r--arch/arm/boot/dts/tegra124-loki-e2530-a03.dts2
-rw-r--r--arch/arm/boot/dts/tegra124-loki-e2548-a00.dts2
-rw-r--r--arch/arm/boot/dts/tegra124-loki-mods.dts3
8 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 45f59f93a404..063181b4ebc9 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -223,7 +223,6 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
tegra124-norrin.dtb \
tegra124-norrin-pm374-0001-a00-00.dtb \
tegra124-norrin-pm374-0001-a01-00.dtb \
- tegra124-loki.dtb \
tegra124-loki-02-cell-battery.dtb \
tegra124-loki-03-cell-battery.dtb \
tegra124-loki-e2548-a00.dtb \
diff --git a/arch/arm/boot/dts/tegra124-loki-02-cell-battery.dts b/arch/arm/boot/dts/tegra124-loki-02-cell-battery.dts
index 9303821b53a3..56ee1a730542 100644
--- a/arch/arm/boot/dts/tegra124-loki-02-cell-battery.dts
+++ b/arch/arm/boot/dts/tegra124-loki-02-cell-battery.dts
@@ -1,4 +1,4 @@
-#include "tegra124-loki.dts"
+#include "tegra124-loki-common.dtsi"
/ {
nvidia,dtsfilename = __FILE__;
diff --git a/arch/arm/boot/dts/tegra124-loki-03-cell-battery.dts b/arch/arm/boot/dts/tegra124-loki-03-cell-battery.dts
index e87134b9b920..b10f29172f25 100644
--- a/arch/arm/boot/dts/tegra124-loki-03-cell-battery.dts
+++ b/arch/arm/boot/dts/tegra124-loki-03-cell-battery.dts
@@ -1,4 +1,4 @@
-#include "tegra124-loki.dts"
+#include "tegra124-loki-common.dtsi"
/ {
nvidia,dtsfilename = __FILE__;
diff --git a/arch/arm/boot/dts/tegra124-loki.dts b/arch/arm/boot/dts/tegra124-loki-common.dtsi
index b4ebf8e03ce5..b4ebf8e03ce5 100644
--- a/arch/arm/boot/dts/tegra124-loki.dts
+++ b/arch/arm/boot/dts/tegra124-loki-common.dtsi
diff --git a/arch/arm/boot/dts/tegra124-loki-e2530-a01.dts b/arch/arm/boot/dts/tegra124-loki-e2530-a01.dts
index cb4843e7a27f..1aeea89954f2 100644
--- a/arch/arm/boot/dts/tegra124-loki-e2530-a01.dts
+++ b/arch/arm/boot/dts/tegra124-loki-e2530-a01.dts
@@ -1,4 +1,4 @@
-#include "tegra124-loki.dts"
+#include "tegra124-loki-common.dtsi"
#include "tegra124-platforms/tegra124-loki-powermon-e2530-a01.dtsi"
#include "tegra124-platforms/tegra124-loki-pmic-e2530-0000-a01.dtsi"
#include "tegra124-platforms/tegra124-loki-fixed-e2530-0000-a00.dtsi"
diff --git a/arch/arm/boot/dts/tegra124-loki-e2530-a03.dts b/arch/arm/boot/dts/tegra124-loki-e2530-a03.dts
index 3320bc3f37e4..5b8bd375672f 100644
--- a/arch/arm/boot/dts/tegra124-loki-e2530-a03.dts
+++ b/arch/arm/boot/dts/tegra124-loki-e2530-a03.dts
@@ -1,4 +1,4 @@
-#include "tegra124-loki.dts"
+#include "tegra124-loki-common.dtsi"
#include "tegra124-platforms/tegra124-loki-powermon-e2530-a01.dtsi"
#include "tegra124-platforms/tegra124-loki-pmic-e2530-0000-a01.dtsi"
#include "tegra124-platforms/tegra124-loki-fixed-e2530-0000-a00.dtsi"
diff --git a/arch/arm/boot/dts/tegra124-loki-e2548-a00.dts b/arch/arm/boot/dts/tegra124-loki-e2548-a00.dts
index 66af0226e575..580b099fe914 100644
--- a/arch/arm/boot/dts/tegra124-loki-e2548-a00.dts
+++ b/arch/arm/boot/dts/tegra124-loki-e2548-a00.dts
@@ -1,4 +1,4 @@
-#include "tegra124-loki.dts"
+#include "tegra124-loki-common.dtsi"
#include "tegra124-platforms/tegra124-loki-powermon-e2548.dtsi"
#include "tegra124-platforms/tegra124-loki-pmic-e2545-0000-a00.dtsi"
#include "tegra124-platforms/tegra124-loki-fixed-e2545-0000-a00.dtsi"
diff --git a/arch/arm/boot/dts/tegra124-loki-mods.dts b/arch/arm/boot/dts/tegra124-loki-mods.dts
index 6e623064bd13..c695d0a2975b 100644
--- a/arch/arm/boot/dts/tegra124-loki-mods.dts
+++ b/arch/arm/boot/dts/tegra124-loki-mods.dts
@@ -11,8 +11,7 @@
* more details.
*/
-#include "tegra124-loki.dts"
-
+#include "tegra124-loki-common.dtsi"
/ {
nvidia,dtsfilename = __FILE__;