diff options
-rw-r--r-- | arch/arm/boot/dts/omap4-panda-common.dtsi | 3 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap4-panda-es.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap4-panda.dts | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi index 8cfa3c8a72b0..150513506c19 100644 --- a/arch/arm/boot/dts/omap4-panda-common.dtsi +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi | |||
@@ -8,9 +8,6 @@ | |||
8 | #include "elpida_ecb240abacn.dtsi" | 8 | #include "elpida_ecb240abacn.dtsi" |
9 | 9 | ||
10 | / { | 10 | / { |
11 | model = "TI OMAP4 PandaBoard"; | ||
12 | compatible = "ti,omap4-panda", "ti,omap4430", "ti,omap4"; | ||
13 | |||
14 | memory { | 11 | memory { |
15 | device_type = "memory"; | 12 | device_type = "memory"; |
16 | reg = <0x80000000 0x40000000>; /* 1 GB */ | 13 | reg = <0x80000000 0x40000000>; /* 1 GB */ |
diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts index 816d1c95b592..2f1dabcc6adf 100644 --- a/arch/arm/boot/dts/omap4-panda-es.dts +++ b/arch/arm/boot/dts/omap4-panda-es.dts | |||
@@ -10,6 +10,11 @@ | |||
10 | #include "omap4460.dtsi" | 10 | #include "omap4460.dtsi" |
11 | #include "omap4-panda-common.dtsi" | 11 | #include "omap4-panda-common.dtsi" |
12 | 12 | ||
13 | / { | ||
14 | model = "TI OMAP4 PandaBoard-ES"; | ||
15 | compatible = "ti,omap4-panda-es", "ti,omap4-panda", "ti,omap4460", "ti,omap4430", "ti,omap4"; | ||
16 | }; | ||
17 | |||
13 | /* Audio routing is differnet between PandaBoard4430 and PandaBoardES */ | 18 | /* Audio routing is differnet between PandaBoard4430 and PandaBoardES */ |
14 | &sound { | 19 | &sound { |
15 | ti,model = "PandaBoardES"; | 20 | ti,model = "PandaBoardES"; |
diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts index 6189a8b77d7f..a0e28b2e254e 100644 --- a/arch/arm/boot/dts/omap4-panda.dts +++ b/arch/arm/boot/dts/omap4-panda.dts | |||
@@ -9,3 +9,8 @@ | |||
9 | 9 | ||
10 | #include "omap443x.dtsi" | 10 | #include "omap443x.dtsi" |
11 | #include "omap4-panda-common.dtsi" | 11 | #include "omap4-panda-common.dtsi" |
12 | |||
13 | / { | ||
14 | model = "TI OMAP4 PandaBoard"; | ||
15 | compatible = "ti,omap4-panda", "ti,omap4430", "ti,omap4"; | ||
16 | }; | ||