Merge tag 'char-misc-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / sun5i-a10s.dtsi

diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 79fd412005b02860c5dcb8712418273584fa3b8f..ee17b1c379e319fb852cc47099abe8ca2a61af83 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -294,7 +294,7 @@
                };
 
                intc: interrupt-controller@01c20400 {
-                       compatible = "allwinner,sun4i-ic";
+                       compatible = "allwinner,sun4i-a10-ic";
                        reg = <0x01c20400 0x400>;
                        interrupt-controller;
                        #interrupt-cells = <1>;
@@ -366,7 +366,7 @@
                };
 
                timer@01c20c00 {
-                       compatible = "allwinner,sun4i-timer";
+                       compatible = "allwinner,sun4i-a10-timer";
                        reg = <0x01c20c00 0x90>;
                        interrupts = <22>;
                        clocks = <&osc24M>;
@@ -378,7 +378,7 @@
                };
 
                sid: eeprom@01c23800 {
-                       compatible = "allwinner,sun4i-sid";
+                       compatible = "allwinner,sun4i-a10-sid";
                        reg = <0x01c23800 0x10>;
                };