Merge tag 'omap-for-v3.14/fixes-dt-rc4' of git://git.kernel.org/pub/s…

…cm/linux/kernel/git/tmlind/linux-omap into fixes From Tony Lindgren: Two omap3430 vs 3630 device tree regression fixes for issues booting 3430 based boards. * tag 'omap-for-v3.14/fixes-dt-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: omap3-gta04: Add ti,omap36xx to compatible property to avoid problems with booting ARM: dts: omap3-igep: fix boot fail due wrong compatible match Signed-off-by: Olof Johansson <[email protected]>
rtvt123 · Mar 9, 2014 · 1055464 · 1055464
2 parents 4058f76 + ae41a30
commit 1055464
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/arch/arm/boot/dts/omap3-gta04.dts b/arch/arm/boot/dts/omap3-gta04.dts
@@ -13,7 +13,7 @@
 
 / {
 	model = "OMAP3 GTA04";
-	compatible = "ti,omap3-gta04", "ti,omap3";
+	compatible = "ti,omap3-gta04", "ti,omap36xx", "ti,omap3";
 
 	cpus {
 		cpu@0 {

diff --git a/arch/arm/boot/dts/omap3-igep0020.dts b/arch/arm/boot/dts/omap3-igep0020.dts
@@ -14,7 +14,7 @@
 
 / {
 	model = "IGEPv2 (TI OMAP AM/DM37x)";
-	compatible = "isee,omap3-igep0020", "ti,omap3";
+	compatible = "isee,omap3-igep0020", "ti,omap36xx", "ti,omap3";
 
 	leds {
 		pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/omap3-igep0030.dts b/arch/arm/boot/dts/omap3-igep0030.dts
@@ -13,7 +13,7 @@
 
 / {
 	model = "IGEP COM MODULE (TI OMAP AM/DM37x)";
-	compatible = "isee,omap3-igep0030", "ti,omap3";
+	compatible = "isee,omap3-igep0030", "ti,omap36xx", "ti,omap3";
 
 	leds {
 		pinctrl-names = "default";
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ @@
     / {
     	model = "OMAP3 GTA04";
-    	compatible = "ti,omap3-gta04", "ti,omap3";
+    	compatible = "ti,omap3-gta04", "ti,omap36xx", "ti,omap3";
     	cpus {
     		cpu@0 {
@@ Expand Down @@