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

[deliverable/linux.git] / arch / arm / boot / dts / picoxcell-pc3x2.dtsi

diff --git a/arch/arm/boot/dts/picoxcell-pc3x2.dtsi b/arch/arm/boot/dts/picoxcell-pc3x2.dtsi
index f0a8c2068ea7c902641894a5bbddb89e1920ae06..533919e96eaee8f70054a42e5e66db433143d6a4 100644 (file)
--- a/arch/arm/boot/dts/picoxcell-pc3x2.dtsi
+++ b/arch/arm/boot/dts/picoxcell-pc3x2.dtsi
@@ -18,13 +18,13 @@
        #size-cells = <1>;
 
        cpus {
-               #address-cells = <1>;
+               #address-cells = <0>;
                #size-cells = <0>;
 
-               cpu@0 {
-                       compatible = "arm,1176jz-s";
+               cpu {
+                       compatible = "arm,arm1176jz-s";
+                       device_type = "cpu";
                        clock-frequency = <400000000>;
-                       reg = <0>;
                        d-cache-line-size = <32>;
                        d-cache-size = <32768>;
                        i-cache-line-size = <32>;