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

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

arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts

+4 −4
Original line number Diff line number Diff line
@@ -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";

arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts

+2 −2
Original line number Diff line number Diff line
@@ -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";

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

+3 −3
Original line number Diff line number Diff line
@@ -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";

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

+2 −2
Original line number Diff line number Diff line
@@ -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";

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

+8 −8
Original line number Diff line number Diff line
@@ -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;