Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10554647 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.14/fixes-dt-rc4' of... 

Merge tag 'omap-for-v3.14/fixes-dt-rc4' of git://git.kernel.org/pub/scm/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: default avatarOlof Johansson <olof@lixom.net>
parents 4058f762 ae41a303

arch/arm/boot/dts/omap3-gta04.dts

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


/ {

	model = "OMAP3 GTA04";

	compatible = "ti,omap3-gta04", "ti,omap3";

	compatible = "ti,omap3-gta04", "ti,omap36xx", "ti,omap3";



	cpus {

		cpu@0 {

arch/arm/boot/dts/omap3-igep0020.dts

+1 −1
Original line number Diff line number Diff line
@@ -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";

arch/arm/boot/dts/omap3-igep0030.dts

+1 −1
Original line number Diff line number Diff line
@@ -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";