From patchwork Sat Dec 30 15:44:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josua Mayer X-Patchwork-Id: 13506842 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 204F7C47079 for ; Sat, 30 Dec 2023 15:45:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ZvT8m/1oIC+pNYvI1GqKlEyJDR5hdC/NwveWg9QiyPI=; b=j1H8hQXhGlaoXT9GwuQCau3anB ej1OjHUoEFLJAjGuS2FPgGKgr8KbBHx9wAUsbBs5bHS+YsnRaSos0FS2EvHDg91FUGB6NIc3swoCO Pqil/VPTr/quIwvqzs/7b2n+JQPqvTTpznkWo/DNL2Ot/vdY2MgrZnGBYDolUq/kLHdNhGoJpekNq HTrHXFGBvDFFdI6bnDHLB5N6FDOeG8+F70UvejhBYi5xS2YGPlNoUxc68dYSHJEzXkROqpGdK4git 8mWZXNaQxgzhIjE1bTuIp4ikws7yPLxBglBZb/KeJyCysmR0A3sSUSdglObcwrwoP2/JpZ/LwAm6O BEgz383A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rJbWP-0030AA-1T; Sat, 30 Dec 2023 15:45:09 +0000 Received: from mail-db3eur04on062c.outbound.protection.outlook.com ([2a01:111:f400:fe0c::62c] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rJbWE-00303h-0m for linux-arm-kernel@lists.infradead.org; Sat, 30 Dec 2023 15:44:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jjdlTf1wq+o8HAGrxLbaYJstOiA+Ii/kFF1rtZSrcW0HBpU7xHZfEBvllAu/wbz67SyKIGvfK325Tn2dSx/c2j6Vlf4wbFgh0oueCF1rJ/GSnF+w5v4QShbJz0bFpQ36txwHbZHn2FcN89giI5CSFK2o8Gy/D5P3SbsDVVcxyL/ueqH2azsEiCr3L/mZ1fuvVdZoCURRhyK4SM649gsVIZVkP+UddABAdbYAjN2X0tB0WhHFlT5ei9bp0ZcJrIkEdcaXdPVlHMkej2TTqAU3xRNVL/kv5Y5n0MyXNonv52ndsH8serrB9IfUZeFj5oHcNo38prI+r5UuwxnD7gdwbg== 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=ilIySovV8v72u6tm10BOYIo++L117moBIXBzQ8wjwOzob7omtjBE7l/ZLsCLKLZ2NsPmai08D6hSWpZv+qhR2rh4BV8kik3dgGlbBJjnmZLVl8/d0F1MK20eZyybDIlP7dQVhtGZo3nRQm4oWnhw1mUcVzzsKOKZ5AMmee3i8w6e/bNK22ziZZZRStr7bN6/4CcUlKQUIetkVEktInWxCpA9ykG012cTWCBTDoA4QJgltpfl3WGwUOwJkufGwUimuUwnz1OkDMLxw0VBFLYTOuTBRkCguxbm1Mg9aeahiOZ4WvolH1YyYHBC9QaBFHY7e2RS0MEy2FDRqFwd7Eq16A== 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=DqxOBoJHwesBWpYIZ8IMHKY4bggyAOiIr3vh0Tc+/6h7GvoAq4OL8t/uLqoVF7mEuXYKWBPg69AOEnpO8+9kbUJdBF6OjQ8NOxGYbfE85D8+uvFlBRKFrLUsg8xtMxOIZpt4Pky6cpD/nNVFFJysj/KtxHVn06cfWDt0V1uZCyE= 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 DB9PR04MB9704.eurprd04.prod.outlook.com (2603:10a6:10:303::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.20; Sat, 30 Dec 2023 15:44:50 +0000 Received: from AS8PR04MB8963.eurprd04.prod.outlook.com ([fe80::4db1:aae8:c643:2e73]) by AS8PR04MB8963.eurprd04.prod.outlook.com ([fe80::4db1:aae8:c643:2e73%6]) with mapi id 15.20.7135.023; Sat, 30 Dec 2023 15:44:50 +0000 From: Josua Mayer Date: Sat, 30 Dec 2023 16:44:44 +0100 Subject: [PATCH v4 10/11] arm: dts: marvell: clearfog-gtr-l8: add support for second sfp connector Message-Id: <20231230-support-clearfog-gtr-l8-sfp-v4-10-1d7f0e2c7128@solid-run.com> References: <20231230-support-clearfog-gtr-l8-sfp-v4-0-1d7f0e2c7128@solid-run.com> In-Reply-To: <20231230-support-clearfog-gtr-l8-sfp-v4-0-1d7f0e2c7128@solid-run.com> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley 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: FR0P281CA0247.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:af::16) To AS8PR04MB8963.eurprd04.prod.outlook.com (2603:10a6:20b:42e::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8963:EE_|DB9PR04MB9704:EE_ X-MS-Office365-Filtering-Correlation-Id: e1a0116f-4dbb-4d6a-de41-08dc094e4222 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EkR+7IGBzbgVV3GQx6p+Z5uHFH+tCBFGGAhZ8zi0DtjWlvRHKUk4JatNOE1fwMsg8f8MJdVOGdEkoLQZED/2WysOiq7/S7jxZQKoxtCzecCuOOt8Pd6FYQLXGX7QN2BVeDPZS8sOMDKLIADT5yPWVcRPaRM8ENfEObOZD8otMYTn6eyC/76QSNZJQYMkvKrkUt+65QmCnnIVpXriIWxlPK3MgeIAu+GdUHyMyenUpCMiCbOik9ipdj7Uy4FPqBnLhGQ2nkD1AdZsagXAIH9Zd/IHoeOMyvwRj9FbZaJd451pFiJZnioFejDksLInkhcaXvOAQ5QZe1168kl+jD/+xm1NfUALvFZAjqkwfwXECjb4QSQkQn+9It1PKwPZZnHQfi0Yru0BM8JzPaQtGIBsxFkbeYfz4TqWJ59PX2fE96jcPCvd2AK+kMzHVLC4+YtsZ8cGmn2aiNVPc0pcPNVxpJvNRQdGf3Y/J7eE13Q4l+UXLBJKdedxqeFQ+jXZZ9D70Stsar9r51SiPRXDwF24pPBn8paYuMgLAJ23P0dbLnuK/HS/2rt+5p0pvQwfMyaRr4HuZ7GyA64CeL9emIOMVIp0DVvXbqLkqwkUk7obkaVO0mhs5d7k3r2VIV1DRCxm 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)(396003)(39830400003)(376002)(136003)(366004)(346002)(230922051799003)(1800799012)(451199024)(186009)(64100799003)(26005)(2616005)(107886003)(86362001)(38100700002)(38350700005)(6506007)(36756003)(8676002)(4326008)(6512007)(83380400001)(52116002)(110136005)(66476007)(66556008)(316002)(478600001)(41300700001)(2906002)(8936002)(6486002)(6666004)(5660300002)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?UZliWqzx8GzGlyCiok1+bhyWmrZF?= =?utf-8?q?6GGZ019Bjdo9Uvgu8JLZojBaXuhQAEAYZboRrefIch65sAUoTMolH4/BbF39y/shd?= =?utf-8?q?Q809OGysof4NhcW7AjuCq4bdgBhnk1ROLl8aJ50OJu2Txl4hZ7SitP1OQ/fxdTw3n?= =?utf-8?q?auhTpCX5IDV2P/d2HOXDdEHjzLiKriu3+nq1YhTWo3+xeWl+ZHc5VhtxLa/JLgnzv?= =?utf-8?q?LEUJ3kaO80nYvvRBNTtXLfVJOxHrAdyC1uzfuBK7PuQ5GppZBn0se3dVVZ/BlC1RG?= =?utf-8?q?3Ipf1MvIEIoHeKWp9BAg/yUcBK3CFNtdB0ddv89GGUg68NLY6XeiNa1NikIWOlb2v?= =?utf-8?q?HzpfaCOYlwhziMeJZ6MLAtJ6nzLwmUeW1BhpIOc6e9E/bzSxLQFpU8sJemC8q57xs?= =?utf-8?q?hARauBQCdgALAGQSaP3zuKEPhl8UUy0/L23Vreq8FZWu2M0S0HyxY/v8+s5q2gv+t?= =?utf-8?q?LZcwaZ3NoC84aGQaSUVg1crfTxb6t1kyfJr7XFV5mGY/tJkuvz+lKNLcEs3cy6EKk?= =?utf-8?q?1jZT43d73S6KQ1+MF24INzMNd1VhNcF9vueXXEPd5EV7ZvScvaPlzxTw1Pyp4uybS?= =?utf-8?q?JWLujT7rHuM2h9IEeBsTB61fjWnsVSGbnhy0HDfR6km0gquHfOYoaMjUgYE/zYm3g?= =?utf-8?q?N9ruT9pJmweTJ2sLv0uNEGWTfoWCHkBeCbMOZYyoy19nNYvlhsdSkineHmTR+yBj6?= =?utf-8?q?ogYaV0ob6A3AVIBpQo62f19IQdZ/2VpT4rpZEAHRzOGO4vW0hoEWKp7qJ0Dp28eqr?= =?utf-8?q?6VLcu+42R1uc/B2Ngz2gANSTMipYNg4R4bpeoK0lIxfZ0MUGms4DELJplqgucQRvH?= =?utf-8?q?OjyffdyASyK4uG7vUkfltT8KCNC7cJdoZX9zIYvNFpnfVTH0po1midNdM0v8UB+ir?= =?utf-8?q?Kr+o/kENhqAoVQ5Ar9ldruMs2j5ITA2oqN8YIaACCp5Kd6kMU2tWF77xEVQoHUIGH?= =?utf-8?q?vXOhtPQXQJjmKqKmhsxoM449/sg4B5DlVoapYSlofhv3LihWgZQdhxwAowWSNURd9?= =?utf-8?q?3F4rRm3lrX3ehIoubY6SCwedPWuFUURLunmPTuvnUdHx+WN1SthEQXK7+rW+soQ/M?= =?utf-8?q?RNV2FoYwwOuDH/xvkhw/V07GGX0C7CySGDZb99ZBw+zXNXL7g3+F5F5WpwPkbZsE2?= =?utf-8?q?mUDfEX9RKNdmR+FwRNR44691UeEXIlcgfghOCrvVvau6PazDNehTjxuOGxbP0jz9p?= =?utf-8?q?pEgwvuS5IxHJIufJFZKXc07HnOl4E/w9DBOhjx4RMGLsw7AfrIoszJVzUFp3tyjdT?= =?utf-8?q?Lyz34QSrydyb5tTmdATqAdX8BEHAb0ZVHezq/KHLMNjVpHvuMQPMyIigUGJf3FEt/?= =?utf-8?q?t6ubY/p4vtfQWFcCGW7bWZdoQIDEAJngKFDbYaiCEAF7bE10O/LRCaPdviRHgms4V?= =?utf-8?q?k/IPyIxYVnMUVpR+oYBOJCNZDmgYIK41Vs+ExBQXrk9gzNLB1QH1/dJm3AScNc+ta?= =?utf-8?q?utp+9QHdbbLFAg5J6UI3r1/kC/eYmBBjr46+x60Vmdx2ai6daPgZtHIMKNwkJQF21?= =?utf-8?q?sXpH9tqhfJ9Y?= X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1a0116f-4dbb-4d6a-de41-08dc094e4222 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8963.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Dec 2023 15:44:50.2648 (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: m/GO8CbJvdVDri2u00fH25F9ea8WDx3bwmngNaC+QketZgHd/Qaf48oeujZTrUikoRUoT/rXUAJoO9vZg8x64Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9704 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231230_074458_278744_E4F02252 X-CRM114-Status: GOOD ( 11.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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";