From patchwork Sat Dec 23 21:29:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josua Mayer X-Patchwork-Id: 13504141 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 0B0D9C47074 for ; Sat, 23 Dec 2023 21:30:32 +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=XS+uCdP+ttDfcFhXHytknzlqP3q4LeNGo5fEDD6tIx4=; b=SDLHsGFdRQKof7 8zjlBNn0DWw1zvxz4stBLyyuyJP9P8/r5Z0JeMl6sq0GoMXqYhpXWgNA3ELBXnHSSJ1Befol5Weqi 0l2E1H7c1HPzCxXtl3l2ZnjEkuh6I3HsnaRRzd7u22DP6YfwYSLyQNqQm4PHLWndc1m7zZmBUT8Sh 6yCsDQYMRADWCFtrFbQH+tF/1BCyqXis/V7ew48kCYLLx6Ba2T5lsPY23gH7xMxW8CVOGfhLJ74h1 DtAR8KwGdTLqQ3pBX0ftkv6HizuAUMQw3fEpBCeyrUtgA7/m6NK0Xl6ou2HX+96dbsP5760Zo6iPc VsZf1Gt1WBY1ojOn7xow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rH9ZB-008V9e-0d; Sat, 23 Dec 2023 21:29:53 +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 1rH9Z8-008V8C-0a for linux-arm-kernel@lists.infradead.org; Sat, 23 Dec 2023 21:29:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IrEOhLCyCNcI6FuMnRTO9GZaBTpNO86Z8bhe6oub4CzwEcZ4BAmT6auXU51KyZFx73jA9DDqPVqSKs8BgUhAEvCYQkyUKSOqFNkwZtiGk949AhvD1nEMerWZKQrE3NgSTbdjUa0TxtybTvyOBxsy94JkrlkMOS/KUgsB2/DKJbT1hOf/hllhHGRr9/sPbT4bkAGJt0abm+Nfu1TAYhQJW9DIB2rrpTmbnEnEBihd1E8fblFLViyqlBWVQDWGE2jrkaS8WsOA767Asc8HME1U2FEIc9MGeESBQ0lZGd7JvNNcmbUO5QvtpKAy7s9ckz5nLqEgartbsWno1ZDDMFeULg== 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=Ydb+B8l2YhV6hNrbazGkmfWTDjo3gjXMu2Nfrjl6c3Q=; b=TBe4BPVSMuEffsNIYE4PUglAHb7TXq3T2kH7irGf2a9TBSeNMavQovW4ftQR3ESJ17DzS41+T6x/has5vkx+9cNwW9YtcNa8VgcJ8xMovmm5w7piPHt/pNQT/Kh5rHw5SrDXjg0N7jZ/+BE0w83Voe9e1y7AR7qry5Ebn8ZKIja93uHcL0QBpHM6ONc/nDt/LPp3njSQfU5qNJMRQIiKorMXKxLmxZZkkZd1nQ9QWyJzXKOlUZjDVNOypHYuuzaxRO/Egj/WnEFiamQtiYitDPrz40tLHDXxGHHDdklRbFZiHfNdqq3kR2Pw8OBU8bdv82DmMNPinLIVC9/z3aeshw== 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=Ydb+B8l2YhV6hNrbazGkmfWTDjo3gjXMu2Nfrjl6c3Q=; b=q9/bhCoAwa2UtkfZddEtyrMi16PzOBhrCfdk/AEZ8+6uEAUQ4IFtAVnYb3oe/gsRLZ2dDO93h7NWPgQ6GQ2Tkyrr9Fj7h4D+MmBhS7fgp8qM07ZoKsVhgqOEhwyoQqKkQ+8jBvc+9kbU8sZwdoL+af/5pQ09RHLCSDe0Hkk104M= 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:42 +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:42 +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 1/5] arm: dts: marvell: clearfog-gtr: add board-specific compatible strings Date: Sat, 23 Dec 2023 22:29:26 +0100 Message-Id: <20231223212930.14624-2-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: 18c4419c-2b06-4242-6977-08dc03fe46ae X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AFNz6bITnlRxt7lJmxvxkHF9YfF9gPjVEMO0nvaTbgNVu2e3V7scsmzE9e2dNE66GQzDK54VjiwfKAapo2WU9POcwy4p6tSvB2QHuaKwYwZUCt9lzP1TxV6TlH4iYUYHdR3Ik3QS06I2dO47rZHMDsyqb6CmTST2xmrA3aHfOerlyo2uCHLw1MObNgzlH9DjLd5fw0pGwN2XplOppWM8PY9OxbOdxPnlapU2E++cM/ZiDtlY7t3enFCF8ouW+7ERoUBzrnHhBm+uxQX5wrtZgZooDkyEXF1WyQ+wyqxYdWJeKO7s0D9iR7Si7iYc4e3UbE76aM+4aVHb4HuN1ikDYIQY4l3b+4sR7ZzU5X/cMSHmyPHUFVlEH21RO1/6oIXKs5o/d+cynI0Sbu4ebaTDWdnzXKGVSgf2pQxAqfly5Avk1CDQ2FEY09bvDWSubOcHkPNFdCWRpyplzrVSpyDDygU25Ci2wq+j8edG5VIq4Hm9d+3l5p1nXVXrH59sbxJAn3H1nhzPNvRC9OUPqVEeLRJtKsMuvGFKDdZfM7XRVuhS6ySaQMP8eKKWiJISCl3C1n93dNxEOdsebt8mJOFm5rn0shiaoFHslRt3Y5tGAJLWeASANO3+1DGYQ6Mcvs50 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)(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: 1ETNiEI38KN98t0h8JN/QEi+GM5eR01uAmOAyvOhJfOMi4vswHrWxsKVwTdPDYr8FVE8/PELv76GSaf7ixsKxG5jhSV6HFa1d9914+M8IzG+wSzGpdu73HOifthv9oOWZtwxkasH2QJACm7Nyo/kbaoDKanyO4qTARBGQN7FAO6KSopMX1hrfpFKD7yFFN1pLf/gUzO+HVr0Lw40YM58thALzFuRMgxAtUHmIB9snvoaWsoXI11T2gEkK706KJqMiH6x9vOeEFq7MTcA5SB14SDlfSrlIzOE57AeacFNbrW8WMdyhkjkIjIta+M997yQ2Pv5UAFpkk4N+szUQuSZZ0pg5M8/dTJ4hJFzNYsp4ExR1aDji2uGW5qe/4TL4D57i/XfjtJhfmZZCT89TJlBFutMsXRizBIu17BooX7HvYlXrlKyRWSZq5WCyVOksZKf5V4pb2rAYesDrn2aq2UuvYT3WTdoKZ/5fjrgj8oTVoCwbnJgcAZdsDdDS5wToaEdgLVM0l04CMFuSmG5wfy/nTPBnhSEdPOpc8W4XRtsMC014WwCKnx9oAUtQ8s3gcKVyQj2MyEdJEyAnnTDcnKBHKtxhtBxBIdTYS88ugJm6ADk86fyV2JaAJ4o77VXLt5YmFnijy6Ul3US7O3nQi/am/RHCcbNJ/rU/2FQXytuvX0zLJfpiKRcZTUmPWtvgj9sbYNSFvD1Xx4pueVyDWKp/6qyxl2AupWokA3TFdnDOM1QzI2C0THG37JTfLw5aTEaTf237nehjyGz4gxiiKM+rgo1Kbcd2Uqmfrpav1Nqt/ZvT/NwTz3LKW+t46yyWcwnQGGR9GN30iwO+v/m0NtT19FiJNTf4R0rpvWYLcoIfEOJpqEz2dyjIDV06tUjZKlI1P9SUaZsMDM6216TF1oDVzeCF7a+mkJp4cnIRyo28c2L3AbdSn+chGWYSCRgtrEf3N4YX++n15Z3zohAB8jhvN4zgM42lMKD/sv4nIJqJXR/7hmuv/PXuMfb46XPo9kdsPbmoC4sWJnwNbb6KN66Jpwm8W2/kP0KsVH+eFQfondGYQ4ACpigimk85Bcyv+42YBdeqEo4MACK1MhNTlonxhTm/lkufPSY4PtYXpasuZsCaG+3tImffLLsPI/Hax+enSn8AMC5edhLmBb6V/3jGiHZUfZBRbbifMZyO0QeE3Qwkh2jqNi8hdGbAQsY0HjiKi18T4yrHBaJ1BzRrkkkagHcW6k9PEenr+p2AKB/bWCSIz6kJ0R/2v2UY7dGffb6O9h7sbkqmJH4WHGVTcv92pyW9JRxjOrdHLScrPB/TWNO6wByIrCkSujm8uYAk1fc3Y6Xq7rUsP4S3BpFZAgGymRRMFrBJnxHD9xQSlabeDpQn4mLE7mCEuKoegoREes0TZUtBkBT2ok5dVJb1EV44McsXa56rQxmXcBN+swLrkoqCj3P6PLDLE405JkFxxHDxbvX74mB6JgWDHWg/QT3j0ppQEhwVMhrNmxw59fUVuHA6eu1bvOC4YPocUYe2S8N24igdUQabeL7k7eIGxoeW+uxdfOL+nB1ZdTdSCXSd1x4dDlbBBjJ/rF3d5MFVAIF X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: 18c4419c-2b06-4242-6977-08dc03fe46ae 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:42.3503 (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: olwAPTs66YwYvqNGVsFIxgGqKm3cgvwkXIk5H3dvb4TRKHmRu4c22LlkPKb1tr/oNT0YP4UIuVLHNSqqZK5YyA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7365 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231223_132950_286551_8229BA61 X-CRM114-Status: UNSURE ( 9.65 ) X-CRM114-Notice: Please train this message. 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 Most arm board have a board-specific compatible string that allows e.g. userspace to match specific firmware variants or apply specific policies. Add board-specific properties to both variants of the Clearfog GTR: - solidrun,clearfog-gtr-l8 - solidrun,clearfog-gtr-s4 Introduction of a common parent (e.g. "solidrun,clearfog-gtr") is omitted for brevity. Since announcement of the two products no additional variants were added it is assumed that there will always be just two. Signed-off-by: Josua Mayer --- arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts | 1 + arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts | 1 + 2 files changed, 2 insertions(+) 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 1990f7d0cc79..ae921a674c93 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 @@ -4,6 +4,7 @@ / { model = "SolidRun Clearfog GTR L8"; + compatible = "solidrun,clearfog-gtr-l8", "marvell,armada385", "marvell,armada380"; }; &mdio { diff --git a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts index b795ad573891..8c96695ca990 100644 --- a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts +++ b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts @@ -4,6 +4,7 @@ / { model = "SolidRun Clearfog GTR S4"; + compatible = "solidrun,clearfog-gtr-s4", "marvell,armada385", "marvell,armada380"; }; &sfp0 { From patchwork Sat Dec 23 21:29:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josua Mayer X-Patchwork-Id: 13504144 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 6036FC47073 for ; Sat, 23 Dec 2023 21:30:35 +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=2/IMIM6tSnaS3/lhqhh5csv2C3UpyNYfeYGTMT+nMgc=; b=y5IoqwoNWSGlfc 3tToaAzwWmCDDg077uYOJYeEhmyAAdF1rbKIMwlZw1A0lOjiMZX4bPh3BWFQGSAslF9rdU4VGXCUq lRMtz7T9k1BywvAuvOkUEmLXtBV8npfg77k9iLQzcQ2+UxqK9BngJCDy/z0SULrZRK91gALvCAm4j P7nAHJ3HMqymVGxUFlkFo0FpEYFEiItE2aSm0CBD2vLBx5wm6aafpCMnOdaDB7KuWLFcg5WQT0CW8 N3LBhu9UFFftn8NOAVlrDxUeIoniDhshs/wc5wOzfKwApRKryEB9YLsmZJXqTgcLcY2J0jLudO8RW MDw/YnKu2H2SUMu1bEKg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rH9ZK-008VCj-2u; Sat, 23 Dec 2023 21:30:02 +0000 Received: from mail-db8eur05on20603.outbound.protection.outlook.com ([2a01:111:f400:7e1a::603] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rH9ZC-008V9U-1a for linux-arm-kernel@lists.infradead.org; Sat, 23 Dec 2023 21:29:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lSzGbMtU7VUMm27a19KE0JYPsxpuDK30cHy7pMb+CBG4H+aX/RHTf75c8Gr444WfLiuyCXaovekCpTApJ0BF37zdSF0z3p29FJj+0IWRk7JANKzHqw7suMA85APpXEwQju+CFsQ/Vebo997HvUkIt8V+/touwOzWPTRIEAzrqjIg0HfWIgSzfx1Cp2wxmkzUUUy5QYb2Lltok7OqUOlZNo3PBRRkdJfgL4Wo9UqU6RtP2d1/D0HKN42rmUTamroAZY+Z3XbvrTPFXjXARMr5SZKB3fLh2H3c598e5O6N1duVZxp51R7tgQUGr8fExlboFjcAz5d+vfu9pk29SZIgCQ== 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=ZKsjom/51FGvZlL8ux7uS63voBESQC8qyakj+Xib/ko=; b=iYHLUPINiuXXq4ZVmSpzNrCSViguI0U3BxPJRXxdjsopYhC4A0z61YAcvgKGMcgGkBKFeUIUaZvSbZ5iNdQRchKHqUfeg6AnPHQWxuxnERmLchaAbdDbdb03QJ/kAsWiOqvtdbKNpEYwM/OWKwmhe4HB55Gfc996y6GspfyDeRZsxDyaPvgtTFQdZ0iCkkmMAUbTyPEtNotsReSWJRZAx/oO7CRIwTA0HwClH7udoPVEfjs+uNuP+iO5eiQwwB6GbgcvQxc7zvwy6KW8UEwS7uBQPA7CLIgL8jGqVmjQDV/PJiz5sE3D+ikjBB80ex6IoXglF4IZEqjihNEriSO64w== 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=ZKsjom/51FGvZlL8ux7uS63voBESQC8qyakj+Xib/ko=; b=FqPoO3tbUGmqfDkNQzedOUQIZwU24okFB1Zt7ASFPTaMXdKl7kGRBVU8M3TGoNzq1nR72SHrIxPMzwXo7sbsxY+Ez5+uwf5/tiT7OaABQLiJeXSgUlfuK+krRXdhSWGA1cAoIskeDo0tpl9Wpv9bBNHg4iNOHfURTbEBclOr244= 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:42 +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:42 +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 2/5] arm: dts: marvell: clearfog-gtr: sort pinctrl nodes alphabetically Date: Sat, 23 Dec 2023 22:29:27 +0100 Message-Id: <20231223212930.14624-3-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: c233e853-dac0-4d93-64c3-08dc03fe470b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: t6TzE/MSigWubWHKFilO90yMWErLAYjZzChKm1DjvJGhMZWW5TFWXtxEswKFWbCyyhKPkGYFuaPmy8gfBJ2FredQt8ybNdQ71sjJCk7mz54eKqLv5gRKPplf6NqSaewO5eWTYwyJe+DiYgrY7Q+mIW4oygtTS7gwoBhvQ+QK55a9ZfZenhtKfIlg2Khn3PnkOvqybjH3qsWLMFYt/3IuHSCKc2Tn3yERgF/yKRXM3LDFRy097s2hKh3KhR8KAZcvhuJpkk+4ymgG8n0yltwkwMaekTF4nb1U9B6OfDuYgPc6dAiVaXVLfHjZMcwOQLU+Uk6E4awIHJNHTVemCa2Ly3mSJMDYwHx27WbbmhqgxQU4xFriy2rKytqPPqee2ci+x9elM5fqZXKyKggVW9DwWpJvO3MNpf2Uw3kwORlss7pK2Ww9+BlCF3g4+a3SuzLjakrfp/89DiJF7qSJtnghOC8VTmk3MTifCBBjbR222iekm3L+v3ZQDZxvc+6131vBO/qfyeVWbx+b/ICrmb/Ht/Rmk4a67vkPf01VYIJknu6MMpQab6SlrDvnJbrfu1f2pAu4cisP0kF5PnjXbfjyNJgyobHqmsaIdYdJO68pfwFC6OTnYrD5Jr69OYl47oyv 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: 98E3MTEDEOP800j4S1p91NG/1aFqQ+xf3LZgP3mFghYbPy78H04ttrPYi7aCfnqY8JUAfE7jGnTux9ZuznUv6NSka994IC16W6cZ8rNrXTWEPWYv/Kw3v0Efyq44QBYS+GK9vNvSkjYy6HKp2JB6YKgOtjkuZNlxa0IbZOwFO5BW9/5Z0orqluCNwVxGlQxXl0a5CYUw+SHPYNyA4NznfPXokNDNyPuLO/JayAGLJ8ok9z41w6eeDaRSW18KNHTEd1wXGV5YedFt1hh7DsVNvDSoY/owC5JvFjpTxq3ltYoexv5pe1D8R5r9Bw5tVod/m2tdtEsxCdsQnuxmeMXjqowg5AE0vtiAaulkmxHKFodZkSj4tzebZKjd4AOcogV3jWYkJw/Wc1PxXzVA79wyH0g40Z5I75H9hDGFF82juPkaWKhQxtf7toCAm3Ck9bAIMB4tHDA0Jy1d0W4lrS0g4NhXHvplQcWaJ6ZnETof4lmyPBYFVt04mW8DwlJmBthle4Mck0yQIQcnCjkOu+8YuCmX9m1G32D2HW1NSHazfpAwnibzI0S4Kq0Ds5+NWT/bhgHQXbzvOww+/VctxK23IJbIDUXTNr625tlB7Q+BxTvzfm1IEU4xR2yM+Pm6D5Lx0EK3AZe+Ytku1HtkTnjakf/cyhGADXYy2Ha/eTwbD4dhwwGsKfb9Nt4x5TUUl8iFizcLwKS+6Bind0KdMbB3NUxYttPErzRZAz9pOaEKA8CDSR1s2Zw8Tk01HEDN+bpvEkE3pB48GlL03pMKczX9MScvKYV68D+C/7LHff222U0daGAd1R0d5Q3V7ozqQpvVXvBqaIrRWBNSPO/SgmPfdzdvwJ1EFltdB6ooju1Cxedn52bzpxh1O4Lalf72stNWfzdu0pr8o0KySSTCL3Ln0KF0uqJoWC99jEcdNFDM7Z/ETMjX0FooycH+7H6DGcy9o/GpEGCrOEQbrXfZTuWAm2lMgQ+1HgIfILdhJcIOoq0DVxtt3ts5+4gmUEzgM9V1SVsF8avinhuLjoDQNuGy0F42PMwruS4jfcK6JISjxL9cEW6Nkc5PyjrngUPMU+r76s6d+5SnrDTvUUi6WweYwwhPOkkq8e3hwA3F9l8ZnXdaplaqSxGqrLFDL+diwn3OHyOhKS3ZQAnWWcAG5hjYqk4PANrE8avfOp29GeBQVEOkZB7mxHwNf7MrFb4wiKvXZW0PA0h+YYFTf0/qZiLR0QnSSW9c0zsRiURp6JFbm1kxoIdI93QrxhZ4v5qmxjO93Rp0bfQEBUQ//RoJQSyViV0ZdbbRjmdKerOCQd2ElUcaW3zO3Hj3Soq921CzdgSzT9sFxc0+/g5Iem2jqSQdi+C2ediGXOsfwb+Hwhgh4iKOKS1sww+DYI6MizpTcPEE1P4eiC91Vt8Fi5NgBp6VVqaesrtFV5sQK1F5sWUP5YiJmLs3XsmPbLuW65fuLY/h3L9mdUMXRDi3tsvddwUgxHilAHCktarYiKWPVwTfzQ4ZtwjOkx/VXMu8hL7SWeYNuPKrtZbAEInv2vs5iS8a6mrVEIy/f2lshsMeuCfi/xS7Eb8YDUWjrH10I1eRLB+M X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: c233e853-dac0-4d93-64c3-08dc03fe470b 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:42.9084 (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: j8SI5fPc24SkEnzEjnnPiPoL6r7dXVZ3E2bP9FxoSjo/purOgJKjOjw7x4ycC29dL+Hpu/QQ28Jgq1jx4VjHaw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7365 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231223_132954_539941_BF77834C X-CRM114-Status: UNSURE ( 9.17 ) X-CRM114-Notice: Please train this message. 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 Cosmetic change to increase future patches readability when adding new pinctrl nodes. Signed-off-by: Josua Mayer --- .../dts/marvell/armada-385-clearfog-gtr.dtsi | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) 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 d1452a04e904..8eabb60765b0 100644 --- a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr.dtsi +++ b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr.dtsi @@ -141,18 +141,13 @@ i2c@11100 { /* SFP (CON5/CON6) */ }; pinctrl@18000 { - cf_gtr_switch_reset_pins: cf-gtr-switch-reset-pins { - marvell,pins = "mpp18"; - marvell,function = "gpio"; - }; - - cf_gtr_usb3_con_vbus: cf-gtr-usb3-con-vbus { - marvell,pins = "mpp22"; + cf_gtr_fan_pwm: cf-gtr-fan-pwm { + marvell,pins = "mpp23"; marvell,function = "gpio"; }; - cf_gtr_fan_pwm: cf-gtr-fan-pwm { - marvell,pins = "mpp23"; + cf_gtr_front_button_pins: cf-gtr-front-button-pins { + marvell,pins = "mpp53"; marvell,function = "gpio"; }; @@ -162,13 +157,6 @@ cf_gtr_i2c1_pins: i2c1-pins { marvell,function = "i2c1"; }; - cf_gtr_sdhci_pins: cf-gtr-sdhci-pins { - marvell,pins = "mpp21", "mpp28", - "mpp37", "mpp38", - "mpp39", "mpp40"; - marvell,function = "sd0"; - }; - cf_gtr_isolation_pins: cf-gtr-isolation-pins { marvell,pins = "mpp47"; marvell,function = "gpio"; @@ -179,18 +167,30 @@ cf_gtr_poe_reset_pins: cf-gtr-poe-reset-pins { marvell,function = "gpio"; }; + cf_gtr_rear_button_pins: cf-gtr-rear-button-pins { + marvell,pins = "mpp36"; + marvell,function = "gpio"; + }; + + cf_gtr_sdhci_pins: cf-gtr-sdhci-pins { + marvell,pins = "mpp21", "mpp28", + "mpp37", "mpp38", + "mpp39", "mpp40"; + marvell,function = "sd0"; + }; + cf_gtr_spi1_cs_pins: spi1-cs-pins { marvell,pins = "mpp59"; marvell,function = "spi1"; }; - cf_gtr_front_button_pins: cf-gtr-front-button-pins { - marvell,pins = "mpp53"; + cf_gtr_switch_reset_pins: cf-gtr-switch-reset-pins { + marvell,pins = "mpp18"; marvell,function = "gpio"; }; - cf_gtr_rear_button_pins: cf-gtr-rear-button-pins { - marvell,pins = "mpp36"; + cf_gtr_usb3_con_vbus: cf-gtr-usb3-con-vbus { + marvell,pins = "mpp22"; marvell,function = "gpio"; }; }; From patchwork Sat Dec 23 21:29:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josua Mayer X-Patchwork-Id: 13504139 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 79DD4C3DA6E for ; Sat, 23 Dec 2023 21:30:29 +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=dpy002v9OErYs6jj3bSxjfk8ySDMwQyoWVCp/j+SYvY=; b=BzpF+ujF9OR4ZT hYE0VZO4g8byFAVZ/ppOdWlqs0SYUnWdWUEzVeYA5TE8/Vq+dq/9Dn9qk+rg5Mcd8YEEzqLWyCc49 IhQ7JUVuyV+J0I0FTUWCneud+Hy/BYT/2KLkxWjURwds3gdJCwauJfYKUgBClRPdkz0KmBTuTM595 a3UYKF1S5TjboU1+NXsMpYVhhauA8cQtgl9c+3SMVjl0s/am4cWIfJaRS/NEXL0ERsiCfjl5b+YQ3 tO+ACBh+49EXdUZmPHrBdDmNlJjV1cWx7uebPUN8hxorOr2aBDWdupujrygDn3rOBU9qy0/ohx1LM tydyDy9Yo6xGEReGpAWg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rH9ZK-008VCK-0n; Sat, 23 Dec 2023 21:30:02 +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 1rH9ZB-008V8C-2A for linux-arm-kernel@lists.infradead.org; Sat, 23 Dec 2023 21:29:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QjR79hLWfNYy2nXECzde/2rfycDDSC2CuxwARKkkwyeAUmAsiVcfE+vkocNwgSteOLlw896j3yIdBVI6OUz0y0VnN7IZgNz/TNH0Er+twp8JBd6GQDtE3qkL46wrLcAdoW9+7CteQAcVS1E8yASaNjD5yIGZREHW+osZKJf/9tHFKVH9q7Q7rdJ9heNAtaD+tPsyZdrbYre03XuRghfrLFZkRXaGcylm4tPuhQU9VpBQDwBZ9rvQ6rIxMNvePyVREGZ9rGYuNYFEjw1AK2UHeyybdrVWLtp5BxwJpb0xwn3Hbid9Ux9NR27DJJvMe0zr98NxPUIzG6YqyWUmStQRhA== 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=Q+Itzw8zQlo2EK0YdUetjuRDAlHyumG4Jt8m0j0GUeI=; b=MCgYjWFdB82LUPBSjBk3GRkwfMT5QIixfrq6DvtI6TA3yKo8Bi7+HeYugWfGvtj5/W7BjayMmU6aRiGW8EvyJBRcgqJep8PNn0SFRl812vEXSfYFBZtOU6siD7CYp6CuFo4upD1JhaTcMzzMejlRgpDd8cl9lT3Yb8PNaMj9yielw2z3jMA3/WseU4I2nFn8eT4ZP78L18zICyLAVDb8x9i534Dzmw61w15+4o8h2e2ljDlSkVuBuvG4EAv0g4CEuC+7aOYtcm5dq2+JMezEmjqq+q3b7mfrxa20ZGdJLuc+JLC5BBqT9tGYan0NfbJ7w2OfduNKTF4jsO0oAHaS2g== 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=Q+Itzw8zQlo2EK0YdUetjuRDAlHyumG4Jt8m0j0GUeI=; b=pN477scAcWjSfm3BJQkLBqQZJFjqh3J71PefafvDSR6XupIznhZOVBGsxeIRdqjZBDeKI3TXrdoYs7Q0cUMvRoaFpMX0W7FmR1/VroRVaIfe++fErsDMFGVKHBaEw6cov3fOSustDFjH/ndTXvXstQZCKYsjKMkAhnCCfwjs3XQ= 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:43 +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:43 +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 3/5] arm: dts: marvell: clearfog-gtr: fix various off-by-1 gpio numbers Date: Sat, 23 Dec 2023 22:29:28 +0100 Message-Id: <20231223212930.14624-4-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: 7c167ba3-3ac5-4358-d7f9-08dc03fe475e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MF6R4JOAiYkawyn8yUsrXhneQn5NjAeLw3H+GLL/Irkl5dc3XuW5V2dcdHE6fRsrkQpIYfag9C/Wrk2OByaqrto/0AMddYxWCR3lVVJwnGuXl3uTdmfroYDaeBASGcoieSS3rlwCt35HsQK5S8uUr4FNWO5qm9sBe5nGgiz8OtNnCZH9+sIk/lBvLd2Dy6Q58kxPGM1Bqk35+zUHpVkZ/UCzclYizD2Dkfj/tshOEQZZn+0cD4tpJvxIdsVeDdphmvxJgNDeA4HxWG+2O9scBzFXC1DTmkgZ3TgcjTaGCKTjNepoKVsDhSKwniK7JxEL7bXoQa3diJzXQvMnNgA8wsfkUQqkx9ZOYWcABhCxl43JQzsnft3XEC6geNFOwBHdZ5PEgNZvmLUozsLELN24xWUWV7wbqQsvhqAy9AbSNiKAt0vcZCIUzgGqLh3Vb983URpzS3gAt5yQU9llkrso7ah/InX4mtYz185NDmwATSKISuXfVHG5uf58KZYSj5zPTbiGUudxlPI49PBPMab7gEqGEDuYOJhQxeKJFktX0/Z5/T0k/fC5QdaQ+KmLYGjmjg7QhZjcvN0FpzS4a71q1WWPzwNbRkcN52OWFzC66jmQyuYg7YORtZ95UINOpm8k 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: RGRxaxL7IbdX+FyO/LM4t3o5/3MHttGLlRZJJCWr0BCAa4wKgGClvtXv9Au6PWgrYK8Pg7wUAcgqnAacl/0iaB4NIJNt4Y4ijyy76SycgW/n5LYx1WDSUe6XLl9JsYcF/SndU383abcmwj+wx0Wb78Dlb1l+3ij1Y5YyJPQuua1IMTAGV31gogsKMd9LRz1E0LpBLz+XyI9IoOVzXoyfxtyXW4wPeJSN4Its4w6vjOHoB+ViJaogbGCVzVLJ+WDEJqdfu3OFddOVCn9Wu8VHMDGhYRewmGISbydXnjap/JMZHWgrheOh9Dy6UwDNMNBL/eegUs5WAWFV8xKkgDZ+w4TZyJhs/3YDuKhBnTibmFefTZ8Y3cbymyBsNDqfj/oMb79cBFDpD+GysFJkr9qOYcAlgBkHiC6B6hJ9tVmpaaYft7kflgl+snh0K2mJPkgXkqtfDeYtnEd7RrkBxEPoFmD5cNhl/El78n9Z3q4F45SyRdnc91PpytTnOJHIufGqP3DoZi87RrJ2mpiF/mUSG73UC4LXTqgmWhY8k243d7+tDN47kYv5nOJdOSnJLjS1LYF5fzP5KfrWCdBS64ftH5RSY6761VBoK+69KZ5s+aLbMZx034YAZmdhHcsiLZviVSlXxdZmRdEfhSdFsbhL6Oec1DaQzZXWUw+FK1LLCGC6a/+Lg+gDPwn97WtQ/LeLEZ7fwEssT97mSQR89v280U0j200EUUqXYz/8drBFzJvTVCS67pg7fBcogoc2z2NRGlyZDMD/lJEi12fKmecw+DnB+foMinySyvOD4+iL7uEKM2K4cLMBrE26ojDUPp6QeZIkHfFXIAUShBNIC/tCBXdalQ+mDcYfFdKs4YLiiYGLgZrVmlx+zyJT7bssdefvYS1u5dhwJhGtlaxr6WXKPOmU818lnvrgTOXPgimC4HfUoOgryFv+j1vMCriuR5QbkoKcx350o6FGwGq00Mf36kZaKeB4LQdnD6TsbgokTK0hm+VwXqo0hz9Gz6/sTjI42+gR8KkrZVUQ2s/lQSJVSk6bFz4MuQ3ao2dQfJvjDUH2qAFFXhT/kA3P3RHgfzGhC5VPx4QG9QgmHlg36ekyF3QPc96UY3wqyQQ4/ArUfHp3B4r6PP9A7Vc4Ih6BoshFZPIr8IStmzvPOYe/rpBan6VRW78XVvxJV+m6vM4YVTdRvLfm3u7QbMsC4ZLUaQykm9oZz78ueRM1AnOitGH0W3LZN0tN2A+VBk35BrAAyUVJBqvcxfGcOuj+Fmrue9iKOq6mI0EpM/4qrsJUSS2FHozPBx/IaF1f/JcAp9cfA2vj7Dm/iH9gNT0hw2cAreyNzzK2yjOrU0h1DjZKkkoUEAtlLzHzRIrRyiZLV+dc+WJRH6HCO0hurnQhxLnc+FqC6zaN96D8xt2Qp5bKNcjHFkDOz/+Y5D8bp+Cy5W06FbSNH+oS5yTU8PdFDPB/o5i8EH7P7Xot8yWNI7mrLanyOjWTxPeUztlCjjlHLwyRxZ14VsJYParhv67eXaa2oIDtVjzk/tNK/TI3bAl0vmnkLwGXmSxhn9DoXoQxJE8wNtcIuB4ABitAzMLEuLzgnnDo X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c167ba3-3ac5-4358-d7f9-08dc03fe475e 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:43.4609 (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: cmye9by5brFXwF0iX9f+t8RPgHl2sW64OpOr/5Xa2WzBp0kPnQm73H/OE8+eqJrwT68vKKJX6QnLxJam57dG4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7365 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231223_132953_717632_D5AAFBD5 X-CRM114-Status: GOOD ( 10.48 ) 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 Various control signals such as sfp module-absence, pci-e reset or led gpios had off-by-1 mistakes where calculation from mpp number to gpio index in bank 1 was incorrect. Fix all such mistakes, and add explicit pinctrl entries for those gpios where missing. Signed-off-by: Josua Mayer --- .../dts/marvell/armada-385-clearfog-gtr.dtsi | 61 ++++++++++++++----- 1 file changed, 47 insertions(+), 14 deletions(-) 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 8eabb60765b0..d43bab0fe884 100644 --- a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr.dtsi +++ b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr.dtsi @@ -162,6 +162,22 @@ cf_gtr_isolation_pins: cf-gtr-isolation-pins { marvell,function = "gpio"; }; + cf_gtr_led_pins: led-pins { + marvell,pins = "mpp42", "mpp52"; + marvell,function = "gpio"; + }; + + cf_gtr_lte_disable_pins: lte-disable-pins { + marvell,pins = "mpp34"; + marvell,function = "gpio"; + }; + + cf_gtr_pci_pins: pci-pins { + // pci reset + marvell,pins = "mpp33", "mpp35"; + marvell,function = "gpio"; + }; + cf_gtr_poe_reset_pins: cf-gtr-poe-reset-pins { marvell,pins = "mpp48"; marvell,function = "gpio"; @@ -179,6 +195,12 @@ cf_gtr_sdhci_pins: cf-gtr-sdhci-pins { marvell,function = "sd0"; }; + cf_gtr_sfp0_pins: sfp0-pins { + /* sfp modabs, txdisable */ + marvell,pins = "mpp25", "mpp46"; + marvell,function = "gpio"; + }; + cf_gtr_spi1_cs_pins: spi1-cs-pins { marvell,pins = "mpp59"; marvell,function = "spi1"; @@ -193,6 +215,11 @@ cf_gtr_usb3_con_vbus: cf-gtr-usb3-con-vbus { marvell,pins = "mpp22"; marvell,function = "gpio"; }; + + cf_gtr_wifi_disable_pins: wifi-disable-pins { + marvell,pins = "mpp30", "mpp31"; + marvell,function = "gpio"; + }; }; sdhci@d8000 { @@ -221,34 +248,38 @@ usb3@f8000 { }; pcie { + pinctrl-0 = <&cf_gtr_pci_pins>; + pinctrl-names = "default"; status = "okay"; /* * The PCIe units are accessible through * the mini-PCIe connectors on the board. */ pcie@1,0 { - reset-gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; status = "okay"; }; pcie@2,0 { - reset-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; status = "okay"; }; pcie@3,0 { - reset-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; status = "okay"; }; }; }; + /* CON5 */ sfp0: sfp { compatible = "sff,sfp"; + pinctrl-0 = <&cf_gtr_sfp0_pins>; + pinctrl-names = "default"; i2c-bus = <&i2c1>; - los-gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>; mod-def0-gpio = <&gpio0 25 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>; + tx-disable-gpio = <&gpio1 15 GPIO_ACTIVE_HIGH>; }; gpio-keys { @@ -258,14 +289,14 @@ gpio-keys { button-0 { label = "Rear Button"; - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; linux,can-disable; linux,code = ; }; button-1 { label = "Front Button"; - gpios = <&gpio1 21 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 22 GPIO_ACTIVE_LOW>; linux,can-disable; linux,code = ; }; @@ -273,17 +304,19 @@ button-1 { gpio-leds { compatible = "gpio-leds"; + pinctrl-0 = <&cf_gtr_led_pins>; + pinctrl-names = "default"; led1 { function = LED_FUNCTION_CPU; color = ; - gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; + gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; }; led2 { function = LED_FUNCTION_HEARTBEAT; color = ; - gpios = <&gpio1 20 GPIO_ACTIVE_HIGH>; + gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; }; }; }; @@ -408,7 +441,7 @@ &ahci1 { }; &gpio0 { - pinctrl-0 = <&cf_gtr_fan_pwm>; + pinctrl-0 = <&cf_gtr_fan_pwm &cf_gtr_wifi_disable_pins>; pinctrl-names = "default"; wifi-disable { @@ -420,12 +453,12 @@ wifi-disable { }; &gpio1 { - pinctrl-0 = <&cf_gtr_isolation_pins &cf_gtr_poe_reset_pins>; + pinctrl-0 = <&cf_gtr_isolation_pins &cf_gtr_poe_reset_pins &cf_gtr_lte_disable_pins>; pinctrl-names = "default"; lte-disable { gpio-hog; - gpios = <2 GPIO_ACTIVE_LOW>; + gpios = <3 GPIO_ACTIVE_LOW>; output-low; line-name = "lte-disable"; }; @@ -436,14 +469,14 @@ lte-disable { */ sar-isolation { gpio-hog; - gpios = <15 GPIO_ACTIVE_LOW>; + gpios = <16 GPIO_ACTIVE_LOW>; output-low; line-name = "sar-isolation"; }; poe-reset { gpio-hog; - gpios = <16 GPIO_ACTIVE_LOW>; + gpios = <17 GPIO_ACTIVE_LOW>; output-low; line-name = "poe-reset"; }; 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"; From patchwork Sat Dec 23 21:29:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josua Mayer X-Patchwork-Id: 13504140 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 3F21CC47073 for ; Sat, 23 Dec 2023 21:30:30 +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=e/pHH7lQ0nhbq1oNz16pI3LG1M27IUCrDfmepw7+0Hw=; b=1/MeEf0fLUvfPm yZL2Tve2rgRV18e+TyNiy2Tc5lZPErFZkbF9sImndVH/3LC89SfwMPXl/EsGl66rTeN1Y8nT7QhGg rXuDwj48/ptR7P6kZRxlZ+RtoPUsh3XQx9ahtdKWLmNMsRkJSvtTr3/yArbVSd8g5i2phdJmP47o1 BXzknQF7xizaryUUR/HPjnba8HsmZIgipyrdbTO401DePxX3NN1mdbP50LuuNCgpbnQtH95+nYgCn O7KDSU5Sz1m/WcW45MFiewSSci3Lch8+p86mILSGRQFotjg4zC8H6ZeGgc5xoyFVQyp1Mpl4tUH18 PuKXdTCM9KxIR4ULRCSg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rH9ZM-008VDI-06; Sat, 23 Dec 2023 21:30:04 +0000 Received: from mail-db8eur05on20603.outbound.protection.outlook.com ([2a01:111:f400:7e1a::603] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rH9ZE-008V9U-0V for linux-arm-kernel@lists.infradead.org; Sat, 23 Dec 2023 21:29:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=egW0BDKrrc1hmUiD8wHBm/A6RsHZ9h6SPy7DVurDTO2bqsoWJzhWe6pxQZQ/S34V+BPK5uhOVIegz/5vt8j3cciPYvpQzIFCdG9LMLHdiJZ+HLPVMLvC51ZV4dpdIxe8P3t7foO6T3iJ3BQkBm48rZ57OFv07ADTtCMjP90EsfEqDjftzPTqFG5ZqSChaPreXySGf4ukm3aJTDdHPpYWflMlFEl5D//3MQiKEJdgr9bqRyMNuICS59xhJEHHrML7fbxuMKLmdK9tUzVaZb8Z/jodowJceTzW+u+JUcd2Fl/dViO2BSeNHANdbv75ABB9JI/SlyiszKlRf1ShIjBAWQ== 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=nInDczVL1fJraU+PBm9VMqwG7VQKrpTSZK+YhhTtqu0=; b=EMRb7j2ia8AgNxJ74Vjl/lNkQv2F/4Vy9e9ylBVr5cxvacE0H9pJX0GX25zBqfr1VCOFPcRpbKEcx9FaY5KNSDOw+h0XUhvZ2nMEFE08nyXJLVcYtEGy9fKZUphc2IbFFCb5xiYBCjHTOI9S84hsy5mt4YIAH5oYzB0Qzl9m4sA+CU91CYzIjdxUmVXZVajVuPpnQLPcEAjujNk3XDKFdMBaszVMdven1X2qtDIZkMzXDC+UyEae/ALw9hbMYF8834fA/wg1z1i0z/+Lk7dComnh0XKyCvrn0dwatjW7RM2lRLp//yHEXyC8Ob8n/KLQXjJLEVUvhYHvBlVVoq6kVQ== 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=nInDczVL1fJraU+PBm9VMqwG7VQKrpTSZK+YhhTtqu0=; b=o+M4v6Ogr2hF8D47Zjqw7d37BtSymHyy/fYegRzD/1Z8+oGhROKniPXvMbp5f8PFXiVXSCIVF5GWHSc1p1n+10phL0m5BrofEnR9cS64LwLX7RSgsB/CgAiY1Gv6vHCIAhonn/kVg/dz21x0udFtf3/ej3ajqczsjUoVVRoAC/4= 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 5/5] arm: dts: marvell: clearfog-gtr-l8: align port numbers with enclosure Date: Sat, 23 Dec 2023 22:29:30 +0100 Message-Id: <20231223212930.14624-6-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: 5c080c71-87bc-4c33-817d-08dc03fe480a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yiOd6448iqpbBRHNQWFZN9XC3S2NVilG6FPBD2Rl2vm4t4U/rRgvxFh6E+2vzHwLqpFIXZO+sLXxnUZK5oFHwLmtBSSHvkuZnHRISty0MCWFdfGLND4zr/ht7vlJ3kSInaejyrboItK8KlXGYavpiUWnOA46JqrcKhdewel4COhHKe+3ITTDWg4QPvdbKFN0G23Xrd8Q60vHTanUwK/ir8LyF0k/r046Pd8WfqJFsH/rNlwBuNfZaoNNDH09zUBd4uw80TG5cwIuT4B0MYK43hrmsenTCergaUT7+venMsN9R9WO78UnYX8Afni5FbnCMVDbH6qo2bWVLZmaBnImNv89ANk5gYLI38o4pjtn66RsgAfWAO+LLN7YSO+6NtZHku0eaXL34wDlfRhZm/Kf9lnxS5hT/zaVnbK4KGSzflh/LlkY5R3Hs4svgurqVA+1QePuGp9ajU/j9jKWJbm2zEv6Y7YLVvL8gEuD+f80QpYWeJaIQSBPk389mMb5nEfLTOQzEF36/7bhThgahHyagKoVF36GuUOwL46D+TE2DeBzSOZ4vyWtvlUz0yuEYULREeyBY5FcapSUZt0weh5Iv5GInX/0yzmNAOYUOefJgz66+8h0jKNcLogFlMZAp9CR 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: M+S/9HtBELBwxwYNgr0EuuY7x0MmA1wrtD8RXHRuBqxQN0QKR5cvp/cL5GvN/XqRO76NNYm4HH8nnOwGppvogSNaO1dzmI0oAevZtUoYh2bv9sPiQ5Tgewh3UhmNB1aQl9E5u6DViXnRdddfH8MAi4dNeA17rC7oBpUPkQ4M971dwGJmwVlc84h4O0f6EE2aM3ueVGxNPLBNBUK5jxXHoS2lI+GcTEKu5TveMh+fp8ShrsXAiN4O6euWoZdt5F4Kmn7keJuNBcx4pTTTInLHQGOJQZW/qjFVqpwhwHhe3tXT4LERN6OnGmqT7vhkajapfc9PQT0PgDXmX4vv84KFXNxmIm6jC0c5TvQfwstLI/9xhYQ44WqC/d3LjwStDg2znT3CE5sq43GjXljcyLXagIaV9akrTMkPU7Jtkg+sLgArkUBCZVLlzFgXLkgH7o1FylyZCJ95rqgE7G6apQgPWKFGwUqioO6JAvXxUf/c83hXOlvnNUTOQdtv0pPLXZ+AKlmeC9myj6VAtq9r01cDMRCzf1roDhnuQfQr2be58eVqDCV1NDLZCumigQg6x/lxbsQrr9X271xIZynDNQ+19PfzGc7ir4n1sHpDz2LSpU6lcZXPWcK278oXbnLZNvAjlhwhkwCoI1thM/1JD69UgdM1ymJEMAl15pZoauWV1K67Js4QYB+B5tBJW3LKIP4zmD8KnNaaocDE+VHtCc84LE3B/Tfllcsbk0uDCpbGxzEIqf05Wme3y5SV9Ww5CO0woOqnnYQAuehbayu8EFJpoHtDVS6mmkNUR3k5J4svSRxrz0gXUkwkiFOOwceWP+Swr1GuUgUr51P1rrCo45gidx05lZ23HeIT19gu8ZT4X7xceV/nJOoHOyhLG/1bWlCr1lXvPraN1eP6JGsD/Vfz7Tr2Ii+K/N3jHhO3mWpIRIqeSQBUyG6/R2zmIRzFaFqSu5hZbAckUzKxXUXxMWqdhzGdXLc6jDR53UY6xMGw9kN69+0CdX5ftMeB+cXgMUZJ/8ekR51vkFJHeKiGBwdlwWSFdN+2qXlbSLUzswqC82mkaU4SovBEQML5kvkw1CldfYz85uLsaIxEJuLueiHKM2KmlfkjBpprZUBRC+/RpeOK6p/mOaB/Qc8JZTDOeocR9UAUljGPQUcM6yEahnJBfjxQu5n/6vBZHUOq1cXett5LrHTBrziQPl8gzwDLKHjjf+2NE9RP7qg3cY0BtYffDaAUD6wp8H9vudoeokS8mY+t4sFGfHRryu/RyGEVmZd/5QFPX1iZSsga2PB2z8p4xHu4ERdODq8GpYVWsQT/4W62FSRUuFLTBqvM1rauYfUVD/BmssJv5qKZZS4Yj9D7zfmjc/7L8Gv04IpvBypION8lKooslsR+vQT2+t4X2MVc2bIg+Av2gghMhPSYi9KBJ1TbDuG05K69bAs8eqxabDcOv8a+xh+tnnA0PqXvzgdIpJcXs1FA/lgsRVkbaPE5lUoQ26yrqE3rb9gTJzC3ER0xiLRISSbVK2e+tzTYh0+IjIdcepj+BlLMMvRjBnu95CoxvijfsznKN4C2/a3h57A7bNgik0NfFrvFgL9TaCMi X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c080c71-87bc-4c33-817d-08dc03fe480a 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.5977 (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: lSxEUP80mpZsXRCGPOkAAHWYj6xKhxM5otRwSd3P/VMW3CPo98IUEM0H177VZQiAWyPNl2BMdJ7cB86NqIHZqw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7365 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231223_132956_203334_7E1C5404 X-CRM114-Status: UNSURE ( 8.67 ) X-CRM114-Notice: Please train this message. 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 has an official enclosure with labels for all interfaces. The "lan" ports on the 8-port switch in device-tree were numbered in reverse wrt. enclosure. Update all device-tree labels to match. Signed-off-by: Josua Mayer --- .../dts/marvell/armada-385-clearfog-gtr-l8.dts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 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 bb2142907023..44303e79c489 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 @@ -31,49 +31,49 @@ ports { port@1 { reg = <1>; - label = "lan8"; + label = "lan1"; phy-handle = <&switch0phy0>; }; port@2 { reg = <2>; - label = "lan7"; + label = "lan2"; phy-handle = <&switch0phy1>; }; port@3 { reg = <3>; - label = "lan6"; + label = "lan3"; phy-handle = <&switch0phy2>; }; port@4 { reg = <4>; - label = "lan5"; + label = "lan4"; phy-handle = <&switch0phy3>; }; port@5 { reg = <5>; - label = "lan4"; + label = "lan5"; phy-handle = <&switch0phy4>; }; port@6 { reg = <6>; - label = "lan3"; + label = "lan6"; phy-handle = <&switch0phy5>; }; port@7 { reg = <7>; - label = "lan2"; + label = "lan7"; phy-handle = <&switch0phy6>; }; port@8 { reg = <8>; - label = "lan1"; + label = "lan8"; phy-handle = <&switch0phy7>; };