From patchwork Thu Jan 4 17:48:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josua Mayer X-Patchwork-Id: 759940 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2083.outbound.protection.outlook.com [40.107.8.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BAE8C2C18D; Thu, 4 Jan 2024 17:48:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=solid-run.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=solid-run.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=solidrn.onmicrosoft.com header.i=@solidrn.onmicrosoft.com header.b="AYvFnJ01" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EPxEqPWf/T+HhTRisNLr04w7aC8xWdKCUp9V35kq2d1yqSEhm6LfkbqQaTZInJqQCO/ex/kIokRkAxHjqFl/nzPj09Mer1/zb8oFQzt4eLFHX6YBZxLX0u/jLFkR2qKuLH7yPTXw0P3qsjIc5ydfQEwg7VT3552jzL4vld5I87pnmwlyW23neodhhasJqQYbTpDnZkVu5igWBw8In++DwEG6LGwSeMPtR90t72i/8V75k06M9W3qZDXDr/GyXInkOadauIAt+UEBKVh3m16/BQC9amvryy7oL/EN1YhfAIpqZ+WxRNyXHF4HzUztK0Q1FITZsthLv2FpcOunsx6K1A== 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=MglBJUqaxruQGh0ZPAoTMXRHGmU/vvywi3A7VAP5PSs=; b=a8LyWlQ7b5l5YMWQ+mVO4gTZVfmswZnk8dwhrndHiv1w9Jfj+yEXBgXkskjqEC9ZPTLmQO2jRxODvLSx5BuNRMwG/Ybz4dt8nxC1aSiH4pjul0+Wp8ruD7BRZVfAick/pc2P8fjtLFTHTzfDhY5UV2TmOfO5DwkczKZ5wpC8wrshSbF1cF3rwgnhNgbwzCSl/ChjyQit3S9z3v1wvfAxOG81HHIPysc7cb3GIn8Ug/jfa5YbSg5tO7t9rFSwpc28YNPs8VUbEOyfh3bS2ZX/FFoYQDnZ9r+bLgrO+vsPftnl6YTl/Ut/F9Pxql+YX/4eFtIwN4oJCcMcSrJ1sUzYTw== 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=MglBJUqaxruQGh0ZPAoTMXRHGmU/vvywi3A7VAP5PSs=; b=AYvFnJ01aisg6qfB2kK4t8dkZbResiDHJeufwymQ5nW28Pf3bavIUPot4yfvKKh0dg7QFzJl1kUDk8MXTCxc8BWeBZKqLT7SyqGTLW9tchU4+1s7BDGTNWZnOMe19TParI2HSo0hGvd2yajZfhbbaSUNfToQQKyoKb9crKFvje0= 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 DB9PR04MB8233.eurprd04.prod.outlook.com (2603:10a6:10:24b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.14; Thu, 4 Jan 2024 17:48:11 +0000 Received: from AS8PR04MB8963.eurprd04.prod.outlook.com ([fe80::daf2:8c54:d469:793d]) by AS8PR04MB8963.eurprd04.prod.outlook.com ([fe80::daf2:8c54:d469:793d%6]) with mapi id 15.20.7159.013; Thu, 4 Jan 2024 17:48:11 +0000 From: Josua Mayer Date: Thu, 04 Jan 2024 18:48:09 +0100 Subject: [PATCH v5 08/10] arm: dts: marvell: clearfog-gtr: add missing pinctrl for all used gpios Message-Id: <20240104-support-clearfog-gtr-l8-sfp-v5-8-52be60fc54e3@solid-run.com> References: <20240104-support-clearfog-gtr-l8-sfp-v5-0-52be60fc54e3@solid-run.com> In-Reply-To: <20240104-support-clearfog-gtr-l8-sfp-v5-0-52be60fc54e3@solid-run.com> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Russell King Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Josua Mayer X-Mailer: b4 0.12.4 X-ClientProxiedBy: FR4P281CA0409.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d0::9) To AS8PR04MB8963.eurprd04.prod.outlook.com (2603:10a6:20b:42e::18) Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8963:EE_|DB9PR04MB8233:EE_ X-MS-Office365-Filtering-Correlation-Id: 51ff7296-73d4-4ac4-4dcb-08dc0d4d50c6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bfvOlgXPJlPGKQE3heC7WdI3RsxeFP31xDmpV57Asqyz5wSoeJJ6myHadAwahoXKGnydH+Rc9+sjnW23iXkTsRVYEE72JONenO2FX/ClOPybPSq2EJuH8c95dcUyKXyy4gv8u4woUKbuXbEtlvaNiBZVf3xAFiVwLe81Ah1F/rHVD4tN6D8MmU/pFSPPMsBrwhQBC12sOYCTfznmLjUWgwEhCXRb5g9X6u+gjfwqWbWSNvxvpS7EK3x4XV2+VKavAgYHu5lSpjwnkcdZE/1j/afEuNgJGTm0pVIcxQu7y8Oi9Bx6o2lODxJV+n+gNcZUSUQrZ/9SJVB/FCrvh2q7gVmpDeFXLlmPiVcOToorl8Ry41XtHaldg96xRapexnAmUMOR46asPG3toLRysDuAALX9y3VVT0QOHrWg3WjY+jXAG6vXev57QQk/0tG0LppCKibjgjUCknxYTnBDh7a9YWr/NAYKXDi89HPoze7aLV0EsAgJxzQwxo+XRrvjTIbNB/8gtaF88hBEpOrm8omOT4sW+WL565g2s0aG/bqJkhfLhB5i0XwLRclspaywp8ZXZ05BBBj9d6kTBcs3yK6k8Je87cyo+X4D0TCGpgwaS6qH/WHcHDzS0H6NJBeWjZfx 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)(376002)(346002)(366004)(396003)(39840400004)(230922051799003)(186009)(64100799003)(451199024)(1800799012)(38100700002)(38350700005)(36756003)(86362001)(26005)(4326008)(107886003)(6512007)(6506007)(66476007)(66946007)(66556008)(8676002)(478600001)(8936002)(6486002)(52116002)(316002)(110136005)(2616005)(83380400001)(41300700001)(5660300002)(7416002)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?hIfDbRkB5vIaieLqP8hH9gCKTFZW?= =?utf-8?q?5lhliEnHVhx7x6nqWRa1Jf/Q3tf419NEcxJ4mYa4TGPGM4eMuvdipmpSr97jtWM9q?= =?utf-8?q?Q/47TaM6WddwgwB+eP3kC5ZFeUPiQRrpOut9i5Xi/7LaHLthhiCUSrBmJYfGWAtTK?= =?utf-8?q?HRMKz8VUBfJXS8B5w6JUzDdo66JF+zygrD4FumUium+SUHNhQ1dC8NaDqJQIWw9/t?= =?utf-8?q?P2TrIMoeaqEyihjRZXRaYTtFmViu3vczjr3hQcABeHbG5GLomwtgYYtW5QWC4L8iK?= =?utf-8?q?pYDO0OsEVbFGfBsyt9FEU/7kXj0Dyd2/Pt0q3NQCSD/g+4u3Cwfae7NIh4WdZaXbg?= =?utf-8?q?LsBhsq1jFUV/i8bWwJUWCxxJd1dWNTTi1LjjOiTtqz2h8BtQcXxMUz7z1d9M338AR?= =?utf-8?q?xpJYA8o6G1z05qL5q1sPhnn44NKrQiHDZZYgqn99yefbP+6kTaMarVGee2RGwf8Fa?= =?utf-8?q?+lfXaqYamR+UaCAn1KQ03brA/etS+ldSQIm5ug50yiS6jeGbg0Ol5XB1/wDKA7YJa?= =?utf-8?q?pHme5v4VNhTPsxAM+jSCOTe+Im67EWL0mj+++ZgZNxhcouUWvMFy8JD6R/xtV0Q2V?= =?utf-8?q?IE4Pp78GGft7+Otgz8mIeM7N8y0JUVS3gNjSpX/u3i5Qm7Z4ebZ5MSxhYdiuFZvA1?= =?utf-8?q?jR7xXRUWQrpdsEJRLD/W82Ji/LP4rxvAJmxEjBNj+KhfWHUgqgy2YuQ4ubcV1CTh+?= =?utf-8?q?a94JQb5kMZmuKRla08TL0dhIgUfvuigXX/CBTBFiVb8IVb2UTZZB2kkBk47ru2kKq?= =?utf-8?q?UZkKVXjnXD/QnTx8TJbzwYr6bUZTSr0lsfeufcow/FxZrF6C2X1SH3iKqxzkezwV/?= =?utf-8?q?iAsRR4sqOymBXDP3GK92FC76SkyeelWHPpD6wPrbSZNUnLgkXt96iXmzcpJVXnzhO?= =?utf-8?q?VlXAKDKGG9fPj3dVWmYogr//fK9NsBmY/2Edb3PcT92hGaDcwEfFhvNS+wW6wTdc8?= =?utf-8?q?MIGfUXA5HmSe7c0lvEzzLFPuF3pc7/2GLp6Tl/WZzWv4bucluetnPGFFRF/CJqfMy?= =?utf-8?q?BLvrhF5ZdZ2Cn/iAKZp0OqUUNwIMeUxcrSBFiAl32GmPOx4hNz6pgSG2BfZciCkFM?= =?utf-8?q?Cy864yfeAXlMck4AKdoQUfZgcWu1Rdkvq1rBHW0w35qXfeglWo8OXi8ZauUSYeAdX?= =?utf-8?q?Dz8x1NzcDwRN2RSZ91cExo0VsK5VMzwHmiL8YsXoOFn50hpv/X/Z0hyce9+zJRy6Y?= =?utf-8?q?a/DYaKLZ0EOQBi03GP/0mvrZiEAtMft32rTlPHh1OIILBvbuUtyAXHz/jIhJw4plu?= =?utf-8?q?fjo1FL6ZoCJEtc4OfkAd+1fYQsuFC0xsrWdCulgpzdKHqQTCVgDDtTcEmUxzZl3rZ?= =?utf-8?q?HiyF4xBxdzfr2udlTYF2qZWGkq5uVZ8W+Kzw7ebUCZ6RFnY9+vakRL2kwZJIO/6y/?= =?utf-8?q?LeFegbLoCH9kRTSqPKFxcgMUskKO5UlwhA+THA0V+7cdcKYfTSqxw3PcvAHY14p5F?= =?utf-8?q?skAX1bfSxvC3wzAi6cQ8nhkco4PEidIV0J/vrkBB7Z+GgbBQ0V+8ds/gBVQ01vz8/?= =?utf-8?q?gpjJjF7PZnxQ?= X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: 51ff7296-73d4-4ac4-4dcb-08dc0d4d50c6 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8963.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2024 17:48:09.9278 (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: voY3z6H5uJaqWOuSWURuDS4lhTuGHIXh+xt6v4dmagGSOJ4mJBWuo/sub0u1LB8IRnbr4ZeHWALo4Sq8cF+9fQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8233 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 l8 / s4, 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 --- .../boot/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 {