ARM: Kirkwood: allow to use netxbig DTSI for d2net_v2 DTS

The d2 Network v2 board (d2net_v2) shares a lot of hardware
characteristics with the 2Big and 5Big Network v2 boards. This patch
prepares the kirkwood-netxbig.dtsi file in order to allow to include it
from the d2net_v2 DTS file. The DT nodes only relevant for the 2Big and
5Big Network v2 boards are moved into their respective DTS files.

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1404830545-15581-2-git-send-email-simon.guinot@sequanux.org
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/boot/dts/kirkwood-net2big.dts b/arch/arm/boot/dts/kirkwood-net2big.dts
index a98deccee59f24404886dffdfca7a77c0ad5a499..53dc37a3b6875dd10fcbe9babee959de4f5a95bd 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-net2big.dts
+++ b/arch/arm/boot/dts/kirkwood-net2big.dts
@@ -28,3 +28,33 @@
                reg = <0x00000000 0x10000000>;
        };
 };
+
+&regulators {
+       regulator@2 {
+               compatible = "regulator-fixed";
+               reg = <2>;
+               regulator-name = "hdd1power";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&gpio0 17 GPIO_ACTIVE_HIGH>;
+       };
+
+       clocks {
+              g762_clk: g762-oscillator {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <32768>;
+              };
+       };
+};
+
+&i2c0 {
+       g762@3e {
+               compatible = "gmt,g762";
+               reg = <0x3e>;
+               clocks = <&g762_clk>;
+       };
+};

diff --git a/arch/arm/boot/dts/kirkwood-net5big.dts b/arch/arm/boot/dts/kirkwood-net5big.dts
index d2887ed493f2f6565b10780b5eb0dc8936cde6a9..36155b749d9fcbbf2bb579e0af5cccd066234867 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-net5big.dts
+++ b/arch/arm/boot/dts/kirkwood-net5big.dts
@@ -31,6 +31,18 @@
 };
 
 &regulators {
+       regulator@2 {
+               compatible = "regulator-fixed";
+               reg = <2>;
+               regulator-name = "hdd1power";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&gpio0 17 GPIO_ACTIVE_HIGH>;
+       };
+
        regulator@3 {
                compatible = "regulator-fixed";
                reg = <3>;
@@ -66,6 +78,14 @@
                regulator-boot-on;
                gpio = <&gpio1 11 GPIO_ACTIVE_HIGH>;
        };
+
+       clocks {
+              g762_clk: g762-oscillator {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <32768>;
+              };
+       };
 };
 
 &mdio {
@@ -81,3 +101,11 @@
        };
 };
 
+
+&i2c0 {
+       g762@3e {
+               compatible = "gmt,g762";
+               reg = <0x3e>;
+               clocks = <&g762_clk>;
+       };
+};

diff --git a/arch/arm/boot/dts/kirkwood-netxbig.dtsi b/arch/arm/boot/dts/kirkwood-netxbig.dtsi
index fd75720547e39d4d25a215b32c56a1ff244b7bc2..b0cfb7cd30b9653155f29fb9c279308e698d1a35 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-netxbig.dtsi
+++ b/arch/arm/boot/dts/kirkwood-netxbig.dtsi
@@ -104,26 +104,6 @@
                        regulator-boot-on;
                        gpio = <&gpio0 16 GPIO_ACTIVE_HIGH>;
                };
-
-               regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "hdd1power";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&gpio0 17 GPIO_ACTIVE_HIGH>;
-               };
-
-               clocks {
-                      g762_clk: g762-oscillator {
-                                compatible = "fixed-clock";
-                                #clock-cells = <0>;
-                                clock-frequency = <32768>;
-                      };
-               };
        };
 };
 
@@ -171,10 +151,4 @@
                pagesize = <16>;
                reg = <0x50>;
        };
-
-       g762@3e {
-               compatible = "gmt,g762";
-               reg = <0x3e>;
-               clocks = <&g762_clk>;
-       };
 };