Merge tag 'mvebu-dt-4.17-2' of git://git.infradead.org/linux-mvebu into next/dt

Pull "mvebu dt for 4.17 (part 2)" from Gregory CLEMENT:

 - add SFP module support on the clearfog (Armada 388 based board)

 - disable internal RTC node for Linksys boards (Armada 38x based
   boards)

* tag 'mvebu-dt-4.17-2' of git://git.infradead.org/linux-mvebu:
  ARM: dts: armada388-clearfog: add SFP module support
  ARM: dts: armada-385-linksys: Disable internal RTC

2 files changed, 17 insertions, 33 deletions

diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 434dc9aaa5e4..b7bbf15571c5 100644
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -282,3 +282,8 @@
         status = "okay";
         usb-phy = <&usb3_1_phy>;
 };
+
+&rtc {
+        /* No crystal connected to the internal RTC */
+        status = "disabled";
+};
diff --git a/arch/arm/boot/dts/armada-388-clearfog.dtsi b/arch/arm/boot/dts/armada-388-clearfog.dtsi
index 0e3b1f140e6d..a44bf20ab7f8 100644
--- a/arch/arm/boot/dts/armada-388-clearfog.dtsi
+++ b/arch/arm/boot/dts/armada-388-clearfog.dtsi
@@ -117,6 +117,16 @@
                         };
                 };
         };
+
+        sfp: sfp {
+                compatible = "sff,sfp";
+                i2c-bus = <&i2c1>;
+                los-gpio = <&expander0 12 GPIO_ACTIVE_HIGH>;
+                mod-def0-gpio = <&expander0 15 GPIO_ACTIVE_LOW>;
+                tx-disable-gpio = <&expander0 14 GPIO_ACTIVE_HIGH>;
+                tx-fault-gpio = <&expander0 13 GPIO_ACTIVE_HIGH>;
+                maximum-power-milliwatt = <2000>;
+        };
 };
 
 &eth1 {
@@ -133,13 +143,10 @@
         bm,pool-long = <3>;
         bm,pool-short = <1>;
         buffer-manager = <&bm>;
+        managed = "in-band-status";
         phy-mode = "sgmii";
+        sfp = <&sfp>;
         status = "okay";
-
-        fixed-link {
-                speed = <1000>;
-                full-duplex;
-        };
 };
 
 &i2c0 {
@@ -208,34 +215,6 @@
                         output-low;
                         line-name = "m.2 devslp";
                 };
-                sfp_los {
-                        /* SFP loss of signal */
-                        gpio-hog;
-                        gpios = <12 GPIO_ACTIVE_HIGH>;
-                        input;
-                        line-name = "sfp-los";
-                };
-                sfp_tx_fault {
-                        /* SFP laser fault */
-                        gpio-hog;
-                        gpios = <13 GPIO_ACTIVE_HIGH>;
-                        input;
-                        line-name = "sfp-tx-fault";
-                };
-                sfp_tx_disable {
-                        /* SFP transmit disable */
-                        gpio-hog;
-                        gpios = <14 GPIO_ACTIVE_HIGH>;
-                        output-low;
-                        line-name = "sfp-tx-disable";
-                };
-                sfp_mod_def0 {
-                        /* SFP module present */
-                        gpio-hog;
-                        gpios = <15 GPIO_ACTIVE_LOW>;
-                        input;
-                        line-name = "sfp-mod-def0";
-                };
         };
 
         /* The MCP3021 supports standard and fast modes */