From patchwork Sun Dec 24 14:38:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josua Mayer X-Patchwork-Id: 13504284 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 EC54FC47074 for ; Sun, 24 Dec 2023 14:40:06 +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=EDkw9u3i4kuH6ujRPYK9LkTw4jhcTvmbamhOaIZqQS4=; b=VTeVI6xlt4FbDK pTtUOfwwWuBeCKu4I6urogY9fY9ZL4Yvn54H4VI7nagjrTASGOSfn/tq7zCqazGAVDLqXxnmxDCPd IaQi/YUPccyDRVH0mJqeRaC3D2tFgciokZNABsGm0+zk+AfGqrE3zBhO27oOAFmeTr4RIDG3vzBXr KIjYSMdOSWD3izn6yKx6QcSAz/suHjQ7dhQzRTgDgr4F3torkHZ9AGXqfiQfckYz+uv84/3tszYmp +sx38CVplqcPPWXQxUmUEPTwGjs9gwrDz7Qc6NcjyhvPPTRVFpowTuhIT9K1xqCCbBpi8IzVm3d4h 8nsh/FxhU2P6r5g9vISQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rHPdk-009V9Q-0O; Sun, 24 Dec 2023 14:39:40 +0000 Received: from mail-vi1eur04on0619.outbound.protection.outlook.com ([2a01:111:f400:fe0e::619] helo=EUR04-VI1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rHPdU-009V2P-1D 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=eLUWr/ajGybfg3FngXQHDba5RXmhvUrh8CVQvZ+dzuR2aP89Fa5cd3Uj/esN0GaYjV+woQChKSKjOc7kb8K5KJQZDw4LXQyrn2KKQfdJDdLiSkcokz136H5Kt0VO+wKwfS8XVmIJhqw289wJyuYipRWaGww9FBBuC0xDVTBgxhdgBDopihBQCFsdnEmfxFe9l0AD73UOwa3rvcPW3WhLfCtd4vzPPOXSsDNYSA6DrSEDYkjMJEQ4HwYDXJ5AWykB5Zd3CtQDoDKYn2k+2osBkEXgKkol9KMVqpFJZSZY7wd7qtf0hQPdwXdyAYDEH936w4lRxPMfGq0LqqHrfUyL3A== 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=yxSoLw8NqBJOfjgkUuEqpjmQhlXb/Dw1L7npMGGrjA8=; b=nzt2p6aanEPdGJSKBG17Rx+D4ChtQ8D0dMypDLdBBdkTFppqTcOnM3Hh7i0q1ssipPpXJlT5dUZIgE1lLOsBf1EdZBWAmY9OxnePYytWvwouBSN3hkGipLwaXCCh4i6Y5GPbDwq+mGI7WIqh90MFSMazl+F7bJrjma+DHKlKvtEUd5Lm5PxaKD8/wUxBuhUIGO6/zygJnaLkQC/9yPIjxjiZECYaPc/0rTNQ+rtK67yKxIszwXkxC/1026iRIbMeYI7lhZKLFjezYprYEyQAST841E1NQfYwC1fepioeq1DCvNiNFfiCaHFIQ/uc3sG3jT+TsxZ6OWByRhcT+sZ/7w== 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=yxSoLw8NqBJOfjgkUuEqpjmQhlXb/Dw1L7npMGGrjA8=; b=FepyrmKjr95vvxamD5i8WSNfRlV52cenVt6YtThXn/v8CQiBbFd3B+67tIuWgw0yZlr+kZ6dOVepZ08AtKvrvn+PT/wA/q7H0YjlItksdeBXlsEsxD2H077tY8hdvCG8Tk+/0tvPJYPAsoRCznKVQwCYtXZoJAk3oJU0/HZiLIE= 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 6/8] arm: dts: marvell: clearfog-gtr: add missing pinctrl for all used gpios Date: Sun, 24 Dec 2023 15:38:48 +0100 Message-Id: <20231224143850.5671-7-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: 4186bc00-1f5e-4933-7938-08dc048e1b66 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dJ/f3sh2EG88dvjOLA56fs8Kr1s4BicdXBzqN1lSOWtaNtdtNKtF4l6aUSpl6yl3Rwf3fyrRrr5XoqJ0SpV42+iN3I2ydd5crAkwzlnkreQbK3mRyyigb7DwnJZ0jlApUYCa2ZXtIv77p/wS+YTBB+2sGN7Hd7PgKAt6nPyZ6/YZgZOiGVJzbwGWN6KjAu1gDse9eLTqYOSpGtDofLs3t0IrlIFaCF1Y09imSCnnaF9Ph8W9yicpSYxRDppnCoebGDFRlu7TGBWZ+WuQpF9lElCqhEHm9794iiWoPm+g3XXItNxBL7TskUKXv2mhsSzokLE/fb9wXWAJLwUlkK/nRZJqEE/fGiE3ZLCR+TnFjeAkAUaiL3VvTelnt+as44t9ep3YKsXEnoWTSlZJ+G2cLggxMWctLiKK/Uvb2JikVWI/iZ1RHXWQzxa7Q3BqFFj8gKjrnkibxGSn+2UJFP8UfyDnwYcyFoMAChfy0VF9KJGmfhAZ4mgy7szqds3xHU7ho+ejSIqPebW1et/8CLJNXw/sxPaBBkluZNlFWOtAKsuyMomKWzqfyiQMnyB1KJ6tzP8RGQ6+0pfyKbxqCJ4xU55DACQ8Dtv9FZTz4L01pLe6shTZgvtzdZAbg6g+zdOD 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: xJLfhYuyTmflFU3ergxwe/lkBL+nKbhvTg7yoqJaNoiexDa+kX7vxIrnGG8QQd/lWvSPdB2tRtlugVw/SLszKIH+SRnHEgUqmJwbxoOpPeMiWlz6Aon3xbhdQRmBiCJPbK/EaTGvLZXYGyeJrhjq97zirC/h3ZQ/7NSSgmZ6iIp9pTK6k/KN6O3I0lLkVeuBSCm/pJmeOezYTPqR2TEcwsaHn8RnVgZZ3nIrfxFiQG3vIycOg5pyGRMp868pPTe8E+sADPSyJ+Z+vnUmke24kU2NFViF6cPbZ7Oi2Byd0QphJa3AwNO5p5md2HOCkPj9vCR7tLY6IMCozDWh+w6K5qERLwX1+6whKh8MM1wN9qVyMz+edKXIK83e6uCdsZJxoLH+d9z370F7fA04m3EuYEovdOFSlZS6CaCMtVfVYObcVOB+3AW7xXzfefDaykXeWWZtCg96BHJaU6CgpH8b0ZbTOR5CxvV7u/J2uiriQ8RrNsfAPpPImat3nG0lFRYmwCsNP7uqdTmz6uhrfcAIRHISTSZAL36NUju/b0OaCyYsrLd74ZQmVXqGIuLgUu1NLUNIQB0756M/JnzGHKzp3uwCX1nrL1b3ZzJbq2nW0ag9DVrrL7x8HNyHTgyTpKVs0n/prXk2CNW+Ca5PM6kOLZ7FsHDRAUM4zCzCfnsT20H9QWUvVrYuT9i/ktchPEY+Td5BsVRoS5mWP9UAPbTV4To/2oBi1uQHN5YE2V2MnXIBUBWMyqbA1W1CghlJ/ddsNwteWxb94pzgWaXltU/Tl9dgxTclMjBMThnf8pcZgRIf+SQLee8H7JGU+aRB+nCglGJsXQXXdk1MNQh+5G5rjq56FYGOhJAHaleATiSgdJm3PVw1RIEI+uDFcQG+r6rLTnzQirrILbnfojXdfCg8ZqXWtUFm0P8TDR3AP7JiOR+3sooFOMlw2KU3lZnbTyLwUfuJIvs0I8JyW/lh2AxgPq5ZWVOfqbnrU61Ae7Ky5i6MMSLCMAMQIOXP7Nj4qRXbx0doh/5vxs2tRhk1m71p3DnEc+Okl8stmDrdC/T2/xemIftbvO5j+bwpxRxmMBKLVNuoh7ROkaVzXyLg+eP5ybYyrKIPeePk/VeLRk+lGOj+Vp0VYaEF8bPxcDKXpp7/8ottq42AUj9FkKyY6bZk1zCHY3ZezGThDVl54tLvMst+Loaumhc/VJq4AUEv0ZnOlTXXxP0GauwR0Nx4lboKHIl1pQ0G3+SoR5xFP9WWEfc6tT0bkg+YgrNR8T++kY6JuWd7S6/YE9rO7DAZU9rp09pVwGClSd/ni5aN9X22NEPkcvQiSoe9QrdcEjL/nTU2I1avIpzqvLAfunEwf2Ofpa6ISUEJAL4crg+PjCFZZjM1EzIKUXX6UZfpXS7tofhreoijAsg67uftbwyBpIgOidiq6Td/hg6xgakHh9Q1O88BZLKipFfnPH83c0GW3zlnDCISfhfvxc+BnOsf+SGQIBW3Cx2QXAEIEOVjLAlEWWLnqEjzPd69J8meQbhNNbXyqxKRhVXNWOzS0uIJ9xXCHCtLX+CgivGqqtUVH186xQHr8bgr66M6u5Ra6oC861Gw X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4186bc00-1f5e-4933-7938-08dc048e1b66 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.2236 (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: TqWDio4yYvx8dDvA3J9AR8egxeu+qbTXhp7r4+R431JAKtc3Gf5Kky4Cv5zlARWK3No/tjLsmTU+3hK+hYbhaQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR04MB9285 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231224_063924_426661_4B4D4013 X-CRM114-Status: GOOD ( 14.04 ) 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 were missing pinctrl nodes, leaving any u-boot choices in place. Since U-Boot is shared between multiple board variants, i.e. a388 clearfog pro / base, clearfog gtr l / 4, it is better to explicitly configure functions. Add explicit pinctrl entries for all gpios currently in use. Additionally the loss-of-signal gpio specified is invalid, in fact los only has a pull-up on the board but no gpio connection to the cpu. Remove this stray reference. Signed-off-by: Josua Mayer --- .../dts/marvell/armada-385-clearfog-gtr.dtsi | 42 +++++++++++++++++-- 1 file changed, 39 insertions(+), 3 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..39ac97edb463 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", "mpp44"; + 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,21 +248,26 @@ 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. */ + /* CON3 - serdes 0 */ pcie@1,0 { reset-gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; status = "okay"; }; + /* CON4 - serdes 2 */ pcie@2,0 { reset-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; status = "okay"; }; + /* CON2 - serdes 4 */ pcie@3,0 { reset-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; status = "okay"; @@ -243,10 +275,12 @@ pcie@3,0 { }; }; + /* 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>; }; @@ -273,6 +307,8 @@ button-1 { gpio-leds { compatible = "gpio-leds"; + pinctrl-0 = <&cf_gtr_led_pins>; + pinctrl-names = "default"; led1 { function = LED_FUNCTION_CPU; @@ -408,7 +444,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,7 +456,7 @@ 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 {