From patchwork Tue Dec 26 18:11:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josua Mayer X-Patchwork-Id: 13504954 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 250BAC47072 for ; Tue, 26 Dec 2023 18:12:38 +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=0N0I6p1Ljqg/FvRwlCCh7JULYy tpKVelVcBI/8vS2FOJSNNIrw4N8DA5KnxyisFzwYNQJyiOTiRR1VA8nXRQqGX8AvtwbBCFNDRcjXW hu0f4kg2WM9PwM4a1PfwJtsZAicwI7CSpuOgnYYe2CiLdT7/UetaqXf4VSIaWtJgZ2c2YcYP9so14 FW8k8UgMrJ/rnKfAXsYOjaR+lnNobbs8tvp1Pg7hpAit8+/PhIa6ZXEv5nONXhoLXk6guoSbznMRK 0Y2BwNiizvny3MW6PXY3uSxO5eqC+t6dPvtlCFvcxw/HMQ8UaEbG82vKeGCCKx5AmQJFrEUmF9/oG 41bVCiUg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rIBuW-00DLqs-35; Tue, 26 Dec 2023 18:12:12 +0000 Received: from mail-db8eur05on2060f.outbound.protection.outlook.com ([2a01:111:f400:7e1a::60f] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rIBuQ-00DLjv-26 for linux-arm-kernel@lists.infradead.org; Tue, 26 Dec 2023 18:12:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S1f0pSbCfqkSCRSCNW1u+SGLLda/Ljw6KsmDsA7fSkTLc++FlvzLWV7vBSi5CiHFgAKCDvTQ3j2A2szKWbPYCnlY8af/boYW7jsy4Y6jFca4CaEiasWYSW738O1sfxljnl531NBS6Z7ljFY7IjJbazhlHYIevnCSvjonR3LCfyajHmvj6XpwamsVwpo9PhEpXAqGCWJ133fD7vumu51TaZkdVQZzCF9vSiShXX3p9llUH7pdhJ7xPzEWLkPD0MtHhdff/5n52TiG1YOzk3tg4v9/dMxX/T74FB09102CX65CeCmOA4jCfhvrWCftDgoV5gAH7fGayKsCY1uo6FJMBQ== 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=ZQNpoNyl3OeKkYg0AbdEWBD/YbXlRocB4dXnY/uzBRTCy3vfhRkFndBNmIrP4TqJPjDufC13mB8kiR1ni4R0StLUf0uTCnkOkHhIl8wuFovrEHO5PTNLCHkI8CgvRb2hYQsrfre+S8iId99qS1VH1KMDOEUKXQEGfsMdac0EZMCZFHewSqzmMY8NLxie3U049gY/1vZvRWWMkSEyfUukgaeXjIxGLJSTOjuxx39PzEE3q4f3YaIEVbscrjtmhthaIycJwy684J1T6fQP7NlLx8AU69OUSrMzoyKaan1u/GFaqc19W6B9dYr5OXvoBp1IIdfq7s9ELzfwQcBBcQvQhA== 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=haH4f9pwoawMpz64fqKuL4hyVtaAFo/gu4pIpO+/VfzLxKawd/PwujjOrCW8LYHQ/y/BIOHd0u0EZ5dRNK6yeDS2I4XD6Zv5ZjNo+E8690bE15kci5HAKp486a19e/ephL9nxfwPTHhDH634NTzbRv3t+YFvebVPbxt4DAo+Eic= 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 DB9PR04MB9868.eurprd04.prod.outlook.com (2603:10a6:10:4c3::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.27; Tue, 26 Dec 2023 18:11:54 +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.7113.027; Tue, 26 Dec 2023 18:11:54 +0000 From: Josua Mayer 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 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 , 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: FR0P281CA0038.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::21) To AS8PR04MB8963.eurprd04.prod.outlook.com (2603:10a6:20b:42e::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8963:EE_|DB9PR04MB9868:EE_ X-MS-Office365-Filtering-Correlation-Id: 6098bdfb-6c62-477e-8fad-08dc063e241a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TnrqY9GbIBYirlaMOqRxcgaHauHcPGW+Jqc1uD0CdLaXdEoPwR1c9pcd1j3llMgKH6IO1L0K2YlgsUfGfSk4JuxlSnr1Ghh9sjbfXV14mDdKF9FAtqMp2+VLNe+b29NEz8QMa6F1r2X+w6gq6fyKOCSkaajpLaBe77pdEOs7TWl2YxCXmXd8IpU906eXVbWQDjvutEk4nId0bjPry4GvAICVjQ8jsYvV2PK+4pHUc7SmWElFWIT2Og24B1Y23Qw1dKHZo7rE9ch5o9LqSjxAsvkwOXfMMn975Ia2oYDBcoUrGkdNcqJjiFVtMsOOYja4723OxVp/GPlTU5Z/qMUOEX4KGnV+iD9sx+TINfvWiXNipYfiUEJMhn+KdKWx3rteaQU7qkfNhCTGfj++1QEzF9kNriW8vau73yo8Z1Xrp8EATevn5QH+F1G7CXC/sbDL2OH4tYCaKLlTn5Ph0KkkabicfoZ3vBhhX7utF6bEmmi3fxMrQG52v/VNqbeBKbxzx6HXSA90GO8+cb/NZzWiMfBctUb+aTtoHQ90QCS5VoyIE8Li8uPEjCrlrWiEadYK1mdtONFm1nwsgMqNpGtf4P7q0dOwbkJMkQVJSJ1bxWDQbo+T7RoMb5sl4htKuYBb 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)(366004)(376002)(346002)(39840400004)(396003)(230922051799003)(186009)(1800799012)(451199024)(64100799003)(26005)(6512007)(2616005)(4326008)(8676002)(110136005)(66946007)(66476007)(66556008)(316002)(83380400001)(52116002)(6506007)(107886003)(6666004)(38100700002)(86362001)(8936002)(478600001)(6486002)(5660300002)(2906002)(36756003)(41300700001)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?QOH7oN8EajJt7LYtxP1bbFUPNah4?= =?utf-8?q?kwaRGfjOfGCpfjo0q6F4XPApmYUDj/4aFFdW9CyUiT2TWWzgJZcmzrLtusvDKpsgZ?= =?utf-8?q?KxTJu83o61pKQapW+0jan+PbClw6oK2JvkzFGGFSF4rxYcrnAAsIW0yl80O6hN6Vj?= =?utf-8?q?dn9E+2k7zyTeO1v8sk+0VBAZ69nq/qCk5hgBgf9te0xheYNdGlndXR8buWUb4pVKD?= =?utf-8?q?dJ5hiGaNFgY2TUtbhSKoX2nlJck44hP37KMNO/ehxt0Z3Oyjs8xPGItg1vVA6E6Hw?= =?utf-8?q?+CNOPAR1v3MOI01LMzeUvrmQ7GiXH5Bd6apQK8Rva06MCHdY7vq1/++LVf52vzaui?= =?utf-8?q?3vQKuNpl/5oBEz8KzMgz+Y/QAZpLvPbP4mlE3/aGR2uWLFWzvSPe++Sevp2fo93nL?= =?utf-8?q?LaFibYkB1WuhRhUkbALRCEMS1D3QfTj4pWGG0VTxCtSHS4pXkwz1dpveIsMQqMa/w?= =?utf-8?q?aVh3/vWxoLncLc2GD4HU+8CyTTNlCK+dtjZNQwS3BE+Sw7Y+1rhhPUyfE/YAujPTu?= =?utf-8?q?J7X9ufKT38o2W3M/UNBl0U7wY0fQKbhNywpItsb3oti7huN8WiZbnhlSbcopA18ZN?= =?utf-8?q?zC/Mu17PrfIIZ5Vg0+Sxoe8VNWDHQ7n4yn1zAWaQnf6wNDoZcr0/AgDtVF5g4RCJi?= =?utf-8?q?sY7NUlm+gOrUXN1iwLG5m+nzeNGmbU11sgcbxwmjAs4AOAmy0Tk2861D/8QoFBXz/?= =?utf-8?q?tdDm9scM8XwetiRa573NgBt406irJ7K8ctUFTZWqabV2NvfQgycO0nUWWwlm/kAfQ?= =?utf-8?q?psddRb7SiaoSSPQdMb4j4lJSMbG0Lq41Rcw5jESqKREJBUB3EHgU/bcTp1wgQ2zdF?= =?utf-8?q?+bZm2Wa97XwGC7qyHdB4b5AdnqrgT+yQbkDSg7Y7HwIOPw8djWj4J8RvQq51GoDx+?= =?utf-8?q?gdWXkIobdyw1sNkq+c1wcK7XHhAXJwJL0vJmJ1QufVGHe3CNQ+4tEpd4u3tiXvtZt?= =?utf-8?q?HhMDSQ8u4unHHRKUdn0E9dv0Fjdb2bhxXEAikcCa6/RWiHR8qTrrW9F5MJFEIW5Pq?= =?utf-8?q?dCqtNY+QwSsUlxe+x8PZY/HYNUxWBwVbWKEt5S/9urYc7qaNLH0ZWzMi9J8voqWhd?= =?utf-8?q?7OOE93U1JG+D70dmQhK7R1Z7t3k72lxb6DvKcs3YxtP4L2nYtO45Dps8TrHofm1Mh?= =?utf-8?q?5JiszOKZ++NckmM3CIDsAohxgOunXznUtlk0sTcdgVCqzdC1rKJiha5TkvU4dNi4p?= =?utf-8?q?SIvWoqndYrCOId1iO08HzJ002maPdg2MIT7Cn4c/5L4gDXaEh5jA56+kgsjf5X8eQ?= =?utf-8?q?4w5rTzZgpC0wVQ9CR4OEU6fqMYjYeZnmIY1+5nehlmXhXH0/qE7gOHzzvvTu1rNvJ?= =?utf-8?q?yFre1Kt/qg9bnq1ej8LkbMMm0+1EwSV8nTtDAFHW8mtPtu73R6n+/++qkeiWANuR/?= =?utf-8?q?uDB79uGkF45z3ovtLBsv+GYg5legfoR9BIVlDb/tkHYknp/XiABNwWTNGPaCuinNm?= =?utf-8?q?WMi/FdX9TO4jHWQwmu9PewAYYch1lr7CG4DUMYpWGNqHBNaF+4ryeB9UX4WUybPct?= =?utf-8?q?uW2Hd1BqMAz7?= 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231226_101206_692783_0F44749E X-CRM114-Status: GOOD ( 11.55 ) 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";