diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2014-04-16 19:36:33 +0530 |
|---|---|---|
| committer | Seema Khowala <seemaj@nvidia.com> | 2014-04-23 14:07:02 -0700 |
| commit | 13cbaa524d79bce7c24c987762ad13c50b95a49b (patch) | |
| tree | d555b8d8ebe6497777e06d79ed7256f02f9be62e /arch/arm/boot | |
| parent | fd827fb80308f78b00ab79f456194e3e7a7a4eb9 (diff) | |
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>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra124-loki-02-cell-battery.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra124-loki-03-cell-battery.dts | 2 | ||||
| -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.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra124-loki-e2530-a03.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra124-loki-e2548-a00.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra124-loki-mods.dts | 3 |
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__; |