Commit ff36bed5 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: align PMIC GPIO pin configuration with DT schema



DT schema expects PMIC GPIO pin configuration nodes to be named with
'-state' suffix.  Optional children should be either 'pinconf' or
followed with '-pins' suffix.  This fixes dtbs_check warnings like:

  sdm845-xiaomi-beryllium.dtb: gpios@c000: 'vol-up-active' does not match any of the regexes: '-state$', 'pinctrl-[0-9]+'

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220507194913.261121-6-krzysztof.kozlowski@linaro.org
parent 4148a9ee
Loading
Loading
Loading
Loading
+5 −5
Original line number Original line Diff line number Diff line
@@ -773,7 +773,7 @@ &pm8916_gpios {
		"USB_HUB_RESET_N_PM",
		"USB_HUB_RESET_N_PM",
		"USB_SW_SEL_PM";
		"USB_SW_SEL_PM";


	usb_hub_reset_pm: usb-hub-reset-pm {
	usb_hub_reset_pm: usb-hub-reset-pm-state {
		pins = "gpio3";
		pins = "gpio3";
		function = PMIC_GPIO_FUNC_NORMAL;
		function = PMIC_GPIO_FUNC_NORMAL;


@@ -781,14 +781,14 @@ usb_hub_reset_pm: usb-hub-reset-pm {
		output-high;
		output-high;
	};
	};


	usb_hub_reset_pm_device: usb-hub-reset-pm-device {
	usb_hub_reset_pm_device: usb-hub-reset-pm-device-state {
		pins = "gpio3";
		pins = "gpio3";
		function = PMIC_GPIO_FUNC_NORMAL;
		function = PMIC_GPIO_FUNC_NORMAL;


		output-low;
		output-low;
	};
	};


	usb_sw_sel_pm: usb-sw-sel-pm {
	usb_sw_sel_pm: usb-sw-sel-pm-state {
		pins = "gpio4";
		pins = "gpio4";
		function = PMIC_GPIO_FUNC_NORMAL;
		function = PMIC_GPIO_FUNC_NORMAL;


@@ -797,7 +797,7 @@ usb_sw_sel_pm: usb-sw-sel-pm {
		output-high;
		output-high;
	};
	};


	usb_sw_sel_pm_device: usb-sw-sel-pm-device {
	usb_sw_sel_pm_device: usb-sw-sel-pm-device-state {
		pins = "gpio4";
		pins = "gpio4";
		function = PMIC_GPIO_FUNC_NORMAL;
		function = PMIC_GPIO_FUNC_NORMAL;


@@ -806,7 +806,7 @@ usb_sw_sel_pm_device: usb-sw-sel-pm-device {
		output-low;
		output-low;
	};
	};


	pm8916_gpios_leds: pm8916-gpios-leds {
	pm8916_gpios_leds: pm8916-gpios-leds-state {
		pins = "gpio1", "gpio2";
		pins = "gpio1", "gpio2";
		function = PMIC_GPIO_FUNC_NORMAL;
		function = PMIC_GPIO_FUNC_NORMAL;


+8 −8
Original line number Original line Diff line number Diff line
@@ -555,7 +555,7 @@ &pm8994_gpios {
	pinctrl-names = "default";
	pinctrl-names = "default";
	pinctrl-0 = <&ls_exp_gpio_f &bt_en_gpios>;
	pinctrl-0 = <&ls_exp_gpio_f &bt_en_gpios>;


	ls_exp_gpio_f: pm8994_gpio5 {
	ls_exp_gpio_f: pm8994-gpio5-state {
		pinconf {
		pinconf {
			pins = "gpio5";
			pins = "gpio5";
			output-low;
			output-low;
@@ -563,7 +563,7 @@ pinconf {
		};
		};
	};
	};


	bt_en_gpios: bt_en_gpios {
	bt_en_gpios: bt-en-pios-state {
		pinconf {
		pinconf {
			pins = "gpio19";
			pins = "gpio19";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
@@ -574,7 +574,7 @@ pinconf {
		};
		};
	};
	};


	wlan_en_gpios: wlan_en_gpios {
	wlan_en_gpios: wlan-en-gpios-state {
		pinconf {
		pinconf {
			pins = "gpio8";
			pins = "gpio8";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
@@ -585,7 +585,7 @@ pinconf {
		};
		};
	};
	};


	audio_mclk: clk_div1 {
	audio_mclk: clk-div1-state {
		pinconf {
		pinconf {
			pins = "gpio15";
			pins = "gpio15";
			function = "func1";
			function = "func1";
@@ -593,7 +593,7 @@ pinconf {
		};
		};
	};
	};


	volume_up_gpio: pm8996_gpio2 {
	volume_up_gpio: pm8996-gpio2-state {
		pinconf {
		pinconf {
			pins = "gpio2";
			pins = "gpio2";
			function = "normal";
			function = "normal";
@@ -605,7 +605,7 @@ pinconf {
		};
		};
	};
	};


	divclk4_pin_a: divclk4 {
	divclk4_pin_a: divclk4-state {
		pinconf {
		pinconf {
			pins = "gpio18";
			pins = "gpio18";
			function = PMIC_GPIO_FUNC_FUNC2;
			function = PMIC_GPIO_FUNC_FUNC2;
@@ -615,7 +615,7 @@ pinconf {
		};
		};
	};
	};


	usb3_vbus_det_gpio: pm8996_gpio22 {
	usb3_vbus_det_gpio: pm8996-gpio22-state {
		pinconf {
		pinconf {
			pins = "gpio22";
			pins = "gpio22";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
@@ -671,7 +671,7 @@ &pmi8994_gpios {
		"NC",
		"NC",
		"NC";
		"NC";


	usb2_vbus_det_gpio: pmi8996_gpio6 {
	usb2_vbus_det_gpio: pmi8996-gpio6-state {
		pinconf {
		pinconf {
			pins = "gpio6";
			pins = "gpio6";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
+1 −1
Original line number Original line Diff line number Diff line
@@ -463,7 +463,7 @@ tsp_en_default: tsp-en-default {
};
};


&pm8916_gpios {
&pm8916_gpios {
	nfc_clk_req: nfc-clk-req {
	nfc_clk_req: nfc-clk-req-state {
		pins = "gpio2";
		pins = "gpio2";
		function = "func1";
		function = "func1";


+5 −5
Original line number Original line Diff line number Diff line
@@ -470,7 +470,7 @@ qca6174_bt: bluetooth {
};
};


&pm8994_gpios {
&pm8994_gpios {
	bt_en_gpios: bt_en_gpios {
	bt_en_gpios: bt-en-gpios-state {
		pinconf {
		pinconf {
			pins = "gpio19";
			pins = "gpio19";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
@@ -481,7 +481,7 @@ pinconf {
		};
		};
	};
	};


	divclk4_pin_a: divclk4 {
	divclk4_pin_a: divclk4-state {
		pinconf {
		pinconf {
			pins = "gpio18";
			pins = "gpio18";
			function = PMIC_GPIO_FUNC_FUNC2;
			function = PMIC_GPIO_FUNC_FUNC2;
@@ -519,19 +519,19 @@ &pmi8994_gpios {
	 * TODO: remove once a driver is available
	 * TODO: remove once a driver is available
	 * TODO: add VBUS GPIO 5
	 * TODO: add VBUS GPIO 5
	 */
	 */
	hd3ss460_pol: pol_low {
	hd3ss460_pol: pol-low-state {
		pins = "gpio8";
		pins = "gpio8";
		drive-strength = <3>;
		drive-strength = <3>;
		bias-pull-down;
		bias-pull-down;
	};
	};


	hd3ss460_amsel: amsel_high {
	hd3ss460_amsel: amsel-high-state {
		pins = "gpio9";
		pins = "gpio9";
		drive-strength = <1>;
		drive-strength = <1>;
		bias-pull-up;
		bias-pull-up;
	};
	};


	hd3ss460_en: en_high {
	hd3ss460_en: en-high-state {
		pins = "gpio10";
		pins = "gpio10";
		drive-strength = <1>;
		drive-strength = <1>;
		bias-pull-up;
		bias-pull-up;
+35 −35
Original line number Original line Diff line number Diff line
@@ -242,14 +242,14 @@ &pm8994_gpios {
	 * probably a reason for it, and just to be on the safe side, we follow suit.
	 * probably a reason for it, and just to be on the safe side, we follow suit.
	 */
	 */
	pm8994_gpios_defaults: pm8994-gpios-default-state {
	pm8994_gpios_defaults: pm8994-gpios-default-state {
		pm8994-gpio1-nc {
		pm8994-gpio1-nc-pins {
			pins = "gpio1";
			pins = "gpio1";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
			bias-high-impedance;
			bias-high-impedance;
		};
		};


		vol-down-n {
		vol-down-n-pins {
			pins = "gpio2";
			pins = "gpio2";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
@@ -259,7 +259,7 @@ vol-down-n {
			power-source = <PM8994_GPIO_S4>;
			power-source = <PM8994_GPIO_S4>;
		};
		};


		vol-up-n {
		vol-up-n-pins {
			pins = "gpio3";
			pins = "gpio3";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
@@ -268,7 +268,7 @@ vol-up-n {
			power-source = <PM8994_GPIO_S4>;
			power-source = <PM8994_GPIO_S4>;
		};
		};


		camera-snapshot-n {
		camera-snapshot-n-pins {
			pins = "gpio4";
			pins = "gpio4";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
@@ -278,7 +278,7 @@ camera-snapshot-n {
			power-source = <PM8994_GPIO_S4>;
			power-source = <PM8994_GPIO_S4>;
		};
		};


		camera-focus-n {
		camera-focus-n-pins {
			pins = "gpio5";
			pins = "gpio5";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
@@ -288,7 +288,7 @@ camera-focus-n {
			power-source = <PM8994_GPIO_S4>;
			power-source = <PM8994_GPIO_S4>;
		};
		};


		pm8994-gpio6-nc {
		pm8994-gpio6-nc-pins {
			pins = "gpio6";
			pins = "gpio6";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
@@ -296,7 +296,7 @@ pm8994-gpio6-nc {
			power-source = <PM8994_GPIO_VPH>;
			power-source = <PM8994_GPIO_VPH>;
		};
		};


		nfc-download {
		nfc-download-pins {
			pins = "gpio7";
			pins = "gpio7";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			output-low;
			output-low;
@@ -306,7 +306,7 @@ nfc-download {
			power-source = <PM8994_GPIO_S4>;
			power-source = <PM8994_GPIO_S4>;
		};
		};


		pm8994-gpio8-nc {
		pm8994-gpio8-nc-pins {
			pins = "gpio8";
			pins = "gpio8";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			output-low;
			output-low;
@@ -316,7 +316,7 @@ pm8994-gpio8-nc {
			power-source = <PM8994_GPIO_VPH>;
			power-source = <PM8994_GPIO_VPH>;
		};
		};


		pm8994-gpio9-nc {
		pm8994-gpio9-nc-pins {
			pins = "gpio9";
			pins = "gpio9";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			output-high;
			output-high;
@@ -326,7 +326,7 @@ pm8994-gpio9-nc {
			power-source = <PM8994_GPIO_VPH>;
			power-source = <PM8994_GPIO_VPH>;
		};
		};


		nfc-clock {
		nfc-clock-pins {
			pins = "gpio10";
			pins = "gpio10";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			input-enable;
			input-enable;
@@ -336,7 +336,7 @@ nfc-clock {
			power-source = <PM8994_GPIO_S4>;
			power-source = <PM8994_GPIO_S4>;
		};
		};


		pm8994-gpio11-nc {
		pm8994-gpio11-nc-pins {
			pins = "gpio11";
			pins = "gpio11";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
@@ -344,7 +344,7 @@ pm8994-gpio11-nc {
			power-source = <PM8994_GPIO_VPH>;
			power-source = <PM8994_GPIO_VPH>;
		};
		};


		pm8994-gpio12-nc {
		pm8994-gpio12-nc-pins {
			pins = "gpio12";
			pins = "gpio12";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
@@ -352,7 +352,7 @@ pm8994-gpio12-nc {
			power-source = <PM8994_GPIO_VPH>;
			power-source = <PM8994_GPIO_VPH>;
		};
		};


		ear-enable {
		ear-enable-pins {
			pins = "gpio13";
			pins = "gpio13";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			output-high;
			output-high;
@@ -362,7 +362,7 @@ ear-enable {
			power-source = <PM8994_GPIO_S4>;
			power-source = <PM8994_GPIO_S4>;
		};
		};


		pm8994-gpio14-nc {
		pm8994-gpio14-nc-pins {
			pins = "gpio14";
			pins = "gpio14";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
@@ -372,7 +372,7 @@ pm8994-gpio14-nc {
			power-source = <PM8994_GPIO_VPH>;
			power-source = <PM8994_GPIO_VPH>;
		};
		};


		pm-divclk1-gpio {
		pm-divclk1-gpio-pins {
			pins = "gpio15";
			pins = "gpio15";
			function = "func1";
			function = "func1";
			output-high;
			output-high;
@@ -382,13 +382,13 @@ pm-divclk1-gpio {
			power-source = <PM8994_GPIO_VPH>;
			power-source = <PM8994_GPIO_VPH>;
		};
		};


		pmi-clk-gpio {
		pmi-clk-gpio-pins {
			pins = "gpio16";
			pins = "gpio16";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
		};
		};


		pm8994-gpio17-nc {
		pm8994-gpio17-nc-pins {
			pins = "gpio17";
			pins = "gpio17";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
@@ -396,7 +396,7 @@ pm8994-gpio17-nc {
			power-source = <PM8994_GPIO_VPH>;
			power-source = <PM8994_GPIO_VPH>;
		};
		};


		rome-sleep {
		rome-sleep-pins {
			pins = "gpio18";
			pins = "gpio18";
			function = PMIC_GPIO_FUNC_FUNC2;
			function = PMIC_GPIO_FUNC_FUNC2;
			output-low;
			output-low;
@@ -406,7 +406,7 @@ rome-sleep {
			power-source = <PM8994_GPIO_S4>;
			power-source = <PM8994_GPIO_S4>;
		};
		};


		pm8994-gpio19-nc {
		pm8994-gpio19-nc-pins {
			pins = "gpio19";
			pins = "gpio19";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			output-low;
			output-low;
@@ -416,7 +416,7 @@ pm8994-gpio19-nc {
			power-source = <PM8994_GPIO_VPH>;
			power-source = <PM8994_GPIO_VPH>;
		};
		};


		pm8994-gpio22-nc {
		pm8994-gpio22-nc-pins {
			pins = "gpio22";
			pins = "gpio22";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
@@ -441,34 +441,34 @@ &pm8994_mpps {
		"RF_ID";
		"RF_ID";


	pm8994_mpps_defaults: pm8994-mpps-default-state {
	pm8994_mpps_defaults: pm8994-mpps-default-state {
		lcd-id_adc-mpp {
		lcd-id_adc-mpp-pins {
			pins = "mpp2";
			pins = "mpp2";
			function = "analog";
			function = "analog";
			input-enable;
			input-enable;
			qcom,amux-route = <PMIC_MPP_AMUX_ROUTE_CH6>;
			qcom,amux-route = <PMIC_MPP_AMUX_ROUTE_CH6>;
		};
		};


		pm-mpp4-nc {
		pm-mpp4-nc-pins {
			pins = "mpp4";
			pins = "mpp4";
			function = "digital";
			function = "digital";
			bias-high-impedance;
			bias-high-impedance;
			power-source = <PM8994_GPIO_VPH>;
			power-source = <PM8994_GPIO_VPH>;
		};
		};


		flash-therm-mpp {
		flash-therm-mpp-pins {
			pins = "mpp5";
			pins = "mpp5";
			function = "analog";
			function = "analog";
			input-enable;
			input-enable;
			qcom,amux-route = <PMIC_MPP_AMUX_ROUTE_CH5>;
			qcom,amux-route = <PMIC_MPP_AMUX_ROUTE_CH5>;
		};
		};


		mpp6-nc {
		mpp6-nc-pins {
			pins = "mpp6";
			pins = "mpp6";
			function = "digital";
			function = "digital";
			bias-high-impedance;
			bias-high-impedance;
		};
		};


		rf-id-mpp {
		rf-id-mpp-pins {
			pins = "mpp8";
			pins = "mpp8";
			function = "analog";
			function = "analog";
			input-enable;
			input-enable;
@@ -499,7 +499,7 @@ &pmi8994_gpios {
		"NC";
		"NC";


	pmi8994_gpios_defaults: pmi8994-gpios-default-state {
	pmi8994_gpios_defaults: pmi8994-gpios-default-state {
		vib-ldo-en-gpio {
		vib-ldo-en-gpio-pins {
			pins = "gpio1";
			pins = "gpio1";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
@@ -508,7 +508,7 @@ vib-ldo-en-gpio {
			power-source = <PM8994_GPIO_S4>;
			power-source = <PM8994_GPIO_S4>;
		};
		};


		pmi-gpio2-nc {
		pmi-gpio2-nc-pins {
			pins = "gpio2";
			pins = "gpio2";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
@@ -518,7 +518,7 @@ pmi-gpio2-nc {
			power-source = <PM8994_GPIO_VPH>;
			power-source = <PM8994_GPIO_VPH>;
		};
		};


		pmi-gpio3-nc {
		pmi-gpio3-nc-pins {
			pins = "gpio3";
			pins = "gpio3";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
@@ -528,7 +528,7 @@ pmi-gpio3-nc {
			power-source = <PM8994_GPIO_VPH>;
			power-source = <PM8994_GPIO_VPH>;
		};
		};


		pmi-gpio4-nc {
		pmi-gpio4-nc-pins {
			pins = "gpio4";
			pins = "gpio4";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
@@ -537,7 +537,7 @@ pmi-gpio4-nc {
			power-source = <PM8994_GPIO_S4>;
			power-source = <PM8994_GPIO_S4>;
		};
		};


		pmi-gpio5-nc {
		pmi-gpio5-nc-pins {
			pins = "gpio5";
			pins = "gpio5";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
@@ -546,7 +546,7 @@ pmi-gpio5-nc {
			power-source = <PM8994_GPIO_S4>;
			power-source = <PM8994_GPIO_S4>;
		};
		};


		pmi-gpio6-nc {
		pmi-gpio6-nc-pins {
			pins = "gpio6";
			pins = "gpio6";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
@@ -555,7 +555,7 @@ pmi-gpio6-nc {
			power-source = <PM8994_GPIO_S4>;
			power-source = <PM8994_GPIO_S4>;
		};
		};


		pmi-gpio7-nc {
		pmi-gpio7-nc-pins {
			pins = "gpio7";
			pins = "gpio7";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
@@ -564,7 +564,7 @@ pmi-gpio7-nc {
			power-source = <PM8994_GPIO_S4>;
			power-source = <PM8994_GPIO_S4>;
		};
		};


		pmi-gpio8-nc {
		pmi-gpio8-nc-pins {
			pins = "gpio8";
			pins = "gpio8";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
@@ -573,13 +573,13 @@ pmi-gpio8-nc {
			power-source = <PM8994_GPIO_S4>;
			power-source = <PM8994_GPIO_S4>;
		};
		};


		usb-switch-sel {
		usb-switch-sel-pins {
			pins = "gpio9";
			pins = "gpio9";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			drive-push-pull;
			drive-push-pull;
		};
		};


		pmi-gpio10-nc {
		pmi-gpio10-nc-pins {
			pins = "gpio10";
			pins = "gpio10";
			function = PMIC_GPIO_FUNC_NORMAL;
			function = PMIC_GPIO_FUNC_NORMAL;
			output-low;
			output-low;
Loading