Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[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 18f25c5e75aebc3584699ec661b07fde5610f17c..6ae4d95e230e58a468c908d85c2cfaf8d87894a0 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -76,8 +76,8 @@
                allwinner,pipelines = <&fe0>;
        };
 
-       soc@01c00000 {
-               hdmi: hdmi@01c16000 {
+       soc@1c00000 {
+               hdmi: hdmi@1c16000 {
                        compatible = "allwinner,sun5i-a10s-hdmi";
                        reg = <0x01c16000 0x1000>;
                        interrupts = <58>;
@@ -111,7 +111,7 @@
                        };
                };
 
-               pwm: pwm@01c20e00 {
+               pwm: pwm@1c20e00 {
                        compatible = "allwinner,sun5i-a10s-pwm";
                        reg = <0x01c20e00 0xc>;
                        clocks = <&ccu CLK_HOSC>;