projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7d1311b)
ARM: pxa: dts: fix mmc controller compatible string
authorDaniel Mack <zonque@gmail.com>
Thu, 14 Aug 2014 09:46:12 +0000 (11:46 +0200)
committerHaojian Zhuang <haojian.zhuang@linaro.org>
Thu, 18 Sep 2014 17:38:52 +0000 (01:38 +0800)
The vendor prefix was renamed from "mrvl" to "marvell". Follow this
change in the dts file.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
arch/arm/boot/dts/pxa2xx.dtsi patch | blob | blame | history

diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi
index a5e90f078aa9fd56995b4191e773bdb1eda5ac76..0e8dbff6145d7aee1a8d9ce5f41e82b706a5477f 100644 (file)
--- a/arch/arm/boot/dts/pxa2xx.dtsi
+++ b/arch/arm/boot/dts/pxa2xx.dtsi
@@ -120,7 +120,7 @@
                };
 
                mmc0: mmc@41100000 {
-                       compatible = "mrvl,pxa-mmc";
+                       compatible = "marvell,pxa-mmc";
                        reg = <0x41100000 0x1000>;
                        interrupts = <23>;
                        status = "disabled";