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

arm64: dts: qcom: msm8996: align TLMM pin configuration with DT schema 



DT schema expects TLMM pin configuration nodes to be named with
'-state' suffix and their optional children with '-pins' suffix.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221020225309.32116-2-krzysztof.kozlowski@linaro.org
parent 5ecbf096

arch/arm64/boot/dts/qcom/apq8096-db820c.dts

+30 −66
Original line number Diff line number Diff line
@@ -422,84 +422,48 @@ &tlmm { 
		"NC", /* GPIO_148 */

		"NC"; /* GPIO_149 */



	sdc2_cd_on: sdc2_cd_on {

		mux {

	sdc2_cd_on: sdc2-cd-on-state {

		pins = "gpio38";

		function = "gpio";

		bias-pull-up;

		drive-strength = <16>;

	};



		config {

			pins = "gpio38";

			bias-pull-up;		/* pull up */

			drive-strength = <16>;	/* 16 MA */

		};

	};



	sdc2_cd_off: sdc2_cd_off {

		mux {

	sdc2_cd_off: sdc2-cd-off-state {

		pins = "gpio38";

		function = "gpio";

		bias-pull-up;

		drive-strength = <2>;

	};



		config {

			pins = "gpio38";

			bias-pull-up;		/* pull up */

			drive-strength = <2>;	/* 2 MA */

		};

	};



	hdmi_hpd_active: hdmi_hpd_active {

		mux {

	hdmi_hpd_active: hdmi-hpd-active-state {

		pins = "gpio34";

		function = "hdmi_hot";

		};



		config {

			pins = "gpio34";

		bias-pull-down;

		drive-strength = <16>;

	};

	};



	hdmi_hpd_suspend: hdmi_hpd_suspend {

		mux {

	hdmi_hpd_suspend: hdmi-hpd-suspend-state {

		pins = "gpio34";

		function = "hdmi_hot";

		};



		config {

			pins = "gpio34";

		bias-pull-down;

		drive-strength = <2>;

	};

	};



	hdmi_ddc_active: hdmi_ddc_active {

		mux {

	hdmi_ddc_active: hdmi-ddc-active-state {

		pins = "gpio32", "gpio33";

		function = "hdmi_ddc";

		};



		config {

			pins = "gpio32", "gpio33";

		drive-strength = <2>;

		bias-pull-up;

	};

	};



	hdmi_ddc_suspend: hdmi_ddc_suspend {

		mux {

	hdmi_ddc_suspend: hdmi-ddc-suspend-state {

		pins = "gpio32", "gpio33";

		function = "hdmi_ddc";

		};



		config {

			pins = "gpio32", "gpio33";

		drive-strength = <2>;

		bias-pull-down;

	};

};

};



&pcie0 {

	status = "okay";

arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts

+13 −55
Original line number Diff line number Diff line
@@ -104,27 +104,8 @@ &mdss { 
	status = "okay";

};



&tlmm {

	sdc2_pins_default: sdc2-pins-default {

		clk {

			pins = "sdc2_clk";

			bias-disable;

			drive-strength = <16>;

		};



		cmd {

			pins = "sdc2_cmd";

			bias-pull-up;

			drive-strength = <10>;

		};



		data {

			pins = "sdc2_data";

			bias-pull-up;

			drive-strength = <10>;

		};



		cd {

&sdc2_state_on {

	cd-pins {

		pins = "gpio38";

		function = "gpio";
@@ -133,33 +114,14 @@ cd { 
	};

};



	sdc2_pins_sleep: sdc2-pins-sleep {

		clk {

			pins = "sdc2_clk";

			bias-disable;

			drive-strength = <2>;

		};



		cmd {

			pins = "sdc2_cmd";

			bias-pull-up;

			drive-strength = <2>;

		};



		data {

			pins = "sdc2_data";

			bias-pull-up;

			drive-strength = <2>;

		};



		cd {

&sdc2_state_off {

	cd-pins {

		pins = "gpio38";

		function = "gpio";

		bias-pull-up;

		drive-strength = <2>;

	};

};

};



&rpm_requests {

	regulators-0 {
@@ -372,10 +334,6 @@ &sdhc2 { 


	vmmc-supply = <&vreg_l21a_2p95>;

	vqmmc-supply = <&vreg_l13a_2p95>;



	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc2_pins_default>;

	pinctrl-1 = <&sdc2_pins_sleep>;

};



&ufshc {

arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi

+13 −13
Original line number Diff line number Diff line
@@ -847,28 +847,28 @@ &tlmm { 
	pinctrl-0 = <&sw_service_gpio>;

	pinctrl-names = "default";



	disp_reset_n_gpio: disp-reset-n {

	disp_reset_n_gpio: disp-reset-n-state {

		pins = "gpio8";

		function = "gpio";

		drive-strength = <2>;

		bias-disable;

	};



	mdp_vsync_p_gpio: mdp-vsync-p {

	mdp_vsync_p_gpio: mdp-vsync-p-state {

		pins = "gpio10";

		function = "mdp_vsync";

		drive-strength = <2>;

		bias-disable;

	};



	sw_service_gpio: sw-service-gpio {

	sw_service_gpio: sw-service-gpio-state {

		pins = "gpio16";

		function = "gpio";

		drive-strength = <2>;

		bias-pull-up;

	};



	usb_detect: usb-detect {

	usb_detect: usb-detect-state {

		pins = "gpio25";

		function = "gpio";

		drive-strength = <2>;
@@ -876,7 +876,7 @@ usb_detect: usb-detect { 
		output-high;

	};



	uim_detect_en: uim-detect-en {

	uim_detect_en: uim-detect-en-state {

		pins = "gpio29";

		function = "gpio";

		drive-strength = <2>;
@@ -884,14 +884,14 @@ uim_detect_en: uim-detect-en { 
		output-high;

	};



	tray_det_pin: tray-det {

	tray_det_pin: tray-det-state {

		pins = "gpio40";

		function = "gpio";

		drive-strength = <2>;

		bias-disable;

	};



	tp_vddio_en: tp-vddio-en {

	tp_vddio_en: tp-vddio-en-state {

		pins = "gpio50";

		function = "gpio";

		drive-strength = <2>;
@@ -899,7 +899,7 @@ tp_vddio_en: tp-vddio-en { 
		output-high;

	};



	lcd_vddio_en: lcd-vddio-en {

	lcd_vddio_en: lcd-vddio-en-state {

		pins = "gpio51";

		function = "gpio";

		drive-strength = <2>;
@@ -907,14 +907,14 @@ lcd_vddio_en: lcd-vddio-en { 
		output-low;

	};



	wl_host_wake: wl-host-wake {

	wl_host_wake: wl-host-wake-state {

		pins = "gpio79";

		function = "gpio";

		drive-strength = <2>;

		bias-pull-down;

	};



	wl_reg_on: wl-reg-on {

	wl_reg_on: wl-reg-on-state {

		pins = "gpio84";

		function = "gpio";

		drive-strength = <2>;
@@ -922,20 +922,20 @@ wl_reg_on: wl-reg-on { 
		output-low;

	};



	ts_reset_n: ts-rst-n {

	ts_reset_n: ts-rst-n-state {

		pins = "gpio89";

		function = "gpio";

		drive-strength = <2>;

	};



	touch_int_n: touch-int-n {

	touch_int_n: touch-int-n-state {

		pins = "gpio125";

		function = "gpio";

		drive-strength = <2>;

		bias-pull-up;

	};



	touch_int_sleep: touch-int-sleep {

	touch_int_sleep: touch-int-sleep-state {

		pins = "gpio125";

		function = "gpio";

		drive-strength = <2>;

arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -691,35 +691,35 @@ divclk4_pin_a: divclk4-state { 
};



&tlmm {

	mdss_dsi_default: mdss_dsi_default {

	mdss_dsi_default: mdss-dsi-default-state {

		pins = "gpio8";

		function = "gpio";

		drive-strength = <8>;

		bias-disable;

	};



	mdss_dsi_sleep: mdss_dsi_sleep {

	mdss_dsi_sleep: mdss-dsi-sleep-state {

		pins = "gpio8";

		function = "gpio";

		drive-strength = <2>;

		bias-pull-down;

	};



	mdss_te_default: mdss_te_default {

	mdss_te_default: mdss-te-default-state {

		pins = "gpio10";

		function = "mdp_vsync";

		drive-strength = <2>;

		bias-pull-down;

	};



	mdss_te_sleep: mdss_te_sleep {

	mdss_te_sleep: mdss-te-sleep-state {

		pins = "gpio10";

		function = "mdp_vsync";

		drive-strength = <2>;

		bias-pull-down;

	};



	nfc_default: nfc_default {

	nfc_default: nfc-default-state {

		pins = "gpio12", "gpio21";

		function = "gpio";

		drive-strength = <16>;

arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts

+4 −4
Original line number Diff line number Diff line
@@ -446,28 +446,28 @@ &tlmm { 
		"RFFE1_DATA",		/* GPIO_148 */

		"RFFE1_CLK";		/* GPIO_149 */



	touchscreen_default: touchscreen_default {

	touchscreen_default: touchscreen-default-state {

		pins = "gpio89", "gpio125";

		function = "gpio";

		drive-strength = <10>;

		bias-pull-up;

	};



	touchscreen_sleep: touchscreen_sleep {

	touchscreen_sleep: touchscreen-sleep-state {

		pins = "gpio89", "gpio125";

		function = "gpio";

		drive-strength = <2>;

		bias-disable;

	};



	vibrator_default: vibrator_default {

	vibrator_default: vibrator-default-state {

		pins = "gpio93";

		function = "gpio";

		drive-strength = <8>;

		bias-pull-up;

	};



	vibrator_sleep: vibrator_sleep {

	vibrator_sleep: vibrator-sleep-state {

		pins = "gpio93";

		function = "gpio";

		drive-strength = <2>;