From patchwork Thu Jan 4 17:48:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josua Mayer X-Patchwork-Id: 759939 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2083.outbound.protection.outlook.com [40.107.8.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BAECB2C69C; Thu, 4 Jan 2024 17:48:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=solid-run.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=solid-run.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=solidrn.onmicrosoft.com header.i=@solidrn.onmicrosoft.com header.b="LdevKSTF" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TbzSPCC2Dv+9sJ/HCBXOB+dFgSwsXtyRtQO6oPjzOp5G26xNGjCLc9mjj8rGwjcqpgda3nnOPR+pI6jfhNAL5+ynRUj/CReXeexNaYrFYZ/g1mzSP0jhTjBM2EMEV11sHWHScmGuBCkSK7tKkP23h9cqaCXBbm5xfEWKAZIF2rGsxrOr3cKvSQS2c2PF2tHnYCMP6metk39+kEc7iXsqhsVJt38gVgbIBr18rTdZlRchMqox27NJgPhYLb7Iilo1hOka54rM0U9tVBxp2FoGNiLp7xGQ8JbKHJV/ehh5ogSmIJ+gkT5p+fRt6OuJ+L+4HuVn4mphSFh2FmOEwzANNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=P40i+6AVm8IdTbDuAqwbFqY4jH9ZruaP6Q9zKpBfGZ4=; b=XMcGo1Nep3K1bIBn5HSlJzUYX9aouWituqqhl4ACZ7Gyabp2m7+b+WuzCmAG4p/1Lj3Xs7ymdT5vFjI3RRmbCabFT7/eJfNqqoaTc7EnukR/F3vB46CWqM2iUbt0ubOaZv0M6AYsJb0K8ZSxb0U08rQFXaLTzyZIohUCvdubRbtNxl4hKcHtq7fDEtHKX4e+ab41Yj1Ziv+NzmWNEfTuWVC+QRdDll7sgCv8FiBQBU8d14WCb5odIbAA0XeblA5smI1Ztuc2SC0Yok7eOk5VSp7Z3eLpkOyn7ixgoHOJvVOedA/oJJuNyGx2KjlToeIu+B7pQ/KQceDe/4ZcXy68pA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=solid-run.com; dmarc=pass action=none header.from=solid-run.com; dkim=pass header.d=solid-run.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=solidrn.onmicrosoft.com; s=selector1-solidrn-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=P40i+6AVm8IdTbDuAqwbFqY4jH9ZruaP6Q9zKpBfGZ4=; b=LdevKSTFeR8/enr2gzZ0d/wi4GBxUeCIkq2rLZriydFLCo78Govr86ghgto/6taGPdFO2EVadzNj049msZez+6jbS93St7+TqSIEUhF7aSI01EhEs9mOXnb+7M3tDKXZVLwgmuWgI5SqBfN82XqPTZ3JOEzHpNfjpL/aPoC3uRY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=solid-run.com; Received: from AS8PR04MB8963.eurprd04.prod.outlook.com (2603:10a6:20b:42e::18) by DB9PR04MB8233.eurprd04.prod.outlook.com (2603:10a6:10:24b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.14; Thu, 4 Jan 2024 17:48:12 +0000 Received: from AS8PR04MB8963.eurprd04.prod.outlook.com ([fe80::daf2:8c54:d469:793d]) by AS8PR04MB8963.eurprd04.prod.outlook.com ([fe80::daf2:8c54:d469:793d%6]) with mapi id 15.20.7159.013; Thu, 4 Jan 2024 17:48:12 +0000 From: Josua Mayer Date: Thu, 04 Jan 2024 18:48:10 +0100 Subject: [PATCH v5 09/10] arm: dts: marvell: clearfog-gtr-l8: add support for second sfp connector Message-Id: <20240104-support-clearfog-gtr-l8-sfp-v5-9-52be60fc54e3@solid-run.com> References: <20240104-support-clearfog-gtr-l8-sfp-v5-0-52be60fc54e3@solid-run.com> In-Reply-To: <20240104-support-clearfog-gtr-l8-sfp-v5-0-52be60fc54e3@solid-run.com> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Russell King Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Josua Mayer X-Mailer: b4 0.12.4 X-ClientProxiedBy: FR4P281CA0409.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d0::9) To AS8PR04MB8963.eurprd04.prod.outlook.com (2603:10a6:20b:42e::18) Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8963:EE_|DB9PR04MB8233:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a22f743-7565-4aa9-aefe-08dc0d4d5106 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WXJlQOyv4YG6OXzLGukNevac4GmFnpFokxNQcfNdfjJgwn3naV/a1DMmZPjDyb34frDBRy7fJXxMiEfDz8QQeDNYAC6hYEJzBKtV/mfv37XE4Nk44oLeaJ2frvyf9arCWHCHH9Y3WSj5WDllqjb4QZkpvBIGLWUsco8Esfoi+TrTmTor18hvTvYagV/s20Gsl7SUvEm7o8S5yTE8NtA2LcPSHoPu/dFuSaBkYY7pbZ63kvSYCyWqEswL7F4hjs7mg+LMt5ow8vLwLpMdTdtRCTK4E6SnCMCqo2k1ZOB5aBX0YJMAcDl/qxoK3LCtkosAT+Oo90RYxpyXLWOycDSA2B3Dza8PSe+E4vwOi5Ov2Akp8F80n1sT3nrX4ZfN9MpLw+eApAB/XI0wV/hP/X2nzvnT1YuRAlpntvEROJvvSaX1iSs3GZZL+oUYwToHwZHgjs4tRxzGdwGB88EKKaOicSnGcl4lvc3pdKgNBsWhWV/V0U0ZlC0PO66zsQE+1Ynp4nQ+6SA279XLqy9OKgZOS3s/lH3wZBBo/cJk0e37fzMp4f7QhjPDjk731HqKa7zmsbDMMaPnIDL7ixAfE1UBzbCLpJxZgTT80VrdGrRPLlzbGkRv5AgcXQBlitvMAtHj X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8963.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(136003)(376002)(346002)(366004)(396003)(39840400004)(230922051799003)(186009)(64100799003)(451199024)(1800799012)(38100700002)(38350700005)(36756003)(86362001)(26005)(4326008)(107886003)(6512007)(6506007)(66476007)(66946007)(66556008)(8676002)(478600001)(8936002)(6486002)(52116002)(316002)(110136005)(2616005)(83380400001)(41300700001)(5660300002)(7416002)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?/eprM7YKizJr8Nf7W9Bf/PtccEgY?= =?utf-8?q?03hnrfPAUMKSNHy62c4z3rC9W8wZRZ7uUa3QMfU4KVjyBSnPOj+ZfsY4eVDfcYDUA?= =?utf-8?q?1RGDL9+HEqkPbxVkr3e/IE/kD+2jSYeaT5crUoRJe5A5T08p1olJEpP8boMJOuy2V?= =?utf-8?q?mazqIAMPXdiU+TshMzFpo/YZ4Jl14QYTwuHEHPIINQbZkNaTRc8tFjJlNEeDn0iju?= =?utf-8?q?wzNb1ZL8j6coibQDIQ8Jbyfr8eaiMCpnl/nxlA+sxm/4nfHCJNT9Jnbrt1ZlipRsB?= =?utf-8?q?cvKhTPMbSM7n1JU/4sG3Ya62foRoaOchKKdoPb6W6p/BKRoG/ugZzNM4dZbHjd373?= =?utf-8?q?kFLzg5d/SBZ7uDZG3F7WOoqUDD56/xlkdH8zC66PNb1YsmNsWNDqFUbAcYrgaUnFs?= =?utf-8?q?isKRDtAv40TfPQnW0hqyM488aH6XcV274BLR2LPaS4kXjeUQo8Y9yE+/HfBexp22n?= =?utf-8?q?lYpSlwYx47o/0GlFbODoCuZ4QXALwoXksdZfRVBiuNYFCXwX+48AH1uBP10Ko2M6l?= =?utf-8?q?CKzwp6kui6tYEsMKAc7yaOkc7KhL4nr0p2XxFmHUJuJf64a/cCFyNfeEIklr5oQGC?= =?utf-8?q?oltrTvzIQvQKrBtu/zzsAQiHCXuU0aVDjagHt2RpYUpzWEPahnjmir2f8q8/SPa3B?= =?utf-8?q?2BBPemB8hllFt2emd93z5KfUsTyaQcOGdKoExAswLSRbE2rFB6W6AYOQ1ROY45qAR?= =?utf-8?q?7lKp3mIvUMFkEArAaZqfgczib9KHxbuWRFzhG94c6uYkr3gj52GtoRVanyFldSKX0?= =?utf-8?q?ZVEhEM72ymTUXbONesjp7oiVC3mydPbYlgVobu37A5+NsH2JxkbDiMRBkzkUuPRLE?= =?utf-8?q?rhmv+XLyiTruNuVWO5VrWSoWtNGNKPZ26QF80oDu8VhE62/qB0/L/VCCwCtFMpvF+?= =?utf-8?q?ytbtYr7ld1SNcYtfK2gzAmgLGwWKJULp+aww4uBnPAiZnCU2rRQoesTF6HMB541fF?= =?utf-8?q?xTZdY0kcswgyt8713h1u9g+LH7Ut1cbdnF4U9yNDkofyP3cDNtG4lmUcyEtU398Aw?= =?utf-8?q?tV4P0EiGR0ZcpzN6jm7txIdocpH4Eju9AsfRDAvab6eFa6dWFnkTNGGZBbo45CzHg?= =?utf-8?q?nvVbvdsGwCsOb1+5yq/NF9+V+nkXcQR8j3/7Pl8Tmr0OQpUvkxcONcfs1IfIxDUn4?= =?utf-8?q?ElE2f0jWjEiueOi5dQkVl4uB/IkGChOA8aYTlavTE448nfwUEyT0eSdr+EyS5GDxn?= =?utf-8?q?yii1CUj7HHzyRq1svVVGp0/81Zhg2mpxxEP1Y/gMEXkzJ5Fgw26eYwx5ezsS+dRxF?= =?utf-8?q?l48Qg8xxehZFJ4U+5Lz5v96pvgDJXME1IPiDJeZz7SNEkLVuF3uBJBAJuFpTpewhO?= =?utf-8?q?/vTs7hoCzM1vtuqyjbt8MMEL0X86NR8Uo1lsvyPba+kdJz/CIhrazsekjzU5BgPQk?= =?utf-8?q?oLxmuozoxrWy+T4Ol1VWL54RCVIj2AxOeT6f5YhrJSnwB8xNH+BpCFvqVtb+EYAAA?= =?utf-8?q?em2Bl0cBObQnj1UBCyD/g+wSIP3nFHXZvq3wXZvzupHBWMUqsNzueYHwg/kDVK6AF?= =?utf-8?q?Eyrk0EokTDwI?= X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a22f743-7565-4aa9-aefe-08dc0d4d5106 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8963.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2024 17:48:10.3694 (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: FZlvhz21v82GXRo0xixQX6nA6AS6O/wOeXz7kZGTjA+riU2y/ZFLP6wm2wMN8DHTLH34nX7HZoZ3iwqwCKbtKA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8233 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 --- .../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 = <ð1>; + 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";