Merge tag 'regmap-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[deliverable/linux.git] / arch / arm / boot / dts / hrefprev60.dts

diff --git a/arch/arm/boot/dts/hrefprev60.dts b/arch/arm/boot/dts/hrefprev60.dts
index c2d2748159238a0f830fc452887792c9a39f2062..c6bb07df2d1dd3670e4cd49a199300eb5d178f78 100644 (file)
--- a/arch/arm/boot/dts/hrefprev60.dts
+++ b/arch/arm/boot/dts/hrefprev60.dts
@@ -10,9 +10,9 @@
  */
 
 /dts-v1/;
-/include/ "dbx5x0.dtsi"
-/include/ "href.dtsi"
-/include/ "stuib.dtsi"
+#include "dbx5x0.dtsi"
+#include "href.dtsi"
+#include "stuib.dtsi"
 
 / {
        model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";
@@ -24,7 +24,7 @@
                };
        };
 
-       soc-u9500 {
+       soc {
                prcmu@80157000 {
                        ab8500@5 {
                                ab8500-gpio {
@@ -41,7 +41,7 @@
                };
 
                i2c@80110000 {
-                       bu21013_tp@0x5c {
+                       bu21013_tp@5c {
                                reset-gpio = <&tc3589x_gpio 13 0x4>;
                        };
                };