tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Olof Johansson <olof@lixom.net>

Olof Johansson 10554647 4058f762

options
unified split
Changed files
+3 -3
arch
arm
boot
dts
omap3-gta04.dts
omap3-igep0020.dts
omap3-igep0030.dts
+1 -1
arch/arm/boot/dts/omap3-gta04.dts
··· 13 13 14 14 / { 15 15 model = "OMAP3 GTA04"; 16 - compatible = "ti,omap3-gta04", "ti,omap3"; 16 + compatible = "ti,omap3-gta04", "ti,omap36xx", "ti,omap3"; 17 17 18 18 cpus { 19 19 cpu@0 {
+1 -1
arch/arm/boot/dts/omap3-igep0020.dts
··· 14 14 15 15 / { 16 16 model = "IGEPv2 (TI OMAP AM/DM37x)"; 17 - compatible = "isee,omap3-igep0020", "ti,omap3"; 17 + compatible = "isee,omap3-igep0020", "ti,omap36xx", "ti,omap3"; 18 18 19 19 leds { 20 20 pinctrl-names = "default";
+1 -1
arch/arm/boot/dts/omap3-igep0030.dts
··· 13 13 14 14 / { 15 15 model = "IGEP COM MODULE (TI OMAP AM/DM37x)"; 16 - compatible = "isee,omap3-igep0030", "ti,omap3"; 16 + compatible = "isee,omap3-igep0030", "ti,omap36xx", "ti,omap3"; 17 17 18 18 leds { 19 19 pinctrl-names = "default";