path: root/arch/arm/boot/dts/omap3-beagle-xm.dts
diff options
authorOlof Johansson <olof@lixom.net>2013-09-18 14:01:39 -0700
committerOlof Johansson <olof@lixom.net>2013-09-18 14:01:39 -0700
commit660e1c2f47f51f5b03ea7f63fa11f000e0240bda (patch)
tree3da729ae94f3c9b6a61c0398d71cc1f161709587 /arch/arm/boot/dts/omap3-beagle-xm.dts
parent90e17dccd59c6649cfb450a14da4b66e9f6f884d (diff)
parent45bea1d39a956619881315e20bdf52c8a702be03 (diff)
Merge tag 'omap-for-v3.12/fixes-dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
From Tony Lindgren, OMAP DT fixes for 3.12-rc1: OMAP device tree changes that are needed to fix regressions and avoid electrical issues on beaglebone black. Via Benoit Cousson <bcousson@baylibre.com>: Fix BBB LDO voltage to avoid HDMI destruction Fix OMAP5 wrong attribute Fix typo in beagle xM strings Fix missing pinmux and regulator for OMAP4 wifi Fix missing pinmux for igep headset * tag 'omap-for-v3.12/fixes-dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: igep00x0: Add pinmux configuration for MCBSP2 ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for blaze ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for pandaboard ARM: dts: OMAP5: fix ocp2scp DTS data ARM: dts: OMAP5: fix reg property size ARM: dts: am335x-bone*: add DT for BeagleBone Black ARM: dts: omap3-beagle-xm: fix string error in compatible property Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/omap3-beagle-xm.dts')
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index afdb16417d4e..0c514dc8460c 100644
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -11,7 +11,7 @@
/ {
model = "TI OMAP3 BeagleBoard xM";
- compatible = "ti,omap3-beagle-xm, ti,omap3-beagle", "ti,omap3";
+ compatible = "ti,omap3-beagle-xm", "ti,omap3-beagle", "ti,omap3";
cpus {
cpu@0 {