diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-09 10:56:31 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-09 10:56:31 +0400 |
| commit | 10554647b488f58f2c36c78368e9bab4b93da721 (patch) | |
| tree | 007c561cd1390fc71fe23d0596849901cd9d5c47 /arch/arm/boot/dts/omap3-gta04.dts | |
| parent | 4058f76247b29978352339fb6278bed796dd210f (diff) | |
| parent | ae41a3030ce8901853b3cfd5e118a4b0288aa068 (diff) | |
| download | linux-10554647b488f58f2c36c78368e9bab4b93da721.tar.xz | |
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>
Diffstat (limited to 'arch/arm/boot/dts/omap3-gta04.dts')
| -rw-r--r-- | arch/arm/boot/dts/omap3-gta04.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-gta04.dts b/arch/arm/boot/dts/omap3-gta04.dts index c551e4af4d83..d3b253bbc885 100644 --- 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 { |