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

arm64: dts: qcom: sdm845-audio-wcd9340: commonize pinctrl 



Pin configuration fow WCD9340 is the same in all users, so move it to
common file to reduce the code duplication (which still allows further
customizations per board).

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

arch/arm64/boot/dts/qcom/sdm845-db845c.dts

+0 −11
Original line number Diff line number Diff line
@@ -971,15 +971,6 @@ sdc2_card_det_n: sd-card-det-n-state { 
		function = "gpio";

		bias-pull-up;

	};



	wcd_intr_default: wcd-intr-default-state {

		pins = "gpio54";

		function = "gpio";



		input-enable;

		bias-pull-down;

		drive-strength = <2>;

	};

};



&uart3 {
@@ -1085,8 +1076,6 @@ &venus { 
};



&wcd9340 {

	pinctrl-0 = <&wcd_intr_default>;

	pinctrl-names = "default";

	clock-names = "extclk";

	clocks = <&rpmhcc RPMH_LN_BB_CLK2>;

	reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>;

arch/arm64/boot/dts/qcom/sdm845-wcd9340.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ wcd9340: codec@1,0 { 
			#clock-cells = <0>;

			clock-frequency = <9600000>;

			clock-output-names = "mclk";



			pinctrl-0 = <&wcd_intr_default>;

			pinctrl-names = "default";



			qcom,micbias1-microvolt = <1800000>;

			qcom,micbias2-microvolt = <1800000>;

			qcom,micbias3-microvolt = <1800000>;
@@ -67,3 +71,14 @@ swm: swm@c85 { 
		};

	};

};



&tlmm {

	wcd_intr_default: wcd-intr-default-state {

		pins = "gpio54";

		function = "gpio";



		input-enable;

		bias-pull-down;

		drive-strength = <2>;

	};

};

arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi

+0 −11
Original line number Diff line number Diff line
@@ -467,15 +467,6 @@ sdc2_card_det_n: sd-card-det-n-state { 
		function = "gpio";

		bias-pull-up;

	};



	wcd_intr_default: wcd-intr-default-state {

		pins = "gpio54";

		function = "gpio";



		input-enable;

		bias-pull-down;

		drive-strength = <2>;

	};

};



&uart6 {
@@ -544,8 +535,6 @@ &venus { 
};



&wcd9340 {

	pinctrl-0 = <&wcd_intr_default>;

	pinctrl-names = "default";

	clock-names = "extclk";

	clocks = <&rpmhcc RPMH_LN_BB_CLK2>;

	reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>;

arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts

+0 −10
Original line number Diff line number Diff line
@@ -617,14 +617,6 @@ sde_dsi_suspend: sde-dsi-suspend-state { 
		drive-strength = <2>;

		bias-pull-down;

	};



	wcd_intr_default: wcd-intr-default-state {

		pins = "gpio54";

		function = "gpio";

		input-enable;

		bias-pull-down;

		drive-strength = <2>;

	};

};



&uart6 {
@@ -701,8 +693,6 @@ &venus { 
};



&wcd9340 {

	pinctrl-0 = <&wcd_intr_default>;

	pinctrl-names = "default";

	clock-names = "extclk";

	clocks = <&rpmhcc RPMH_LN_BB_CLK2>;

	reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>;

arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts

+0 −11
Original line number Diff line number Diff line
@@ -629,15 +629,6 @@ i2c11_hid_active: i2c11-hid-active-state { 
		drive-strength = <2>;

	};



	wcd_intr_default: wcd-intr-default-state {

		pins = "gpio54";

		function = "gpio";



		input-enable;

		bias-pull-down;

		drive-strength = <2>;

	};



	lid_pin_active: lid-pin-state {

		pins = "gpio124";

		function = "gpio";
@@ -748,8 +739,6 @@ &venus { 
};



&wcd9340 {

	pinctrl-0 = <&wcd_intr_default>;

	pinctrl-names = "default";

	clock-names = "extclk";

	clocks = <&rpmhcc RPMH_LN_BB_CLK2>;

	reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>;