Received-SPF: pass (google.com: domain of linux-kernel+bounces-11614-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Josua Mayer <josua@solid-run.com>
Date: Tue, 26 Dec 2023 19:11:38 +0100
Subject: [PATCH v3 7/8] arm: dts: marvell: clearfog-gtr-l8: add support for
 second sfp connector
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20231226-support-clearfog-gtr-l8-sfp-v3-7-fd1ac2d6bf2e@solid-run.com>
References: <20231226-support-clearfog-gtr-l8-sfp-v3-0-fd1ac2d6bf2e@solid-run.com>
In-Reply-To: <20231226-support-clearfog-gtr-l8-sfp-v3-0-fd1ac2d6bf2e@solid-run.com>
To: Andrew Lunn <andrew@lunn.ch>, 
 Gregory Clement <gregory.clement@bootlin.com>, 
 Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>, 
 Rob Herring <robh+dt@kernel.org>, 
 Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, 
 Conor Dooley <conor+dt@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, 
 linux-kernel@vger.kernel.org, Josua Mayer <josua@solid-run.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?UU9IN29OOEVhakp0N0xZdHhQMWJiRlVQTmFoNGt3YVJHZmpPZkdDcGZqbzBx?=
 =?utf-8?B?NkY0WFBBcG1ZVURqLzRhRkZkVzlDeVVpVDJUV1d6Z0paY216ckx0dXN2REtw?=
 =?utf-8?B?c2daS3hUSnU4M282MXBLUWFwVyswamFuK1BiQ2x3Nm9LMkp2a3pGR0dGU0Y0?=
 =?utf-8?B?cnhZY3JuQUFzSVcweWw4ME82aE42VmpkbjlFKzJrN3p5VGVPMXY4c2srMFZC?=
 =?utf-8?B?QVo2OW5xL3FDazVoZ0JnZjl0ZTB4aGVZTmRHbG5kWFI4YnVXVWI0cFZLRGRK?=
 =?utf-8?B?NWhpR2FORmdZMlRVdGJoU0tvWDJubEpjazQ0aFAzN0tNTk8vZWh4dDBaM095?=
 =?utf-8?B?anM4eFBHSXRnMXZWQTZFNkh3K0NOT1BBUjF2M01PSTAxTE16ZVV2cm1RN0dp?=
 =?utf-8?B?WEg1QmQ2YXBRSzhSdmEwNk1DSGRZN3ZxMS8rK0xWZjUydnphdWkzdlFLdU5w?=
 =?utf-8?B?bC81b0JFejhLek1neitZL1FBWnBMdlBiUDRtbEUzL2FHUjJ1V0xGV3p2U1Bl?=
 =?utf-8?B?KytTZXZwMmZvOTNuTExhRmliWWtCMVd1aFJoVWtiQUxSQ0VNUzFEM1FmVGo0?=
 =?utf-8?B?cFdHRzBWVHhDdFNIUzRwWGt3ejFkcHZlSXNNUXFNYS93YVZoMy92V3hvTG5j?=
 =?utf-8?B?TGMyR0Q0SFUrOEN5VFRObENLK2R0alpOUXdTM0JFK1N3N1krMXJoaFBVeWZF?=
 =?utf-8?B?L1lBdWpQVHVKN1g5dWZLVDM4bzJXM00vVU5CbDBVN3dZMGZRS2JoTnl3cEl0?=
 =?utf-8?B?c2Izb3RpN2h1TjhXaVpibmhsU2Jjb3BBMThaTnpDL011MTdQcmZJSVo1Vmcw?=
 =?utf-8?B?K1N4b2U4Vk5XREhRN240eW4xekFXYVFuZjZ3TkRvWmNyMC9BZ0R0VkY1ZzRS?=
 =?utf-8?B?Q0ppc1k3TlVsbStnT3JVWE4xaXdMRzVtK256ZU5HbWJVMTFzZ2NieHdtakFz?=
 =?utf-8?B?NEFPQW15MFRrMjg2MUQvOFFvRkJYei90ZERtOXNjTThYd2V0aVJhNTczTmdC?=
 =?utf-8?B?dDQwNmlySjdLOGN0VUZUWldxYWJWMk52ZlFneWNPMG5VV1d3bG0va0FmUXBz?=
 =?utf-8?B?ZGRSYjdTaWFvU1NQUWRNYjRqNGxKU01iRzBMcTQxUmN3NWpFU3FLUkVKQlVC?=
 =?utf-8?B?M0VIZ1UvYmNUcDF3Z1EyemRGK2JabTJXYTk3WHdHQzdxeUhkQjRiNUFkbnFy?=
 =?utf-8?B?Z1QreVFia0RTZzdZN0h3SU9QdzhkaldqNEo4UnZRcTUxR29EeCtnZFdYa0lv?=
 =?utf-8?B?YmR5dzFzTmtxK2Mxd2NLN1hIaEFYSndKTDB2Sm1KMVF1ZlZHSGUzQ05RKzR0?=
 =?utf-8?B?RXBkNHUzdGlYdnRadEhoTURTUTh1NHVuSEhSS1VkbjBFOWR2MEZqZGIyYmh4?=
 =?utf-8?B?WEVBaWtjQ2E2L1JXaUhSOHFUcnJXOUY1TUpGRUlXNVBxZENxdE5ZK1F3U3NV?=
 =?utf-8?B?bHhlK3g4UFpZL0hZTlV4V0J3VmJXS0V0NVMvOXVyWWM3cWFOTEgwWld6TWk5?=
 =?utf-8?B?Sjh2b3FXaGQ3T09FOTNVMUpHK0Q3MGRtUWhLN1IxWjd0M2s3Mmx4YjZEdktj?=
 =?utf-8?B?czNZeHRQNEwybll0TzQ1RHBzOFRySG9mbTFNaDVKaXN6T0taKytOY2ttTTND?=
 =?utf-8?B?SURzQW9oeGdPdW5Yem5VdGxrMHNUY2RnVkNxemRDMXJLSmloYTVUa3ZVNGRO?=
 =?utf-8?B?aTRwU0l2V29xbmRZckNPSWQxaU8wOEh6SjAwMm1hUGRnMk1JVDdDbjRjLzVM?=
 =?utf-8?B?NGdEWGFFaDVqQTU2K2tnc2pmNVg4ZVE0dzVyVHpaZ3BDMHdWUTlDUjRPRVU2?=
 =?utf-8?B?ZnFNWWpZZVpubUlZMSs1bmVobG1YaFhIMC9xRTdnT0h6enZ2VHUxck52SnlG?=
 =?utf-8?B?cmUxS3QvcWc5Ym5xMWVqOExrYk1NbTArMUV3U1Y4blR0REFGSFc4bXRQdHU3?=
 =?utf-8?B?M1I2bisvKytxa2VpV0FOdVIvdURCNzl1R2tGNDV6M292dExCc3YrR1lnNWxl?=
 =?utf-8?B?Z2ZvUjlCSVZsRGIvdGtIWWtucC9YaUFCTndXVE5HUGFDdWluTm1XTWkvRmRY?=
 =?utf-8?B?OVRPNGpIV1F3bXU5UGV3QVlZY2gxbHI3Q0c0RFVNWXBXR05xSEJOYUYrNHJ5?=
 =?utf-8?Q?eB9UX4WUybPctuW2Hd1BqMAz7?=
X-OriginatorOrg: solid-run.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6098bdfb-6c62-477e-8fad-08dc063e241a
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8963.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Dec 2023 18:11:54.4659
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: a4a8aaf3-fd27-4e27-add2-604707ce5b82
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: G9jcW4pJf8T15xmSNNOv4c9K3aJ1Bp6CqWXZ7SVbQGi0Pqx6qCctcaLtDiQCElDMxUKw/UIcfBoPyTsw4LxbBA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9868

Clearfog GTR L8 has an extra SFP connector on the managed switch port 9.
Add descriptions for both entities along with pinctrl.

Signed-off-by: Josua Mayer <josua@solid-run.com>
---
 .../boot/dts/marvell/armada-385-clearfog-gtr-l8.dts  | 20 +++++++++++++++++++-
 .../boot/dts/marvell/armada-385-clearfog-gtr.dtsi    |  8 +++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts
index cd5b070f1218..2df388f222ec 100644
--- a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts
+++ b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts
@@ -6,6 +6,16 @@ / {
 	model = "SolidRun Clearfog GTR L8";
 	compatible = "solidrun,clearfog-gtr-l8", "marvell,armada385",
 		     "marvell,armada380";
+
+	/* CON25 */
+	sfp1: sfp-1 {
+		compatible = "sff,sfp";
+		pinctrl-0 = <&cf_gtr_sfp1_pins>;
+		pinctrl-names = "default";
+		i2c-bus = <&i2c0>;
+		mod-def0-gpio = <&gpio0 24 GPIO_ACTIVE_LOW>;
+		tx-disable-gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
+	};
 };
 
 &mdio {
@@ -68,11 +78,19 @@ port@8 {
 				phy-handle = <&switch0phy7>;
 			};
 
+			port@9 {
+				reg = <9>;
+				label = "lan-sfp";
+				phy-mode = "sgmii";
+				sfp = <&sfp1>;
+				managed = "in-band-status";
+			};
+
 			port@10 {
 				reg = <10>;
 				phy-mode = "2500base-x";
-
 				ethernet = <&eth1>;
+
 				fixed-link {
 					speed = <2500>;
 					full-duplex;
diff --git a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr.dtsi b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr.dtsi
index 39ac97edb463..f3a3cb6ac311 100644
--- a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr.dtsi
+++ b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr.dtsi
@@ -201,6 +201,12 @@ cf_gtr_sfp0_pins: sfp0-pins {
 					marvell,function = "gpio";
 				};
 
+				cf_gtr_sfp1_pins: sfp1-pins {
+					/* sfp modabs, txdisable */
+					marvell,pins = "mpp24", "mpp54";
+					marvell,function = "gpio";
+				};
+
 				cf_gtr_spi1_cs_pins: spi1-cs-pins {
 					marvell,pins = "mpp59";
 					marvell,function = "spi1";
@@ -276,7 +282,7 @@ pcie@3,0 {
 	};
 
 	/* CON5 */
-	sfp0: sfp {
+	sfp0: sfp-0 {
 		compatible = "sff,sfp";
 		pinctrl-0 = <&cf_gtr_sfp0_pins>;
 		pinctrl-names = "default";

-- 
2.35.3