From nobody Thu Sep 18 04:24:38 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F223C4332F for ; Fri, 9 Dec 2022 22:05:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229684AbiLIWFR (ORCPT ); Fri, 9 Dec 2022 17:05:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229891AbiLIWFN (ORCPT ); Fri, 9 Dec 2022 17:05:13 -0500 Received: from relay04.th.seeweb.it (relay04.th.seeweb.it [5.144.164.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D4D4A430E for ; Fri, 9 Dec 2022 14:05:06 -0800 (PST) Received: from localhost.localdomain (94-209-172-39.cable.dynamic.v4.ziggo.nl [94.209.172.39]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by m-r1.th.seeweb.it (Postfix) with ESMTPSA id A29092008F; Fri, 9 Dec 2022 23:05:03 +0100 (CET) From: Marijn Suijten To: phone-devel@vger.kernel.org Cc: ~postmarketos/upstreaming@lists.sr.ht, AngeloGioacchino Del Regno , Konrad Dybcio , Martin Botka , Jami Kettunen , Marijn Suijten , Luca Weiss , Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH] arm64: dts: qcom: Use plural _gpios node label for PMIC gpios Date: Fri, 9 Dec 2022 23:04:49 +0100 Message-Id: <20221209220450.1793421-1-marijn.suijten@somainline.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The gpio node in PMIC dts'es define access to multiple GPIOs. Most Qcom PMICs were already using the plural _gpios label to point to this node, but a few PMICs were left behind including the recently-pulled pm(i)8950. Rename it from *_gpio to *_gpios for pm6125, pm6150(l), pm8005, pm(i)8950, and pm(i)8998. Signed-off-by: Marijn Suijten Acked-by: Konrad Dybcio --- This was brought up for discussion in [1] but hasn't seen any relevant reply, unfortunately. [1]: https://lore.kernel.org/linux-arm-msm/20221104234435.xwjpwfxs73puvfca@= SoMainline.org/ --- arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts | 8 ++++---- .../dts/qcom/msm8998-oneplus-cheeseburger.dts | 4 ++-- .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 6 +++--- .../qcom/msm8998-sony-xperia-yoshino-maple.dts | 4 ++-- .../dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 16 ++++++++-------- .../arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts | 4 ++-- arch/arm64/boot/dts/qcom/pm6125.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/pm6150.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/pm6150l.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/pm8005.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/pm8950.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/pm8998.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/pmi8950.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/pmi8998.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/sc7180-idp.dts | 4 ++-- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 16 ++++++++-------- arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 4 ++-- .../boot/dts/qcom/sdm845-oneplus-common.dtsi | 6 +++--- .../arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 4 ++-- .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 2 +- .../dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 4 ++-- .../boot/dts/qcom/sdm845-xiaomi-polaris.dts | 4 ++-- .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 2 +- 25 files changed, 64 insertions(+), 64 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts b/arch/arm64/b= oot/dts/qcom/msm8998-fxtec-pro1.dts index 310f7a2df1e8..0e273938b59d 100644 --- a/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts +++ b/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts @@ -113,7 +113,7 @@ gpio-keys { <&cam_snapshot_pin_a>; button-vol-up { label =3D "Volume Up"; - gpios =3D <&pm8998_gpio 6 GPIO_ACTIVE_LOW>; + gpios =3D <&pm8998_gpios 6 GPIO_ACTIVE_LOW>; linux,input-type =3D ; linux,code =3D ; gpio-key,wakeup; @@ -122,7 +122,7 @@ button-vol-up { =20 button-camera-snapshot { label =3D "Camera Snapshot"; - gpios =3D <&pm8998_gpio 7 GPIO_ACTIVE_LOW>; + gpios =3D <&pm8998_gpios 7 GPIO_ACTIVE_LOW>; linux,input-type =3D ; linux,code =3D ; debounce-interval =3D <15>; @@ -130,7 +130,7 @@ button-camera-snapshot { =20 button-camera-focus { label =3D "Camera Focus"; - gpios =3D <&pm8998_gpio 8 GPIO_ACTIVE_LOW>; + gpios =3D <&pm8998_gpios 8 GPIO_ACTIVE_LOW>; linux,input-type =3D ; linux,code =3D ; debounce-interval =3D <15>; @@ -338,7 +338,7 @@ pm8005_s1: s1 { /* VDD_GFX supply */ }; }; =20 -&pm8998_gpio { +&pm8998_gpios { vol_up_pin_a: vol-up-active-state { pins =3D "gpio6"; function =3D "normal"; diff --git a/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts b/ar= ch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts index 9fb1fb9b8529..d36b36af49d0 100644 --- a/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts +++ b/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts @@ -23,7 +23,7 @@ leds { pinctrl-0 =3D <&button_backlight_default>; =20 led-keypad-backlight { - gpios =3D <&pmi8998_gpio 5 GPIO_ACTIVE_HIGH>; + gpios =3D <&pmi8998_gpios 5 GPIO_ACTIVE_HIGH>; color =3D ; function =3D LED_FUNCTION_KBD_BACKLIGHT; default-state =3D "off"; @@ -31,7 +31,7 @@ led-keypad-backlight { }; }; =20 -&pmi8998_gpio { +&pmi8998_gpios { button_backlight_default: button-backlight-state { pins =3D "gpio5"; function =3D "gpio"; diff --git a/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi b/arch/ar= m64/boot/dts/qcom/msm8998-oneplus-common.dtsi index 7d4a67d07501..ce03c7c239e5 100644 --- a/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi @@ -92,7 +92,7 @@ gpio-keys { =20 button-vol-down { label =3D "Volume down"; - gpios =3D <&pm8998_gpio 5 GPIO_ACTIVE_LOW>; + gpios =3D <&pm8998_gpios 5 GPIO_ACTIVE_LOW>; linux,code =3D ; debounce-interval =3D <15>; wakeup-source; @@ -100,7 +100,7 @@ button-vol-down { =20 button-vol-up { label =3D "Volume up"; - gpios =3D <&pm8998_gpio 6 GPIO_ACTIVE_LOW>; + gpios =3D <&pm8998_gpios 6 GPIO_ACTIVE_LOW>; linux,code =3D ; debounce-interval =3D <15>; wakeup-source; @@ -269,7 +269,7 @@ pm8005_s1: s1 { }; }; =20 -&pm8998_gpio { +&pm8998_gpios { vol_keys_default: vol-keys-state { pins =3D "gpio5", "gpio6"; function =3D "normal"; diff --git a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts= b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts index 20fe0394a3c1..1868ad649415 100644 --- a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts +++ b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts @@ -20,7 +20,7 @@ disp_dvdd_vreg: disp-dvdd-vreg { regulator-max-microvolt =3D <1350000>; startup-delay-us =3D <0>; enable-active-high; - gpio =3D <&pmi8998_gpio 10 GPIO_ACTIVE_HIGH>; + gpio =3D <&pmi8998_gpios 10 GPIO_ACTIVE_HIGH>; pinctrl-names =3D "default"; pinctrl-0 =3D <&disp_dvdd_en>; }; @@ -37,7 +37,7 @@ &lab { qcom,soft-start-us =3D <200>; }; =20 -&pmi8998_gpio { +&pmi8998_gpios { disp_dvdd_en: disp-dvdd-en-active-state { pins =3D "gpio10"; function =3D "normal"; diff --git a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi b/ar= ch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi index 5da87baa2b23..1f64b70260fe 100644 --- a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi @@ -25,7 +25,7 @@ div1_mclk: divclk1 { pinctrl-names =3D "default"; clocks =3D <&rpmcc RPM_SMD_DIV_CLK1>; #clock-cells =3D <0>; - enable-gpios =3D <&pm8998_gpio 13 GPIO_ACTIVE_HIGH>; + enable-gpios =3D <&pm8998_gpios 13 GPIO_ACTIVE_HIGH>; }; }; =20 @@ -65,7 +65,7 @@ cam_vio_vreg: cam-vio-vreg { regulator-name =3D "cam_vio_vreg"; startup-delay-us =3D <0>; enable-active-high; - gpio =3D <&pmi8998_gpio 1 GPIO_ACTIVE_HIGH>; + gpio =3D <&pmi8998_gpios 1 GPIO_ACTIVE_HIGH>; pinctrl-names =3D "default"; pinctrl-0 =3D <&cam_vio_default>; vin-supply =3D <&vreg_lvs1a_1p8>; @@ -103,7 +103,7 @@ gpio-keys { <&cam_snapshot_pin_a>; button-vol-down { label =3D "Volume Down"; - gpios =3D <&pm8998_gpio 5 GPIO_ACTIVE_LOW>; + gpios =3D <&pm8998_gpios 5 GPIO_ACTIVE_LOW>; linux,input-type =3D ; linux,code =3D ; gpio-key,wakeup; @@ -112,7 +112,7 @@ button-vol-down { =20 button-camera-snapshot { label =3D "Camera Snapshot"; - gpios =3D <&pm8998_gpio 7 GPIO_ACTIVE_LOW>; + gpios =3D <&pm8998_gpios 7 GPIO_ACTIVE_LOW>; linux,input-type =3D ; linux,code =3D ; debounce-interval =3D <15>; @@ -120,7 +120,7 @@ button-camera-snapshot { =20 button-camera-focus { label =3D "Camera Focus"; - gpios =3D <&pm8998_gpio 8 GPIO_ACTIVE_LOW>; + gpios =3D <&pm8998_gpios 8 GPIO_ACTIVE_LOW>; linux,input-type =3D ; linux,code =3D ; debounce-interval =3D <15>; @@ -187,7 +187,7 @@ ramoops@ffc00000 { =20 vibrator { compatible =3D "gpio-vibrator"; - enable-gpios =3D <&pmi8998_gpio 5 GPIO_ACTIVE_HIGH>; + enable-gpios =3D <&pmi8998_gpios 5 GPIO_ACTIVE_HIGH>; pinctrl-names =3D "default"; pinctrl-0 =3D <&vib_default>; }; @@ -303,7 +303,7 @@ pm8005_s1: s1 { }; }; =20 -&pm8998_gpio { +&pm8998_gpios { vol_down_pin_a: vol-down-active-state { pins =3D "gpio5"; function =3D PMIC_GPIO_FUNC_NORMAL; @@ -335,7 +335,7 @@ audio_mclk_pin: audio-mclk-pin-active-state { }; }; =20 -&pmi8998_gpio { +&pmi8998_gpios { cam_vio_default: cam-vio-active-state { pins =3D "gpio1"; function =3D PMIC_GPIO_FUNC_NORMAL; diff --git a/arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts b/arch/arm64= /boot/dts/qcom/msm8998-xiaomi-sagit.dts index b1aac7311ef9..7956b151c7a4 100644 --- a/arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts +++ b/arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts @@ -133,7 +133,7 @@ gpio-keys { =20 key-vol-up { label =3D "Volume up"; - gpios =3D <&pm8998_gpio 6 GPIO_ACTIVE_LOW>; + gpios =3D <&pm8998_gpios 6 GPIO_ACTIVE_LOW>; linux,code =3D ; debounce-interval =3D <15>; wakeup-source; @@ -278,7 +278,7 @@ pm8005_s1: s1 { /* VDD_GFX supply */ }; }; =20 -&pm8998_gpio { +&pm8998_gpios { vol_up_key_default: vol-up-key-default-state { pins =3D "gpio6"; function =3D "normal"; diff --git a/arch/arm64/boot/dts/qcom/pm6125.dtsi b/arch/arm64/boot/dts/qco= m/pm6125.dtsi index 1c8ccda26ffb..59092a551a16 100644 --- a/arch/arm64/boot/dts/qcom/pm6125.dtsi +++ b/arch/arm64/boot/dts/qcom/pm6125.dtsi @@ -136,11 +136,11 @@ pm6125_rtc: rtc@6000 { status =3D "disabled"; }; =20 - pm6125_gpio: gpio@c000 { + pm6125_gpios: gpio@c000 { compatible =3D "qcom,pm6125-gpio", "qcom,spmi-gpio"; reg =3D <0xc000>; gpio-controller; - gpio-ranges =3D <&pm6125_gpio 0 0 9>; + gpio-ranges =3D <&pm6125_gpios 0 0 9>; #gpio-cells =3D <2>; interrupt-controller; #interrupt-cells =3D <2>; diff --git a/arch/arm64/boot/dts/qcom/pm6150.dtsi b/arch/arm64/boot/dts/qco= m/pm6150.dtsi index 3d91fb405ca2..2e6afa296141 100644 --- a/arch/arm64/boot/dts/qcom/pm6150.dtsi +++ b/arch/arm64/boot/dts/qcom/pm6150.dtsi @@ -88,11 +88,11 @@ pm6150_adc_tm: adc-tm@3500 { status =3D "disabled"; }; =20 - pm6150_gpio: gpio@c000 { + pm6150_gpios: gpio@c000 { compatible =3D "qcom,pm6150-gpio", "qcom,spmi-gpio"; reg =3D <0xc000>; gpio-controller; - gpio-ranges =3D <&pm6150_gpio 0 0 10>; + gpio-ranges =3D <&pm6150_gpios 0 0 10>; #gpio-cells =3D <2>; interrupt-controller; #interrupt-cells =3D <2>; diff --git a/arch/arm64/boot/dts/qcom/pm6150l.dtsi b/arch/arm64/boot/dts/qc= om/pm6150l.dtsi index 90aac61ad264..2479625ed08a 100644 --- a/arch/arm64/boot/dts/qcom/pm6150l.dtsi +++ b/arch/arm64/boot/dts/qcom/pm6150l.dtsi @@ -95,11 +95,11 @@ pm6150l_adc_tm: adc-tm@3500 { status =3D "disabled"; }; =20 - pm6150l_gpio: gpio@c000 { + pm6150l_gpios: gpio@c000 { compatible =3D "qcom,pm6150l-gpio", "qcom,spmi-gpio"; reg =3D <0xc000>; gpio-controller; - gpio-ranges =3D <&pm6150l_gpio 0 0 12>; + gpio-ranges =3D <&pm6150l_gpios 0 0 12>; #gpio-cells =3D <2>; interrupt-controller; #interrupt-cells =3D <2>; diff --git a/arch/arm64/boot/dts/qcom/pm8005.dtsi b/arch/arm64/boot/dts/qco= m/pm8005.dtsi index 8d4b081b4e9d..0f0ab2da8305 100644 --- a/arch/arm64/boot/dts/qcom/pm8005.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8005.dtsi @@ -11,11 +11,11 @@ pm8005_lsid0: pmic@4 { #address-cells =3D <1>; #size-cells =3D <0>; =20 - pm8005_gpio: gpio@c000 { + pm8005_gpios: gpio@c000 { compatible =3D "qcom,pm8005-gpio", "qcom,spmi-gpio"; reg =3D <0xc000>; gpio-controller; - gpio-ranges =3D <&pm8005_gpio 0 0 4>; + gpio-ranges =3D <&pm8005_gpios 0 0 4>; #gpio-cells =3D <2>; interrupt-controller; #interrupt-cells =3D <2>; diff --git a/arch/arm64/boot/dts/qcom/pm8950.dtsi b/arch/arm64/boot/dts/qco= m/pm8950.dtsi index 07c3896bd36f..631761f98999 100644 --- a/arch/arm64/boot/dts/qcom/pm8950.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8950.dtsi @@ -141,11 +141,11 @@ pm8950_mpps: mpps@a000 { #interrupt-cells =3D <2>; }; =20 - pm8950_gpio: gpio@c000 { + pm8950_gpios: gpio@c000 { compatible =3D "qcom,pm8950-gpio", "qcom,spmi-gpio"; reg =3D <0xc000>; gpio-controller; - gpio-ranges =3D <&pm8950_gpio 0 0 8>; + gpio-ranges =3D <&pm8950_gpios 0 0 8>; #gpio-cells =3D <2>; interrupt-controller; #interrupt-cells =3D <2>; diff --git a/arch/arm64/boot/dts/qcom/pm8998.dtsi b/arch/arm64/boot/dts/qco= m/pm8998.dtsi index 6a5854333b2b..adbba9f4089a 100644 --- a/arch/arm64/boot/dts/qcom/pm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8998.dtsi @@ -109,11 +109,11 @@ rtc@6000 { interrupts =3D <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>; }; =20 - pm8998_gpio: gpio@c000 { + pm8998_gpios: gpio@c000 { compatible =3D "qcom,pm8998-gpio", "qcom,spmi-gpio"; reg =3D <0xc000>; gpio-controller; - gpio-ranges =3D <&pm8998_gpio 0 0 26>; + gpio-ranges =3D <&pm8998_gpios 0 0 26>; #gpio-cells =3D <2>; interrupt-controller; #interrupt-cells =3D <2>; diff --git a/arch/arm64/boot/dts/qcom/pmi8950.dtsi b/arch/arm64/boot/dts/qc= om/pmi8950.dtsi index 8008f02434a9..4891be3cd68a 100644 --- a/arch/arm64/boot/dts/qcom/pmi8950.dtsi +++ b/arch/arm64/boot/dts/qcom/pmi8950.dtsi @@ -67,11 +67,11 @@ pmi8950_mpps: mpps@a000 { #interrupt-cells =3D <2>; }; =20 - pmi8950_gpio: gpio@c000 { + pmi8950_gpios: gpio@c000 { compatible =3D "qcom,pmi8950-gpio", "qcom,spmi-gpio"; reg =3D <0xc000>; gpio-controller; - gpio-ranges =3D <&pmi8950_gpio 0 0 2>; + gpio-ranges =3D <&pmi8950_gpios 0 0 2>; #gpio-cells =3D <2>; interrupt-controller; #interrupt-cells =3D <2>; diff --git a/arch/arm64/boot/dts/qcom/pmi8998.dtsi b/arch/arm64/boot/dts/qc= om/pmi8998.dtsi index cd1caeae8281..ffe587f281d8 100644 --- a/arch/arm64/boot/dts/qcom/pmi8998.dtsi +++ b/arch/arm64/boot/dts/qcom/pmi8998.dtsi @@ -9,11 +9,11 @@ pmi8998_lsid0: pmic@2 { #address-cells =3D <1>; #size-cells =3D <0>; =20 - pmi8998_gpio: gpio@c000 { + pmi8998_gpios: gpio@c000 { compatible =3D "qcom,pmi8998-gpio", "qcom,spmi-gpio"; reg =3D <0xc000>; gpio-controller; - gpio-ranges =3D <&pmi8998_gpio 0 0 14>; + gpio-ranges =3D <&pmi8998_gpios 0 0 14>; #gpio-cells =3D <2>; interrupt-controller; #interrupt-cells =3D <2>; diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/= qcom/sc7180-idp.dts index 70fd9ff8dfa2..7c2ff02eb869 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts @@ -304,7 +304,7 @@ panel@0 { pinctrl-names =3D "default"; pinctrl-0 =3D <&disp_pins>; =20 - reset-gpios =3D <&pm6150l_gpio 3 GPIO_ACTIVE_HIGH>; + reset-gpios =3D <&pm6150l_gpios 3 GPIO_ACTIVE_HIGH>; =20 ports { #address-cells =3D <1>; @@ -467,7 +467,7 @@ wifi-firmware { =20 /* PINCTRL - additions to nodes defined in sc7180.dtsi */ =20 -&pm6150l_gpio { +&pm6150l_gpios { disp_pins: disp-state { pinconf { pins =3D "gpio3"; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot= /dts/qcom/sc7180-trogdor.dtsi index f1defb94d670..b82956f8f1cf 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -1141,11 +1141,11 @@ &sec_mi2s_active { =20 /* PINCTRL - board-specific pinctrl */ =20 -&pm6150_gpio { +&pm6150_gpios { status =3D "disabled"; /* No GPIOs are connected */ }; =20 -&pm6150l_gpio { +&pm6150l_gpios { gpio-line-names =3D "AP_SUSPEND", "", "", diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/d= ts/qcom/sdm845-cheza.dtsi index ca676e04687b..ab9bf5282910 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi @@ -1096,7 +1096,7 @@ pinconf-rx { }; =20 /* PINCTRL - board-specific pinctrl */ -&pm8005_gpio { +&pm8005_gpios { gpio-line-names =3D "", "", "SLB", @@ -1130,7 +1130,7 @@ adc-chan@51 { }; }; =20 -&pm8998_gpio { +&pm8998_gpios { gpio-line-names =3D "", "", "SW_CTRL", diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/d= ts/qcom/sdm845-db845c.dts index f41c6d600ea8..7c3efe3cbf5b 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -54,7 +54,7 @@ gpio-keys { key-vol-up { label =3D "Volume Up"; linux,code =3D ; - gpios =3D <&pm8998_gpio 6 GPIO_ACTIVE_LOW>; + gpios =3D <&pm8998_gpios 6 GPIO_ACTIVE_LOW>; }; }; =20 @@ -65,7 +65,7 @@ led-0 { label =3D "green:user4"; function =3D LED_FUNCTION_INDICATOR; color =3D ; - gpios =3D <&pm8998_gpio 13 GPIO_ACTIVE_HIGH>; + gpios =3D <&pm8998_gpios 13 GPIO_ACTIVE_HIGH>; linux,default-trigger =3D "panic-indicator"; default-state =3D "off"; }; @@ -74,7 +74,7 @@ led-1 { label =3D "yellow:wlan"; function =3D LED_FUNCTION_WLAN; color =3D ; - gpios =3D <&pm8998_gpio 9 GPIO_ACTIVE_HIGH>; + gpios =3D <&pm8998_gpios 9 GPIO_ACTIVE_HIGH>; linux,default-trigger =3D "phy0tx"; default-state =3D "off"; }; @@ -83,7 +83,7 @@ led-2 { label =3D "blue:bt"; function =3D LED_FUNCTION_BLUETOOTH; color =3D ; - gpios =3D <&pm8998_gpio 5 GPIO_ACTIVE_HIGH>; + gpios =3D <&pm8998_gpios 5 GPIO_ACTIVE_HIGH>; linux,default-trigger =3D "bluetooth-power"; default-state =3D "off"; }; @@ -148,7 +148,7 @@ cam0_dvdd_1v2: reg_cam0_dvdd_1v2 { regulator-min-microvolt =3D <1200000>; regulator-max-microvolt =3D <1200000>; enable-active-high; - gpio =3D <&pm8998_gpio 12 GPIO_ACTIVE_HIGH>; + gpio =3D <&pm8998_gpios 12 GPIO_ACTIVE_HIGH>; pinctrl-names =3D "default"; pinctrl-0 =3D <&cam0_dvdd_1v2_en_default>; vin-supply =3D <&vbat>; @@ -160,7 +160,7 @@ cam0_avdd_2v8: reg_cam0_avdd_2v8 { regulator-min-microvolt =3D <2800000>; regulator-max-microvolt =3D <2800000>; enable-active-high; - gpio =3D <&pm8998_gpio 10 GPIO_ACTIVE_HIGH>; + gpio =3D <&pm8998_gpios 10 GPIO_ACTIVE_HIGH>; pinctrl-names =3D "default"; pinctrl-0 =3D <&cam0_avdd_2v8_en_default>; vin-supply =3D <&vbat>; @@ -559,7 +559,7 @@ &pcie1_phy { vdda-pll-supply =3D <&vreg_l26a_1p2>; }; =20 -&pm8998_gpio { +&pm8998_gpios { gpio-line-names =3D "NC", "NC", @@ -1170,7 +1170,7 @@ pinconf-rx { }; }; =20 -&pm8998_gpio { +&pm8998_gpios { =20 }; =20 diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/bo= ot/dts/qcom/sdm845-lg-common.dtsi index 1eb423e4be24..f54d3302fb8a 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi @@ -132,7 +132,7 @@ gpio-keys { key-vol-up { label =3D "Volume up"; linux,code =3D ; - gpios =3D <&pm8998_gpio 6 GPIO_ACTIVE_LOW>; + gpios =3D <&pm8998_gpios 6 GPIO_ACTIVE_LOW>; }; }; =20 @@ -603,7 +603,7 @@ pinconf { }; }; =20 -&pm8998_gpio { +&pm8998_gpios { vol_up_pin_a: vol-up-active-state { pins =3D "gpio6"; function =3D "normal"; diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm= 64/boot/dts/qcom/sdm845-oneplus-common.dtsi index 42cf4dd5ea28..f5751f3244cb 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi @@ -37,14 +37,14 @@ gpio-keys { key-vol-down { label =3D "Volume down"; linux,code =3D ; - gpios =3D <&pm8998_gpio 5 GPIO_ACTIVE_LOW>; + gpios =3D <&pm8998_gpios 5 GPIO_ACTIVE_LOW>; debounce-interval =3D <15>; }; =20 key-vol-up { label =3D "Volume up"; linux,code =3D ; - gpios =3D <&pm8998_gpio 6 GPIO_ACTIVE_LOW>; + gpios =3D <&pm8998_gpios 6 GPIO_ACTIVE_LOW>; debounce-interval =3D <15>; }; }; @@ -440,7 +440,7 @@ &mss_pil { firmware-name =3D "qcom/sdm845/oneplus6/mba.mbn", "qcom/sdm845/oneplus6/m= odem.mbn"; }; =20 -&pm8998_gpio { +&pm8998_gpios { volume_down_gpio: pm8998-gpio5-state { pinconf { pins =3D "gpio5"; diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64= /boot/dts/qcom/sdm845-shift-axolotl.dts index bb77ccfdc68c..1934662c2bde 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts @@ -54,7 +54,7 @@ gpio-keys { key-vol-up { label =3D "volume_up"; linux,code =3D ; - gpios =3D <&pm8998_gpio 6 GPIO_ACTIVE_LOW>; + gpios =3D <&pm8998_gpios 6 GPIO_ACTIVE_LOW>; debounce-interval =3D <15>; }; }; @@ -510,7 +510,7 @@ &mss_pil { firmware-name =3D "qcom/sdm845/axolotl/mba.mbn", "qcom/sdm845/axolotl/mod= em.mbn"; }; =20 -&pm8998_gpio { +&pm8998_gpios { volume_up_gpio: pm8998-gpio6-state { pinconf { pins =3D "gpio6"; diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/a= rm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi index 87dd0fc36747..df92e8d7bf30 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi @@ -21,7 +21,7 @@ gpio-keys { =20 key-vol-down { label =3D "volume_down"; - gpios =3D <&pm8998_gpio 5 GPIO_ACTIVE_LOW>; + gpios =3D <&pm8998_gpios 5 GPIO_ACTIVE_LOW>; linux,code =3D ; debounce-interval =3D <15>; gpio-key,wakeup; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b= /arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi index eb6b2b676eca..ba5a37cb3c9e 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi @@ -46,7 +46,7 @@ gpio-keys { key-vol-up { label =3D "Volume Up"; linux,code =3D ; - gpios =3D <&pm8998_gpio 6 GPIO_ACTIVE_LOW>; + gpios =3D <&pm8998_gpios 6 GPIO_ACTIVE_LOW>; }; }; =20 @@ -304,7 +304,7 @@ &ipa { firmware-name =3D "qcom/sdm845/beryllium/ipa_fws.mbn"; }; =20 -&pm8998_gpio { +&pm8998_gpios { vol_up_pin_a: vol-up-active-state { pins =3D "gpio6"; function =3D "normal"; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm6= 4/boot/dts/qcom/sdm845-xiaomi-polaris.dts index 38ba809a95cd..46346f7146ed 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts @@ -55,7 +55,7 @@ gpio-keys { key-vol-up { label =3D "Volume Up"; linux,code =3D ; - gpios =3D <&pm8998_gpio 6 GPIO_ACTIVE_LOW>; + gpios =3D <&pm8998_gpios 6 GPIO_ACTIVE_LOW>; debounce-interval =3D <15>; }; }; @@ -518,7 +518,7 @@ &pmi8998_wled { status =3D "okay"; }; =20 -&pm8998_gpio { +&pm8998_gpios { volume_up_gpio: pm8998-gpio6-state { pinconf { qcom,drive-strength =3D ; diff --git a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts b= /arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts index 0de6c5b7f742..650819c028b6 100644 --- a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts +++ b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts @@ -217,7 +217,7 @@ rf-pa1-therm@3 { }; }; =20 -&pm6125_gpio { +&pm6125_gpios { camera_flash_therm: camera-flash-therm-state { pins =3D "gpio3"; function =3D PMIC_GPIO_FUNC_NORMAL; --=20 2.38.1