From patchwork Sat Dec 23 21:29:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josua Mayer X-Patchwork-Id: 13504142 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 7AAD6C46CD3 for ; Sat, 23 Dec 2023 21:30:31 +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:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=QPx4Ek2CsmMTXCK+G4E3Cp1Z4jQfgg8toCtjB7PQbIQ=; b=dWWHOxR20iBqs8 jzc7eO4MFNVgx+RnOtEUFuzFNffmgpXvO/WQ1FezR8wBNXEv9NotWeeER60OghrFCqrtwjKrwrXcC Iafp9R1c3Lr/BaXV9ejVzLYMdom/FMU0Bhf7Of/FGdGVc8lCpBwZmsWWrGtm/plXnQgI9fHEM5t8X B6SI7xt78BXbCADhCUFrYTp6Fjm8Zo4ElaFhWC7On6UHzRO2iHBhztAN1npMcFiSyqorvBDLwGZcK x91Nfu/9w04nzWBwpMVWNAl5SzDmUfG8iIlfK6FBpwr0evAlILDZHw4oN5obPzHFWiCV+tl9ay9z3 F8VDB8Yg4DNWpt3ftTKw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rH9ZL-008VD0-1U; Sat, 23 Dec 2023 21:30:03 +0000 Received: from mail-dbaeur03on20600.outbound.protection.outlook.com ([2a01:111:f403:260d::600] helo=EUR03-DBA-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rH9ZD-008V8C-1m for linux-arm-kernel@lists.infradead.org; Sat, 23 Dec 2023 21:29:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OBsgaDTSQdj1aM+fpzmA1ohrfkQon/VjpCtmvr53UEm/Irc1YX+fPU4UVf/DR0o2+EakNU9YUoDdzEaFG+efhCJh+XcNvNHfpOQFaXmS7iHioVtfBW6PTbIeuTp3w3Ru1tL0RoSexqrrFdE/DrgesllWqzxP1kC8gF4XEnHMVOCxmIfz9RapAMOA2ZC9OGzu/RJpIpHMbT8TmhD7e1urFvXStenPQI/g9aajpGYwSUlso8ieSrWgDsBYzxevLRpP4cR/qjvqFeUewOVXk245gAeh8FIidzKb23pnIxr8lrDu0ehMb1NSSBtLI0EHJfTwBYMq1HO9vSSUiRJaitrLyQ== 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=LTicBv0mFoR9lYMU+S6BIcVEPFgU6Wt0gOcpnmp7VVg=; b=PrKnkJ9f6PLFhGfQuI1KXN1NN1tjbJDsA/lq3zOe35iHEvwvVy1prXd3ypW1usrovpgcjGRdI0rQZqNsgDWSIOkj1w45oKIdmIIUxRnNQFs24X6bSQk9VgjUu7KRfoCYW8XflanXB7iofxyqXIhYv4WIoe/RSQX3P0fFXWfFyNDP0pqyoUXUxCDxxeqBPsMcrdBt3S6a7UKGTEec+p4Rlc1FWWeA5LuG76aJacK8e6bMygoJLFx4oleLb60hd6hZQZaU8p8S8iM2R+gs7oBWgcjD/e02bBVwZCLSArddh74s3zbwKuQ1azOJAcppc7wES9Ehrw+B41r1qDSmddlxSg== 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=LTicBv0mFoR9lYMU+S6BIcVEPFgU6Wt0gOcpnmp7VVg=; b=lPdBZ5I5dXlAjeoMFtJaHNRktj/+4zIQQQ2dTJHGzA0Doxx07Veda7g58gypd8C8X2G8kjqUaqAtmcmyTxWG+Vd90cqpCihwEDARhuYAoV8EPbKE8k61w+wHZPzszHH8YxuADuo/UzdMIKRbN+ggxHMzckv6y1Gp8dcxC29b8YE= 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 DBAPR04MB7365.eurprd04.prod.outlook.com (2603:10a6:10:1a2::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.21; Sat, 23 Dec 2023 21:29:44 +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.023; Sat, 23 Dec 2023 21:29:44 +0000 From: Josua Mayer To: linux-arm-kernel@lists.infradead.org Cc: Josua Mayer , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley Subject: [PATCH 4/5] arm: dts: marvell: clearfog-gtr-l8: add support for second sfp connector Date: Sat, 23 Dec 2023 22:29:29 +0100 Message-Id: <20231223212930.14624-5-josua@solid-run.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20231223212930.14624-1-josua@solid-run.com> References: <20231223212930.14624-1-josua@solid-run.com> X-ClientProxiedBy: FR4P281CA0258.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:e8::12) To AS8PR04MB8963.eurprd04.prod.outlook.com (2603:10a6:20b:42e::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8963:EE_|DBAPR04MB7365:EE_ X-MS-Office365-Filtering-Correlation-Id: d1cf3191-b660-43e3-ac76-08dc03fe47b4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 53QFovHk1lyg17TJkfYllraZs3JcMnFqMttw0u14ym4zxnxs/cEjE1+CU3KCcVs8fGhFaXr9MWojXEGKjgbJFgH56gDebCmA0jl4E55acEdeWY52UO1aSP4pqzw1oHI0bYwCilIHSuT1vRi+FpuJNTFmmNO4qGWI3wK0CULUe6QhEoVaYAUknrCA5uKSTEX1WnpbbpEuEATnPIZ4Rh8zDJhBb6li1ag71ANYb0kJRTqMHrGJxK37WVmPB0fmkim9pPHaFuRVDBr/g0SuR0NSf1K2ozy98uySu8hg55oCF/L8q2cBQWbk/nd12uckf8Rc31ftpULGf0aZrJKlMhict0XB+zGiX46/zMufxabSQ7NZPxa47LT7hKcs98u/lncb+A/ADrfaMFHpgGE+NdAI64mIy6qk4JqtSuAUBjRykxUyy4TeZ5lhuPD/JpSByTb63vaD28EUlC/e7yk/epEatBEWo7D/WGWa/FCaiwiED8j2H6HB+WTDnhW/tORfwLF/R+oOctUKW+VmQmRrr/9inavwxFPT95D9TGggsXD7MGPp7p6CO3HXDDjS66Xr12WYr88LGwcaNR73cOECg6alIjtUQgjs46yBk/CmnrPpXmAJRJT44ag1nOgyrZTB1Ujj 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)(39830400003)(366004)(396003)(376002)(346002)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(316002)(5660300002)(2906002)(54906003)(6916009)(66946007)(66556008)(66476007)(1076003)(83380400001)(478600001)(6486002)(86362001)(38100700002)(8936002)(4326008)(8676002)(6666004)(6506007)(52116002)(41300700001)(36756003)(6512007)(2616005)(38350700005)(26005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sf5klecnqs/QPwID9cG6EZh20Z8D/Lf2e3EXC1onyxch8cH5SPL2rb7LFcX+3pH+xA2nRg3Ui6CwqYbAjIa/jDcZfxY2dT+8sMehkMLAP7A5zWIYKmBl+g9vhrHKC2sS51SPejtLhTkd/ky7vPxKunnLu78WRSzEJjHdTzsG+71qqH+bXJhMTDFfXzsDK1pWLcfmnyLKMJJEDien4KlhoYFWBBSbSjBL+LbimxWHU5bu+Zx1LRihmP6lAjNELvKCYO0K2DBvdBGVqx8qL4hqxr82nw+QLRmzxlwDGDQ1w/IF+PCHP2kfqkFXRQAQ8ZYVi+HtUGFfpFAGbGY96d3PqAYgDdWURUy8JO+Gqw+wazIDoxU4eIRj7OVR/y8bMSSNBJ98fjZ+Bg498ChVL1vXCXzVUTi3/5zrnRzyehdGvPFSQePOs/r217YhC8cKLUJsIt4IOEtdZSzZS03RlzqgRkV0yxj0B72mvAHVLKqNTO+McZcVYDtMvhLma30cQRQMWBqa+l2zg38eEg3S8GXJmpPY3OY3msTjYWaSE4DybYZZbkXNYBzCFDxAu+kZFAKUqMM15rHoIFsWbLis9Th0SvfdUFb5XRpSmxgkCk+NLuzHqLepfWxJBXJ66xqW2VVo0fMfehoCZ/K/FNVidb0eUh9xmmrXTttUgTTW3UAjm2QznqZ67m88M8hToh4GmZMzstLyYcmr3rAUi5rNa4MAK5HbHq6uuuYmPzK1lOIOu6NheHSe1h9xIm9M0SumFIZRWrJe3SgIVgyubWUe190qiY1cdiJdxrIpMffON2JGrpEVYGCtFZcNONDo71enk0aCkm6P8DXbBkkXeh+3/VpPy2vNtK/ozWdUQZA8Q+Q4GJxFbUeNPzLOTGiU1xjE8mxolBcZA0V7IMGzlkyp2UCc4jHroDjF7sQYB0r5q8Uwz4SG2g3XQio3+okoWRxaa7Ykivdd065yVjeKIcumWyIPbLrCxqRhKdAxDWGDHDiQ1s/8wVS9s3tk32H+ATadnE5uOuz7RhICCemLcKEUcB7WjFPYGgzbf0ZYa3ctKuRBBPlMv6T3buc5fi87iHpILEKSkZMrjYHh5M+wfepp0P+Ec6XELkRllrjg1DXuoKvDe0heszeJO4MbSCX80ck4254OwuyWXel+g+dBXfLqtwqYEJYxxWd/dsUnsVidCYc70mOVrc5wfNWF+7XsWq7Nwnk9RSDAvru6LrliNVquFqvjpI1GnfUPsiBrmFCyJH6+22XbUzgNJBEIeE7dTFTC7XgBca9eoPypNp6P/IU7QhnW9gM36frYyi5h/fRvKNVFfQdpDtSC55YG1kfvkPHNIBnMZnid5PURNCJhnlzbwVg2TT72hob3gMtEI/BSqroQRHtHGeD79LjWbOYNHY/lp6OjZVKRi34ClOh8G7Yj7MRL2i5QZH+cB4xUodQBBGQCBBaHoLBidgfYmWrgOcm1/k8cDNmUuJxPQvwyE7u9LdI0sLiTYI4pS/A5i7ZaXe/Ny/c1cqCA3rrBeNfrF6JzWTTmPQU4c0MyX8TEawFC+MrT+5v9qz+zq3VMMVJOj84l1tk/9jUAQh+F6H1FjKcDBZvB X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1cf3191-b660-43e3-ac76-08dc03fe47b4 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8963.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2023 21:29:44.0663 (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: biGbsegnpqyONbGosmad4CVk3nvMQN62n7bx6IyUBPzEUehcdYICU30A+QDzo29Wa/NYHbmCg7YeEK+ZMH99xA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7365 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231223_132955_599936_76C1D2AD X-CRM114-Status: GOOD ( 10.83 ) 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 --- .../dts/marvell/armada-385-clearfog-gtr-l8.dts | 18 ++++++++++++++++++ .../dts/marvell/armada-385-clearfog-gtr.dtsi | 8 +++++++- 2 files changed, 25 insertions(+), 1 deletion(-) 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 ae921a674c93..bb2142907023 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 @@ -5,6 +5,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 23 GPIO_ACTIVE_HIGH>; + }; }; &mdio { @@ -67,6 +77,14 @@ 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"; 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 d43bab0fe884..a70085fb38dd 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"; @@ -273,7 +279,7 @@ pcie@3,0 { }; /* CON5 */ - sfp0: sfp { + sfp0: sfp-0 { compatible = "sff,sfp"; pinctrl-0 = <&cf_gtr_sfp0_pins>; pinctrl-names = "default";