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

ARM: 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.

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-10-krzysztof.kozlowski@linaro.org
parent 39eebfce

arch/arm/boot/dts/qcom-apq8060-dragonboard.dts

+10 −10
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ MATRIX_KEY(4, 3, KEY_KBDILLUMTOGGLE) 
				};



				gpio@150 {

					dragon_ethernet_gpios: ethernet-gpios {

					dragon_ethernet_gpios: ethernet-state {

						pinconf {

							pins = "gpio7";

							function = "normal";
@@ -282,7 +282,7 @@ pinconf { 
							power-source = <PM8058_GPIO_S3>;

						};

					};

					dragon_bmp085_gpios: bmp085-gpios {

					dragon_bmp085_gpios: bmp085-state {

						pinconf {

							pins = "gpio16";

							function = "normal";
@@ -291,7 +291,7 @@ pinconf { 
							power-source = <PM8058_GPIO_S3>;

						};

					};

					dragon_mpu3050_gpios: mpu3050-gpios {

					dragon_mpu3050_gpios: mpu3050-state {

						pinconf {

							pins = "gpio17";

							function = "normal";
@@ -300,7 +300,7 @@ pinconf { 
							power-source = <PM8058_GPIO_S3>;

						};

					};

					dragon_sdcc3_gpios: sdcc3-gpios {

					dragon_sdcc3_gpios: sdcc3-state {

						pinconf {

							pins = "gpio22";

							function = "normal";
@@ -309,7 +309,7 @@ pinconf { 
							power-source = <PM8058_GPIO_S3>;

						};

					};

					dragon_sdcc5_gpios: sdcc5-gpios {

					dragon_sdcc5_gpios: sdcc5-state {

						pinconf {

							pins = "gpio26";

							function = "normal";
@@ -319,7 +319,7 @@ pinconf { 
							power-source = <PM8058_GPIO_S3>;

						};

					};

					dragon_ak8975_gpios: ak8975-gpios {

					dragon_ak8975_gpios: ak8975-state {

						pinconf {

							pins = "gpio33";

							function = "normal";
@@ -328,9 +328,9 @@ pinconf { 
							power-source = <PM8058_GPIO_S3>;

						};

					};

					dragon_cm3605_gpios: cm3605-gpios {

					dragon_cm3605_gpios: cm3605-state {

						/* Pin 34 connected to the proxy IRQ */

						pinconf_gpio34 {

						gpio34-pins {

							pins = "gpio34";

							function = "normal";

							input-enable;
@@ -338,7 +338,7 @@ pinconf_gpio34 { 
							power-source = <PM8058_GPIO_S3>;

						};

						/* Pin 35 connected to ASET */

						pinconf_gpio35 {

						gpio35-pins {

							pins = "gpio35";

							function = "normal";

							output-high;
@@ -346,7 +346,7 @@ pinconf_gpio35 { 
							power-source = <PM8058_GPIO_S3>;

						};

					};

					dragon_veth_gpios: veth-gpios {

					dragon_veth_gpios: veth-state {

						pinconf {

							pins = "gpio40";

							function = "normal";

arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts

+2 −2
Original line number Diff line number Diff line
@@ -196,8 +196,8 @@ v3p3_fixed: v3p3 { 
		qcom,ssbi@500000 {

			pmic@0 {

				gpio@150 {

					wlan_default_gpios: wlan-gpios {

						pios {

					wlan_default_gpios: wlan-gpios-state {

						pinconf {

							pins = "gpio43";

							function = "normal";

							bias-disable;

arch/arm/boot/dts/qcom-apq8064-ifc6410.dts

+4 −4
Original line number Diff line number Diff line
@@ -291,8 +291,8 @@ pci@1b500000 { 
		qcom,ssbi@500000 {

			pmic@0 {

				gpio@150 {

					wlan_default_gpios: wlan-gpios {

						pios {

					wlan_default_gpios: wlan-gpios-state {

						pinconf {

							pins = "gpio43";

							function = "normal";

							bias-disable;
@@ -300,8 +300,8 @@ pios { 
						};

					};



					notify_led: nled {

						pios {

					notify_led: nled-state {

						pinconf {

							pins = "gpio18";

							function = "normal";

							bias-disable;

arch/arm/boot/dts/qcom-apq8064-sony-xperia-lagan-yuga.dts

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ ncp { 
		qcom,ssbi@500000 {

			pmic@0 {

				gpio@150 {

					gpio_keys_pin_a: gpio-keys-pin-active {

					gpio_keys_pin_a: gpio-keys-active-state {

						pins = "gpio3", "gpio4", "gpio29", "gpio35";

						function = "normal";

arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ pins { 
};



&pmicgpio {

	usb_vbus_5v_pins: usb_vbus_5v_pins {

	usb_vbus_5v_pins: usb-vbus-5v-state {

		pins = "gpio4";

		function = "normal";

		output-high;