From patchwork Sun Dec 24 14:38:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josua Mayer X-Patchwork-Id: 13504283 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 6BF47C46CD4 for ; Sun, 24 Dec 2023 14:40:05 +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=q+VGhxuMejlke5Ub78lP23SO+i/wWsUvIEuoSmE1MpU=; b=MWjZVBpUVsumOe h+WKFGkXQGegJQLmxcMmDIXYXEnW1XjNIwgVHR/qNzwJwArDvlq+6SWe081IkPwAwC4fOqR2SpAbg jptVIKE8y7XG67g1dKdRxiPEjJVhREHSutb95HjQP5qYK4Fv31a5y5kyaqtltPPd9naVFfOuDieG3 vIqHQHxro9bmuN0NRO0Dk6+Cu3eMbGOtCl1ZbFcwpnJZCFDLENL6Wn3eijCscVpIVu9zHRZmYoKYv GPVcXP5fsjHunkEezYUC3WRLhXUEVTxkZGafn+xSF5DKwC9qILKzta8uQcZ4YRWLH+NhzfZ0nz07b kTtzBiXm8k/4/TGrkDzw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rHPdk-009V9h-2x; Sun, 24 Dec 2023 14:39:40 +0000 Received: from mail-am6eur05on20601.outbound.protection.outlook.com ([2a01:111:f403:2612::601] helo=EUR05-AM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rHPdU-009V2z-21 for linux-arm-kernel@lists.infradead.org; Sun, 24 Dec 2023 14:39:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ATpkXZpMAEdUY3G51fntjPBsPfUmnhPPfKp9xTpibap+ujvNBuql0HwXT4M78c06NgF3/OMhoITl2zZ0nlAVqkGbl0NPaxHgjVVXTP6ncC1pctDL9SO/3r3usnsMvL+8h2F4VLU+639nLtB22fkTJIp/MoMpZNAHgG/jIvC4ePAATSjUc5pmYj1L0K+fGxr/9UvN+aZgiHyupiohhld5s/BKh+uadvu9iik+zVZXpX88vBBhP2SWyFrgOX1qRcRuEydNUEgYkHmrtTHSioTEJcwmrgYk3Zq9Vt72E15WVQoMT6rPAGGgOzKm4kQd0QLr9DiPZVq3n9ArMw7liig8mg== 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=0B0Zh0BmSV1IYWPDeM26RKCRJX7bQ7Ya09cxi7tS3A8=; b=PDlYDlrAa6a3E477SgQyNehk/oCz9RaMjWyCK+Bwc0W+140HT2NPT20uZP9rerggtVKGuIvMb/9fChiWsaBuj6zUuUnt4ElzPs/BBTpRaeMunquupwiR4SAJ6OUtnhSKVtWQQWw86jy/4uCgmpCzyOzOCveSS20cGPfZbJyCsaL00rfyK3sH7Rmmsqq9gqPdD8ypydACBGPcTxf8ZWCyt/7xsUuBXwuj+N8Xhcp6ZuyDG2I7CNjD+fvlWMSY4O29bXyRY4ukTwQPr/BnGnjGNQeds250/93hXH84HvBK1Njmd5AUuLZGbUOg+KFp+Z4o7xRYAs+MAwQKXTrd3s2Wrw== 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=0B0Zh0BmSV1IYWPDeM26RKCRJX7bQ7Ya09cxi7tS3A8=; b=aZkRffCKIhdLbhtyb1RKqAOUG18eJx6/JOHjwy5Psvgd4k75X1sGR8NsejAkI8f9Cj+ghPHAexjyzAlbIx3/MeOv3nfIDOp19Q8Md61pjTWTLb272Uml3u0NgJ+7l/yBqvd5V+o0w56NiLLduoMeDD2h+V1H0epVbP1sKAcnGkM= 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 AS1PR04MB9285.eurprd04.prod.outlook.com (2603:10a6:20b:4df::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.26; Sun, 24 Dec 2023 14:39:17 +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.026; Sun, 24 Dec 2023 14:39:17 +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 v2 7/8] arm: dts: marvell: clearfog-gtr-l8: add support for second sfp connector Date: Sun, 24 Dec 2023 15:38:49 +0100 Message-Id: <20231224143850.5671-8-josua@solid-run.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20231224143850.5671-3-josua@solid-run.com> References: <20231224143850.5671-3-josua@solid-run.com> X-ClientProxiedBy: FR4P281CA0079.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cd::9) To AS8PR04MB8963.eurprd04.prod.outlook.com (2603:10a6:20b:42e::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8963:EE_|AS1PR04MB9285:EE_ X-MS-Office365-Filtering-Correlation-Id: d9cc63d4-65d8-40ce-12ea-08dc048e1bc1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dbAj7hDMCm0T08ffELPnNBiAM+f4RH58GjHP3LWvhGIn1Lee9l9vVUvIOtKKpHym+7SyqX1r+zK/YKP86Fir3156eM9WZZnvY30oGIRL8XainCTnNXJHxphvamxKpCTL95usBzAillM37+9MwzTCZc4EUIf4MjPognaatAwngcZvdZuI3ipuwWsa4Yn6Dm3a3hi2vlmCieknS7NOo0I4sZtgiLedbV6Hqry7cSvuoK659xRBEeUraC3rXlkE5KfF8uFLIiN+LXgWBjegmhTta3nv+eKkQaF5Mp4gx3vkpzMxrKmikLRqdAlBruNe8S81HeJJd0wVRGRM2zToJuByEfNQlt+4R02nzkBx179jtpsyJB20yJOcMmTldR8vFklpEYgb7Z3bSbUTM/WAMI0tRYjj/Gesz0mAnn5ODcGw5Mq62qi5q9KVwmGKEyHkwulyLr6fyijK/wmYm9y15BSTYwcglMK/eB2L8yGbOXg20pgiwVE3GRdoYCq+y+t2FMOHT3xPdvxEFdI8pIX+chF91ZppImJTrwj0U8DoBV5IaJn69enb9yr4uguYDCQNrOtMOk7lhqfFpjKQ0ZyMeaxdo/qNGewxyRuIQ9VJaCPrh4nz34gNgecIbeiTQ3ij0WWm 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)(39840400004)(346002)(376002)(396003)(366004)(230922051799003)(64100799003)(451199024)(1800799012)(186009)(1076003)(26005)(2616005)(52116002)(6512007)(6506007)(83380400001)(86362001)(8936002)(6916009)(54906003)(66476007)(66556008)(66946007)(316002)(8676002)(4326008)(6666004)(6486002)(478600001)(38100700002)(38350700005)(2906002)(41300700001)(5660300002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /nLr45dXhZggZQHMhY8aFB1P/QM+HQhFIsFPDd7nVJZwmiLa71izjnAQqvD/ALP+iVVpjAYY/K8dwb1PQ814mSfvRnne+iz3F7RpAvBxZMD+VmDLVqdJbvZ2L6mGOxgYa5Gd1P8aq2KYTUyPFeVaLt35KnyGFQckAUvtkavH+EqISr+GG27M6c8FsbZ3493i+mrhdgR+EzPd6lX+0dxH8k0Pom1WzECss5mzlOJMvJk1ovAE9r1YidFhBQppZWVccnGR5H2WE91muubSYlhopp9t3YH12y0Drsqy8N5Iaam07NFSEKvrKtIpaSWhqd8y2HwDq7iTFDJxIno+241ODvF9YFkoY1UZqxNDQ6WSTvqi2BT7QnkuJNTch/aeI59xCfPyspbt7mQjprs22+Un1bW0P24PS5Hkr5zF+oipwzLgBRWieU64vl4daB1M3RgIP7cJNceOtq+bcj5uOex7ybQ5csy3GwWTa/DgvEVWwI4lMI9GcNbQR/8A3kslq53Ifc4c3BwRd7cExNFoq8ta40hqQT3AHBvWIiTkPDBhm4DJn0MzdaPWIxwWEJM6wb3adHm9Ii8v8d4jfatK+iv3nRpSjljWhq7/Hj1a2yrJuakU5fDjAjF9NiD7m7ONv0gyCsd8NqJQapQza7g5kQh+qEOYDQlfwp0T/HnPNSDzqGeFMXh/jei3re1SHKmqG/pjvbt0nzfb6TOpntFY5aZX62FyyGNQTceEB64fc33wTXfKYzrOXW0JviOqkpkSgCRsyPc3SEwJGgsVw1WuAinDzPV0mOffxJIkZjWrY8J2ef5vWR2bxvurHIY/pPcp5fUNodlGd3CLfbpq/CTC3adwEF7HA2LVhCRHj469IM5naxpw/Ilj82wCzu91Cc/tHCrU6hFAKUUnFn1OoxdqK8/5ubpafN8BJP4HczQx1wzsU08GVi5SVdfO1p0EqPH7jgQ/6+WnTiduGmP7GlYpcSzpLDqNuhz4JaPpNlfIOgI/sb8B01CZwtYdy0fNfLSuwxmQjUaiYi2G/bKKXGQo6GqrXXf78k5DpzK4mV20qJ7U9o7qvF5YcqnUS2F9X2bfJW9hzgxTDPbPNDX/JT2Eehq7ylkuVIGKesTcyw0smNkEzoLXh9fNEH9fnUb+jqWpLKzkxjP5IPN/HpJROOiMXhCzG7+IOKR/B8sDWDz+okg36SMuQEZazc9z89AwzAFIezMLZJDfcL8NTpeWX4L3+rv4VKmMg2lKTrRr4EWsywLnfpwPrlt3zn6fe+BXT2h/jlx51dSt3FpfpC44a8zr6uoVGjmL/ikb19agqGDzpACJxIFsOmCM/6Gd5J41I/H75jug90jNcVF+G9q66CyLoRhBFK0ZagmIpMDK2onN+ruJAckcPiF2NhrTss2d8V81whflKMkkDB7YI2sXbO7I4x4q6azxpHECECkkZ+oAA7PN2BtEVUo9v4xE1FIe0TdSovtXjbILy+NPzMiyVhPsYaYyrZg84eRh2Bz02nsQ8zK31aikhJV5Ber3QNcqdC+T4LLr2JpBBbCd882kggyr8MaEpvNFcwKOGP7/WqKnclSC720Tg3qCxAGrrdJbkSdNUcH+ X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: d9cc63d4-65d8-40ce-12ea-08dc048e1bc1 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8963.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2023 14:39:17.8037 (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: Aq8KpR2v5rSmqy98aj6rP2re6YzbmYLfobrIcCq6Yb3PilJUe2RNnD6fhT6iYZVn2mTU4eMG6ucRqHlBPD4vmQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR04MB9285 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231224_063924_680966_62DED2C5 X-CRM114-Status: GOOD ( 11.33 ) 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 --- .../marvell/armada-385-clearfog-gtr-l8.dts | 20 ++++++++++++++++++- .../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";