ARM: tegra: rename tegra124-loki.dts to dtsi as tegra124-loki-common.dtsi

The loki dts file tegra124-loki.dts is no more the top level dts file as
it is used on multiple top level dts file.

The tegra124-loki.dts contains now the most common registration for loki
family and hence renaming this to appropriately as dtsi file.

Change-Id: I66dda8158ce0c74256d4a3241d4b29d0d35c30a7
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/397155
Reviewed-by: David Dastous St Hilaire <ddastoussthi@nvidia.com>

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 45f59f93a4048205d926283097e4efd1db37e970..063181b4ebc99988715bafe3756dc9bc155f6cde 100644 (file)
--- 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 9303821b53a32f0ac3988603b2b503e1f78d3470..56ee1a73054286d2758bdf36ba1dcf080b973982 100644 (file)
--- 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 e87134b9b920551d2746bd31c004a6a6c49341ff..b10f29172f25ff0b94f2fce7995ecc0f1192e37a 100644 (file)
--- 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
similarity index 100%
rename from arch/arm/boot/dts/tegra124-loki.dts
rename to 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 cb4843e7a27fcbc2224ba4f5a6767c53e020cc8b..1aeea89954f2df1748f68390c79cb10d571e83fd 100644 (file)
--- 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 3320bc3f37e4e3326798da58560f07fcd19cd25a..5b8bd375672fc2888620c559982692d6c9993f6d 100644 (file)
--- 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 66af0226e575933b2fa0313ccec978e22e49c8c2..580b099fe91458185a538aeab9edabe2bb50a849 100644 (file)
--- 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 6e623064bd13910a4d50d83a5eddba50335ee001..c695d0a2975b1d171d7b4cd9568cd3ad46964f5e 100644 (file)
--- 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__;