From 36d088ace412964179ee5c75892a2f25378c6667 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@armlinux.org.uk>
Date: Tue, 19 Dec 2017 11:12:15 +0000
Subject: ARM: dts: vf610-zii-dev-rev-b: add support for SFF modules

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---
 arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 69 ++++++++++++++-----------------
 1 file changed, 31 insertions(+), 38 deletions(-)

diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
index 66b45b9c25de..e5142647cc12 100644
--- a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
+++ b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
@@ -228,25 +228,13 @@
 					port@3 {
 						reg = <3>;
 						label = "optical3";
-
-						fixed-link {
-							speed = <1000>;
-							full-duplex;
-							link-gpios = <&gpio6 2
-							      GPIO_ACTIVE_HIGH>;
-						};
+						sfp = <&opt_p3>;
 					};
 
 					port@4 {
 						reg = <4>;
 						label = "optical4";
-
-						fixed-link {
-							speed = <1000>;
-							full-duplex;
-							link-gpios = <&gpio6 3
-							      GPIO_ACTIVE_HIGH>;
-						};
+						sfp = <&opt_p4>;
 					};
 
 					switch2port9: port@9 {
@@ -328,6 +316,31 @@
 			select-gpios = <&gpio4 4 GPIO_ACTIVE_HIGH>;
 		};
 	};
+
+	opt_p2: sff0 {
+		compatible = "sff,sff";
+		i2c-bus = <&opt_p2_i2c>;
+		los-gpios = <&gpio6 1 GPIO_ACTIVE_HIGH>;
+	};
+
+	opt_p1: sff1 {
+		compatible = "sff,sff";
+		i2c-bus = <&opt_p1_i2c>;
+		los-gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>;
+		status = "disabled";
+	};
+
+	opt_p4: sff2 {
+		compatible = "sff,sff";
+		i2c-bus = <&opt_p4_i2c>;
+		los-gpios = <&gpio6 3 GPIO_ACTIVE_HIGH>;
+	};
+
+	opt_p3: sff3 {
+		compatible = "sff,sff";
+		i2c-bus = <&opt_p3_i2c>;
+		los-gpios = <&gpio6 2 GPIO_ACTIVE_HIGH>;
+	};
 };
 
 &i2c0 {
@@ -362,48 +375,28 @@
 		reg = <0x70>;
 		reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;
 
-		i2c@0 {
+		opt_p2_i2c: i2c@0 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0>;
-
-			sfp1: eeprom@50 {
-				compatible = "atmel,24c02";
-				reg = <0x50>;
-			};
 		};
 
-		i2c@1 {
+		opt_p1_i2c: i2c@1 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <1>;
-
-			sfp2: eeprom@50 {
-				compatible = "atmel,24c02";
-				reg = <0x50>;
-			};
 		};
 
-		i2c@2 {
+		opt_p4_i2c: i2c@2 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <2>;
-
-			sfp3: eeprom@50 {
-				compatible = "atmel,24c02";
-				reg = <0x50>;
-			};
 		};
 
-		i2c@3 {
+		opt_p3_i2c: i2c@3 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <3>;
-
-			sfp4: eeprom@50 {
-				compatible = "atmel,24c02";
-				reg = <0x50>;
-			};
 		};
 
 		i2c@4 {
-- 
cgit