Merge tag 'gfs2-4.7.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2...

[cascardo/linux.git] / arch / arm / boot / dts / kirkwood-nsa320.dts

diff --git a/arch/arm/boot/dts/kirkwood-nsa320.dts b/arch/arm/boot/dts/kirkwood-nsa320.dts
index 24f686d..6ab104b 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-nsa320.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa320.dts
@@ -27,16 +27,6 @@
                stdout-path = &uart0;
        };
 
-       mbus {
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
-       };
-
        ocp@f1000000 {
                pinctrl: pin-controller@10000 {
                        pinctrl-names = "default";
@@ -193,10 +183,19 @@
                };
        };
 
+       hwmon {
+               compatible = "zyxel,nsa320-mcu";
+               pinctrl-0 = <&pmx_mcu_data &pmx_mcu_clk &pmx_mcu_act>;
+               pinctrl-names = "default";
+
+               data-gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
+               clk-gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
+               act-gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
+       };
+
        /* The following pins are currently not assigned to a driver,
           some of them should be configured as inputs.
-       pinctrl-0 = <&pmx_mcu_data &pmx_mcu_clk &pmx_mcu_act
-                    &pmx_htp &pmx_vid_b1
+       pinctrl-0 = <&pmx_htp &pmx_vid_b1
                     &pmx_power_resume_data &pmx_power_resume_clk>; */
 };
 
@@ -213,3 +212,11 @@
                phy-handle = <&ethphy0>;
        };
 };
+
+&pciec {
+        status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};