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"; };