niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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 <marijn.suijten@somainline.org>
Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221209220450.1793421-1-marijn.suijten@somainline.org
This commit is contained in:
Marijn Suijten 2022-12-09 23:04:49 +01:00 • committed by Bjorn Andersson
parent 3c3d2cb221
commit ea25d61b44
26 changed files with 66 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts
View file

@ -113,7 +113,7 @@
<&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-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-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 @@
};
};
&pm8998_gpio {
&pm8998_gpios {
vol_up_pin_a: vol-up-active-state {
pins = "gpio6";
function = "normal";

4
arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts
View file

@ -23,7 +23,7 @@
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 @@
};
};
&pmi8998_gpio {
&pmi8998_gpios {
button_backlight_default: button-backlight-state {
pins = "gpio5";
function = "gpio";

6
arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi
View file

@ -92,7 +92,7 @@
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-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 @@
};
};
&pm8998_gpio {
&pm8998_gpios {
vol_keys_default: vol-keys-state {
pins = "gpio5", "gpio6";
function = "normal";

4
arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts
View file

@ -20,7 +20,7 @@
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 @@
qcom,soft-start-us = <200>;
};
&pmi8998_gpio {
&pmi8998_gpios {
disp_dvdd_en: disp-dvdd-en-active-state {
pins = "gpio10";
function = "normal";

16
arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
View file

@ -25,7 +25,7 @@
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 @@
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 @@
<&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-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-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 @@
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 @@
};
};
&pm8998_gpio {
&pm8998_gpios {
vol_down_pin_a: vol-down-active-state {
pins = "gpio5";
function = PMIC_GPIO_FUNC_NORMAL;
@ -335,7 +335,7 @@
};
};
&pmi8998_gpio {
&pmi8998_gpios {
cam_vio_default: cam-vio-active-state {
pins = "gpio1";
function = PMIC_GPIO_FUNC_NORMAL;

4
arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts
View file

@ -133,7 +133,7 @@
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 @@
};
};
&pm8998_gpio {
&pm8998_gpios {
vol_up_key_default: vol-up-key-default-state {
pins = "gpio6";
function = "normal";

4
arch/arm64/boot/dts/qcom/pm6125.dtsi
View file

@ -136,11 +136,11 @@
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>;

4
arch/arm64/boot/dts/qcom/pm6150.dtsi
View file

@ -88,11 +88,11 @@
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>;

4
arch/arm64/boot/dts/qcom/pm6150l.dtsi
View file

@ -95,11 +95,11 @@
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>;

4
arch/arm64/boot/dts/qcom/pm8005.dtsi
View file

@ -11,11 +11,11 @@
#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>;

4
arch/arm64/boot/dts/qcom/pm8950.dtsi
View file

@ -141,11 +141,11 @@
#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>;

4
arch/arm64/boot/dts/qcom/pm8998.dtsi
View file

@ -109,11 +109,11 @@
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>;

4
arch/arm64/boot/dts/qcom/pmi8950.dtsi
View file

@ -67,11 +67,11 @@
#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>;

4
arch/arm64/boot/dts/qcom/pmi8998.dtsi
View file

@ -9,11 +9,11 @@
#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>;

4
arch/arm64/boot/dts/qcom/sc7180-idp.dts
View file

@ -304,7 +304,7 @@
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 @@
/* PINCTRL - additions to nodes defined in sc7180.dtsi */
&pm6150l_gpio {
&pm6150l_gpios {
disp_pins: disp-state {
pinconf {
pins = "gpio3";

4
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
View file

@ -1159,11 +1159,11 @@ ap_spi_fp: &spi10 {
/* PINCTRL - board-specific pinctrl */
&pm6150_gpio {
&pm6150_gpios {
status = "disabled"; /* No GPIOs are connected */
};
&pm6150l_gpio {
&pm6150l_gpios {
gpio-line-names = "AP_SUSPEND",
"",
"",

4
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
View file

@ -1096,7 +1096,7 @@ ap_ts_i2c: &i2c14 {
};
/* PINCTRL - board-specific pinctrl */
&pm8005_gpio {
&pm8005_gpios {
gpio-line-names = "",
"",
"SLB",
@ -1130,7 +1130,7 @@ ap_ts_i2c: &i2c14 {
};
};
&pm8998_gpio {
&pm8998_gpios {
gpio-line-names = "",
"",
"SW_CTRL",

16
arch/arm64/boot/dts/qcom/sdm845-db845c.dts
View file

@ -54,7 +54,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
vdda-pll-supply = <&vreg_l26a_1p2>;
};
&pm8998_gpio {
&pm8998_gpios {
gpio-line-names =
"NC",
"NC",
@ -1170,7 +1170,7 @@
};
};
&pm8998_gpio {
&pm8998_gpios {
};

4
arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
View file

@ -132,7 +132,7 @@
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 @@
};
};
&pm8998_gpio {
&pm8998_gpios {
vol_up_pin_a: vol-up-active-state {
pins = "gpio6";
function = "normal";

6
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
View file

@ -37,14 +37,14 @@
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 @@
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";

4
arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
View file

@ -54,7 +54,7 @@
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 @@
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";

2
arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
View file

@ -21,7 +21,7 @@
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;

4
arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
View file

@ -46,7 +46,7 @@
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 @@
firmware-name = "qcom/sdm845/beryllium/ipa_fws.mbn";
};
&pm8998_gpio {
&pm8998_gpios {
vol_up_pin_a: vol-up-active-state {
pins = "gpio6";
function = "normal";

4
arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
View file

@ -55,7 +55,7 @@
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 @@
status = "okay";
};
&pm8998_gpio {
&pm8998_gpios {
volume_up_gpio: pm8998-gpio6-state {
pinconf {
qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;

4
arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
View file

@ -46,7 +46,7 @@
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 @@
status = "disabled";
};
&pm6125_gpio {
&pm6125_gpios {
vol_up_n: vol-up-n-state {
pins = "gpio5";
function = "normal";

2
arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
View file

@ -217,7 +217,7 @@
};
};
&pm6125_gpio {
&pm6125_gpios {
camera_flash_therm: camera-flash-therm-state {
pins = "gpio3";
function = PMIC_GPIO_FUNC_NORMAL;