Commit ea25d61b authored by Marijn Suijten's avatar Marijn Suijten Committed by Bjorn Andersson

arm64: dts: qcom: Use plural _gpios node label for PMIC gpios

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: default avatarMarijn Suijten <marijn.suijten@somainline.org>
Acked-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221209220450.1793421-1-marijn.suijten@somainline.org
parent 3c3d2cb2
......@@ -113,7 +113,7 @@ gpio-keys {
<&cam_snapshot_pin_a>;
button-vol-up {
label = "Volume Up";
gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
linux,input-type = <EV_KEY>;
linux,code = <KEY_VOLUMEUP>;
gpio-key,wakeup;
......@@ -122,7 +122,7 @@ button-vol-up {
button-camera-snapshot {
label = "Camera Snapshot";
gpios = <&pm8998_gpio 7 GPIO_ACTIVE_LOW>;
gpios = <&pm8998_gpios 7 GPIO_ACTIVE_LOW>;
linux,input-type = <EV_KEY>;
linux,code = <KEY_CAMERA>;
debounce-interval = <15>;
......@@ -130,7 +130,7 @@ button-camera-snapshot {
button-camera-focus {
label = "Camera Focus";
gpios = <&pm8998_gpio 8 GPIO_ACTIVE_LOW>;
gpios = <&pm8998_gpios 8 GPIO_ACTIVE_LOW>;
linux,input-type = <EV_KEY>;
linux,code = <KEY_CAMERA_FOCUS>;
debounce-interval = <15>;
......@@ -338,7 +338,7 @@ pm8005_s1: s1 { /* VDD_GFX supply */
};
};
&pm8998_gpio {
&pm8998_gpios {
vol_up_pin_a: vol-up-active-state {
pins = "gpio6";
function = "normal";
......
......@@ -23,7 +23,7 @@ leds {
pinctrl-0 = <&button_backlight_default>;
led-keypad-backlight {
gpios = <&pmi8998_gpio 5 GPIO_ACTIVE_HIGH>;
gpios = <&pmi8998_gpios 5 GPIO_ACTIVE_HIGH>;
color = <LED_COLOR_ID_WHITE>;
function = LED_FUNCTION_KBD_BACKLIGHT;
default-state = "off";
......@@ -31,7 +31,7 @@ led-keypad-backlight {
};
};
&pmi8998_gpio {
&pmi8998_gpios {
button_backlight_default: button-backlight-state {
pins = "gpio5";
function = "gpio";
......
......@@ -92,7 +92,7 @@ gpio-keys {
button-vol-down {
label = "Volume down";
gpios = <&pm8998_gpio 5 GPIO_ACTIVE_LOW>;
gpios = <&pm8998_gpios 5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;
debounce-interval = <15>;
wakeup-source;
......@@ -100,7 +100,7 @@ button-vol-down {
button-vol-up {
label = "Volume up";
gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
debounce-interval = <15>;
wakeup-source;
......@@ -269,7 +269,7 @@ pm8005_s1: s1 {
};
};
&pm8998_gpio {
&pm8998_gpios {
vol_keys_default: vol-keys-state {
pins = "gpio5", "gpio6";
function = "normal";
......
......@@ -20,7 +20,7 @@ disp_dvdd_vreg: disp-dvdd-vreg {
regulator-max-microvolt = <1350000>;
startup-delay-us = <0>;
enable-active-high;
gpio = <&pmi8998_gpio 10 GPIO_ACTIVE_HIGH>;
gpio = <&pmi8998_gpios 10 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&disp_dvdd_en>;
};
......@@ -37,7 +37,7 @@ &lab {
qcom,soft-start-us = <200>;
};
&pmi8998_gpio {
&pmi8998_gpios {
disp_dvdd_en: disp-dvdd-en-active-state {
pins = "gpio10";
function = "normal";
......
......@@ -25,7 +25,7 @@ div1_mclk: divclk1 {
pinctrl-names = "default";
clocks = <&rpmcc RPM_SMD_DIV_CLK1>;
#clock-cells = <0>;
enable-gpios = <&pm8998_gpio 13 GPIO_ACTIVE_HIGH>;
enable-gpios = <&pm8998_gpios 13 GPIO_ACTIVE_HIGH>;
};
};
......@@ -65,7 +65,7 @@ cam_vio_vreg: cam-vio-vreg {
regulator-name = "cam_vio_vreg";
startup-delay-us = <0>;
enable-active-high;
gpio = <&pmi8998_gpio 1 GPIO_ACTIVE_HIGH>;
gpio = <&pmi8998_gpios 1 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&cam_vio_default>;
vin-supply = <&vreg_lvs1a_1p8>;
......@@ -103,7 +103,7 @@ gpio-keys {
<&cam_snapshot_pin_a>;
button-vol-down {
label = "Volume Down";
gpios = <&pm8998_gpio 5 GPIO_ACTIVE_LOW>;
gpios = <&pm8998_gpios 5 GPIO_ACTIVE_LOW>;
linux,input-type = <EV_KEY>;
linux,code = <KEY_VOLUMEDOWN>;
gpio-key,wakeup;
......@@ -112,7 +112,7 @@ button-vol-down {
button-camera-snapshot {
label = "Camera Snapshot";
gpios = <&pm8998_gpio 7 GPIO_ACTIVE_LOW>;
gpios = <&pm8998_gpios 7 GPIO_ACTIVE_LOW>;
linux,input-type = <EV_KEY>;
linux,code = <KEY_CAMERA>;
debounce-interval = <15>;
......@@ -120,7 +120,7 @@ button-camera-snapshot {
button-camera-focus {
label = "Camera Focus";
gpios = <&pm8998_gpio 8 GPIO_ACTIVE_LOW>;
gpios = <&pm8998_gpios 8 GPIO_ACTIVE_LOW>;
linux,input-type = <EV_KEY>;
linux,code = <KEY_CAMERA_FOCUS>;
debounce-interval = <15>;
......@@ -187,7 +187,7 @@ ramoops@ffc00000 {
vibrator {
compatible = "gpio-vibrator";
enable-gpios = <&pmi8998_gpio 5 GPIO_ACTIVE_HIGH>;
enable-gpios = <&pmi8998_gpios 5 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&vib_default>;
};
......@@ -303,7 +303,7 @@ pm8005_s1: s1 {
};
};
&pm8998_gpio {
&pm8998_gpios {
vol_down_pin_a: vol-down-active-state {
pins = "gpio5";
function = PMIC_GPIO_FUNC_NORMAL;
......@@ -335,7 +335,7 @@ audio_mclk_pin: audio-mclk-pin-active-state {
};
};
&pmi8998_gpio {
&pmi8998_gpios {
cam_vio_default: cam-vio-active-state {
pins = "gpio1";
function = PMIC_GPIO_FUNC_NORMAL;
......
......@@ -133,7 +133,7 @@ gpio-keys {
key-vol-up {
label = "Volume up";
gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
debounce-interval = <15>;
wakeup-source;
......@@ -278,7 +278,7 @@ pm8005_s1: s1 { /* VDD_GFX supply */
};
};
&pm8998_gpio {
&pm8998_gpios {
vol_up_key_default: vol-up-key-default-state {
pins = "gpio6";
function = "normal";
......
......@@ -136,11 +136,11 @@ pm6125_rtc: rtc@6000 {
status = "disabled";
};
pm6125_gpio: gpio@c000 {
pm6125_gpios: gpio@c000 {
compatible = "qcom,pm6125-gpio", "qcom,spmi-gpio";
reg = <0xc000>;
gpio-controller;
gpio-ranges = <&pm6125_gpio 0 0 9>;
gpio-ranges = <&pm6125_gpios 0 0 9>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
......
......@@ -88,11 +88,11 @@ pm6150_adc_tm: adc-tm@3500 {
status = "disabled";
};
pm6150_gpio: gpio@c000 {
pm6150_gpios: gpio@c000 {
compatible = "qcom,pm6150-gpio", "qcom,spmi-gpio";
reg = <0xc000>;
gpio-controller;
gpio-ranges = <&pm6150_gpio 0 0 10>;
gpio-ranges = <&pm6150_gpios 0 0 10>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
......
......@@ -95,11 +95,11 @@ pm6150l_adc_tm: adc-tm@3500 {
status = "disabled";
};
pm6150l_gpio: gpio@c000 {
pm6150l_gpios: gpio@c000 {
compatible = "qcom,pm6150l-gpio", "qcom,spmi-gpio";
reg = <0xc000>;
gpio-controller;
gpio-ranges = <&pm6150l_gpio 0 0 12>;
gpio-ranges = <&pm6150l_gpios 0 0 12>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
......
......@@ -11,11 +11,11 @@ pm8005_lsid0: pmic@4 {
#address-cells = <1>;
#size-cells = <0>;
pm8005_gpio: gpio@c000 {
pm8005_gpios: gpio@c000 {
compatible = "qcom,pm8005-gpio", "qcom,spmi-gpio";
reg = <0xc000>;
gpio-controller;
gpio-ranges = <&pm8005_gpio 0 0 4>;
gpio-ranges = <&pm8005_gpios 0 0 4>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
......
......@@ -141,11 +141,11 @@ pm8950_mpps: mpps@a000 {
#interrupt-cells = <2>;
};
pm8950_gpio: gpio@c000 {
pm8950_gpios: gpio@c000 {
compatible = "qcom,pm8950-gpio", "qcom,spmi-gpio";
reg = <0xc000>;
gpio-controller;
gpio-ranges = <&pm8950_gpio 0 0 8>;
gpio-ranges = <&pm8950_gpios 0 0 8>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
......
......@@ -109,11 +109,11 @@ rtc@6000 {
interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
};
pm8998_gpio: gpio@c000 {
pm8998_gpios: gpio@c000 {
compatible = "qcom,pm8998-gpio", "qcom,spmi-gpio";
reg = <0xc000>;
gpio-controller;
gpio-ranges = <&pm8998_gpio 0 0 26>;
gpio-ranges = <&pm8998_gpios 0 0 26>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
......
......@@ -67,11 +67,11 @@ pmi8950_mpps: mpps@a000 {
#interrupt-cells = <2>;
};
pmi8950_gpio: gpio@c000 {
pmi8950_gpios: gpio@c000 {
compatible = "qcom,pmi8950-gpio", "qcom,spmi-gpio";
reg = <0xc000>;
gpio-controller;
gpio-ranges = <&pmi8950_gpio 0 0 2>;
gpio-ranges = <&pmi8950_gpios 0 0 2>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
......
......@@ -9,11 +9,11 @@ pmi8998_lsid0: pmic@2 {
#address-cells = <1>;
#size-cells = <0>;
pmi8998_gpio: gpio@c000 {
pmi8998_gpios: gpio@c000 {
compatible = "qcom,pmi8998-gpio", "qcom,spmi-gpio";
reg = <0xc000>;
gpio-controller;
gpio-ranges = <&pmi8998_gpio 0 0 14>;
gpio-ranges = <&pmi8998_gpios 0 0 14>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
......
......@@ -304,7 +304,7 @@ panel@0 {
pinctrl-names = "default";
pinctrl-0 = <&disp_pins>;
reset-gpios = <&pm6150l_gpio 3 GPIO_ACTIVE_HIGH>;
reset-gpios = <&pm6150l_gpios 3 GPIO_ACTIVE_HIGH>;
ports {
#address-cells = <1>;
......@@ -485,7 +485,7 @@ wifi-firmware {
/* PINCTRL - additions to nodes defined in sc7180.dtsi */
&pm6150l_gpio {
&pm6150l_gpios {
disp_pins: disp-state {
pinconf {
pins = "gpio3";
......
......@@ -1159,11 +1159,11 @@ &sec_mi2s_active {
/* PINCTRL - board-specific pinctrl */
&pm6150_gpio {
&pm6150_gpios {
status = "disabled"; /* No GPIOs are connected */
};
&pm6150l_gpio {
&pm6150l_gpios {
gpio-line-names = "AP_SUSPEND",
"",
"",
......
......@@ -1096,7 +1096,7 @@ pinconf-rx {
};
/* PINCTRL - board-specific pinctrl */
&pm8005_gpio {
&pm8005_gpios {
gpio-line-names = "",
"",
"SLB",
......@@ -1130,7 +1130,7 @@ adc-chan@51 {
};
};
&pm8998_gpio {
&pm8998_gpios {
gpio-line-names = "",
"",
"SW_CTRL",
......
......@@ -54,7 +54,7 @@ gpio-keys {
key-vol-up {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
};
};
......@@ -65,7 +65,7 @@ led-0 {
label = "green:user4";
function = LED_FUNCTION_INDICATOR;
color = <LED_COLOR_ID_GREEN>;
gpios = <&pm8998_gpio 13 GPIO_ACTIVE_HIGH>;
gpios = <&pm8998_gpios 13 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "panic-indicator";
default-state = "off";
};
......@@ -74,7 +74,7 @@ led-1 {
label = "yellow:wlan";
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_YELLOW>;
gpios = <&pm8998_gpio 9 GPIO_ACTIVE_HIGH>;
gpios = <&pm8998_gpios 9 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "phy0tx";
default-state = "off";
};
......@@ -83,7 +83,7 @@ led-2 {
label = "blue:bt";
function = LED_FUNCTION_BLUETOOTH;
color = <LED_COLOR_ID_BLUE>;
gpios = <&pm8998_gpio 5 GPIO_ACTIVE_HIGH>;
gpios = <&pm8998_gpios 5 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "bluetooth-power";
default-state = "off";
};
......@@ -148,7 +148,7 @@ cam0_dvdd_1v2: reg_cam0_dvdd_1v2 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
enable-active-high;
gpio = <&pm8998_gpio 12 GPIO_ACTIVE_HIGH>;
gpio = <&pm8998_gpios 12 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&cam0_dvdd_1v2_en_default>;
vin-supply = <&vbat>;
......@@ -160,7 +160,7 @@ cam0_avdd_2v8: reg_cam0_avdd_2v8 {
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
enable-active-high;
gpio = <&pm8998_gpio 10 GPIO_ACTIVE_HIGH>;
gpio = <&pm8998_gpios 10 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&cam0_avdd_2v8_en_default>;
vin-supply = <&vbat>;
......@@ -559,7 +559,7 @@ &pcie1_phy {
vdda-pll-supply = <&vreg_l26a_1p2>;
};
&pm8998_gpio {
&pm8998_gpios {
gpio-line-names =
"NC",
"NC",
......@@ -1170,7 +1170,7 @@ pinconf-rx {
};
};
&pm8998_gpio {
&pm8998_gpios {
};
......
......@@ -132,7 +132,7 @@ gpio-keys {
key-vol-up {
label = "Volume up";
linux,code = <KEY_VOLUMEUP>;
gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
};
};
......@@ -603,7 +603,7 @@ pinconf {
};
};
&pm8998_gpio {
&pm8998_gpios {
vol_up_pin_a: vol-up-active-state {
pins = "gpio6";
function = "normal";
......
......@@ -37,14 +37,14 @@ gpio-keys {
key-vol-down {
label = "Volume down";
linux,code = <KEY_VOLUMEDOWN>;
gpios = <&pm8998_gpio 5 GPIO_ACTIVE_LOW>;
gpios = <&pm8998_gpios 5 GPIO_ACTIVE_LOW>;
debounce-interval = <15>;
};
key-vol-up {
label = "Volume up";
linux,code = <KEY_VOLUMEUP>;
gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
debounce-interval = <15>;
};
};
......@@ -440,7 +440,7 @@ &mss_pil {
firmware-name = "qcom/sdm845/oneplus6/mba.mbn", "qcom/sdm845/oneplus6/modem.mbn";
};
&pm8998_gpio {
&pm8998_gpios {
volume_down_gpio: pm8998-gpio5-state {
pinconf {
pins = "gpio5";
......
......@@ -54,7 +54,7 @@ gpio-keys {
key-vol-up {
label = "volume_up";
linux,code = <KEY_VOLUMEUP>;
gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
debounce-interval = <15>;
};
};
......@@ -510,7 +510,7 @@ &mss_pil {
firmware-name = "qcom/sdm845/axolotl/mba.mbn", "qcom/sdm845/axolotl/modem.mbn";
};
&pm8998_gpio {
&pm8998_gpios {
volume_up_gpio: pm8998-gpio6-state {
pinconf {
pins = "gpio6";
......
......@@ -21,7 +21,7 @@ gpio-keys {
key-vol-down {
label = "volume_down";
gpios = <&pm8998_gpio 5 GPIO_ACTIVE_LOW>;
gpios = <&pm8998_gpios 5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;
debounce-interval = <15>;
gpio-key,wakeup;
......
......@@ -46,7 +46,7 @@ gpio-keys {
key-vol-up {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
};
};
......@@ -304,7 +304,7 @@ &ipa {
firmware-name = "qcom/sdm845/beryllium/ipa_fws.mbn";
};
&pm8998_gpio {
&pm8998_gpios {
vol_up_pin_a: vol-up-active-state {
pins = "gpio6";
function = "normal";
......
......@@ -55,7 +55,7 @@ gpio-keys {
key-vol-up {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
debounce-interval = <15>;
};
};
......@@ -518,7 +518,7 @@ &pmi8998_wled {
status = "okay";
};
&pm8998_gpio {
&pm8998_gpios {
volume_up_gpio: pm8998-gpio6-state {
pinconf {
qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
......
......@@ -46,7 +46,7 @@ gpio-keys {
key-volume-up {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
gpios = <&pm6125_gpio 5 GPIO_ACTIVE_LOW>;
gpios = <&pm6125_gpios 5 GPIO_ACTIVE_LOW>;
debounce-interval = <15>;
linux,can-disable;
gpio-key,wakeup;
......@@ -59,7 +59,7 @@ &dispcc {
status = "disabled";
};
&pm6125_gpio {
&pm6125_gpios {
vol_up_n: vol-up-n-state {
pins = "gpio5";
function = "normal";
......
......@@ -217,7 +217,7 @@ rf-pa1-therm@3 {
};
};
&pm6125_gpio {
&pm6125_gpios {
camera_flash_therm: camera-flash-therm-state {
pins = "gpio3";
function = PMIC_GPIO_FUNC_NORMAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment