Merge "ARM: dts: msm: Revert gpio21 related change for QCS405" (2f0434ec) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm64/boot/dts/qcom/qcs405-pinctrl.dtsi

+4 −32

Original line number	Diff line number	Diff line
		@@ -1468,34 +1468,6 @@
		};
		};

		sdc2_wlan_on: sdc2_wlan_on {
		mux {
		pins = "gpio21";
		function = "gpio";
		};

		config {
		pins = "gpio21";
		drive-strength = <10>;
		bias-pull-up;
		output-high;
		};
		};

		sdc2_wlan_off: sdc2_wlan_off {
		mux {
		pins = "gpio21";
		function = "gpio";
		};

		config {
		pins = "gpio21";
		drive-strength = <2>;
		bias-pull-down;
		output-low;
		};
		};

		/* SMB CONFIGURATION */
		smb_stat: smb_stat {
		mux {
		@@ -2705,13 +2677,13 @@
		evb_tlmm_gpio_key{
		tlmm_gpio_key_active: tlmm_gpio_key_active {
		mux {
		pins = "gpio52","gpio54",
		pins = "gpio21","gpio52","gpio54",
		"gpio115";
		function = "gpio";
		};

		config {
		pins = "gpio52","gpio54",
		pins = "gpio21","gpio52","gpio54",
		"gpio115";
		drive-strength = <2>;
		bias-pull-up;
		@@ -2720,13 +2692,13 @@

		tlmm_gpio_key_suspend: tlmm_gpio_key_suspend {
		mux {
		pins = "gpio52","gpio54",
		pins = "gpio21","gpio52","gpio54",
		"gpio115";
		function = "gpio";
		};

		config {
		pins = "gpio52","gpio54",
		pins = "gpio21","gpio52","gpio54",
		"gpio115";
		drive-strength = <2>;
		bias-disable;

+2 −4

Original line number	Diff line number	Diff line
		@@ -1320,10 +1320,8 @@
		qcom,nonremovable;

		pinctrl-names = "active", "sleep";
		pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on
		&sdc2_wlan_on>;
		pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off
		&sdc2_wlan_off>;
		pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;
		pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;

		/delete-property/ qcom,devfreq,freq-table;
		/delete-property/ cd-gpios;