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

arm64: dts: qcom: msm8996: move WCD9335 audio codec to boards 



The WCD9335 audio codec on Slimbus is a property of a board, not SoC,
thus it should not be present in MSM8996 DTSI.  Keep it in specific
boards, so it won't appear incomplete in the boards not having it.

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/20230220094339.47370-1-krzysztof.kozlowski@linaro.org
parent 78c61b6b

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

+44 −12
Original line number Original line Diff line number Diff line
@@ -974,6 +974,50 @@ dai@2 { 
	};

	};

};

};





&slim_msm {

	status = "okay";



	slim@1 {

		reg = <1>;

		#address-cells = <2>;

		#size-cells = <0>;



		tasha_ifd: tas-ifd@0,0 {

			compatible = "slim217,1a0";

			reg = <0 0>;

		};



		wcd9335: codec@1,0 {

			compatible = "slim217,1a0";

			reg = <1 0>;



			clock-names = "mclk", "slimbus";

			clocks = <&div1_mclk>,

				 <&rpmcc RPM_SMD_BB_CLK1>;

			interrupt-parent = <&tlmm>;

			interrupts = <54 IRQ_TYPE_LEVEL_HIGH>,

				     <53 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "intr1", "intr2";

			interrupt-controller;

			#interrupt-cells = <1>;



			pinctrl-0 = <&cdc_reset_active &wcd_intr_default>;

			pinctrl-names = "default";



			reset-gpios = <&tlmm 64 GPIO_ACTIVE_LOW>;

			slim-ifc-dev = <&tasha_ifd>;



			#sound-dai-cells = <1>;



			vdd-buck-supply = <&vreg_s4a_1p8>;

			vdd-buck-sido-supply = <&vreg_s4a_1p8>;

			vdd-tx-supply = <&vreg_s4a_1p8>;

			vdd-rx-supply = <&vreg_s4a_1p8>;

			vdd-io-supply = <&vreg_s4a_1p8>;

		};

	};

};



&sound {

&sound {

	compatible = "qcom,apq8096-sndcard";

	compatible = "qcom,apq8096-sndcard";

	model = "DB820c";

	model = "DB820c";
@@ -1101,15 +1145,3 @@ &usb3phy { 
&venus {

&venus {

	status = "okay";

	status = "okay";

};
 
};
 


&wcd9335 {

	clock-names = "mclk", "slimbus";

	clocks = <&div1_mclk>,

		 <&rpmcc RPM_SMD_BB_CLK1>;



	vdd-buck-supply = <&vreg_s4a_1p8>;

	vdd-buck-sido-supply = <&vreg_s4a_1p8>;

	vdd-tx-supply = <&vreg_s4a_1p8>;

	vdd-rx-supply = <&vreg_s4a_1p8>;

	vdd-io-supply = <&vreg_s4a_1p8>;

};

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

+44 −12
Original line number Original line Diff line number Diff line
@@ -504,6 +504,50 @@ vreg_l32a_1p8: l32 { 
	};

	};

};

};





&slim_msm {

	status = "okay";



	slim@1 {

		reg = <1>;

		#address-cells = <2>;

		#size-cells = <0>;



		tasha_ifd: tas-ifd@0,0 {

			compatible = "slim217,1a0";

			reg = <0 0>;

		};



		wcd9335: codec@1,0 {

			compatible = "slim217,1a0";

			reg = <1 0>;



			clock-names = "mclk", "slimbus";

			clocks = <&div1_mclk>,

				 <&rpmcc RPM_SMD_BB_CLK1>;

			interrupt-parent = <&tlmm>;

			interrupts = <54 IRQ_TYPE_LEVEL_HIGH>,

				     <53 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "intr1", "intr2";

			interrupt-controller;

			#interrupt-cells = <1>;



			pinctrl-0 = <&cdc_reset_active &wcd_intr_default>;

			pinctrl-names = "default";



			reset-gpios = <&tlmm 64 GPIO_ACTIVE_LOW>;

			slim-ifc-dev = <&tasha_ifd>;



			#sound-dai-cells = <1>;



			vdd-buck-supply = <&vreg_s4a_1p8>;

			vdd-buck-sido-supply = <&vreg_s4a_1p8>;

			vdd-tx-supply = <&vreg_s4a_1p8>;

			vdd-rx-supply = <&vreg_s4a_1p8>;

			vdd-io-supply = <&vreg_s4a_1p8>;

		};

	};

};



&slpi_pil {

&slpi_pil {

	status = "okay";

	status = "okay";

};

};
@@ -772,15 +816,3 @@ &usb3_dwc3 { 
&venus {

&venus {

	status = "okay";

	status = "okay";

};
 
};
 


&wcd9335 {

	clock-names = "mclk", "slimbus";

	clocks = <&div1_mclk>,

		 <&rpmcc RPM_SMD_BB_CLK1>;



	vdd-buck-supply = <&vreg_s4a_1p8>;

	vdd-buck-sido-supply = <&vreg_s4a_1p8>;

	vdd-tx-supply = <&vreg_s4a_1p8>;

	vdd-rx-supply = <&vreg_s4a_1p8>;

	vdd-io-supply = <&vreg_s4a_1p8>;

};

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

+46 −14
Original line number Original line Diff line number Diff line
@@ -337,6 +337,52 @@ led@3 { 
	};

	};

};

};





&slim_msm {

	status = "okay";



	slim@1 {

		reg = <1>;

		#address-cells = <2>;

		#size-cells = <0>;



		tasha_ifd: tas-ifd@0,0 {

			compatible = "slim217,1a0";

			reg = <0 0>;

		};



		wcd9335: codec@1,0 {

			compatible = "slim217,1a0";

			reg = <1 0>;



			clock-names = "mclk", "slimbus";

			clocks = <&divclk1_cdc>,

				 <&rpmcc RPM_SMD_BB_CLK1>;

			interrupt-parent = <&tlmm>;

			interrupts = <54 IRQ_TYPE_LEVEL_HIGH>,

				     <53 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "intr1", "intr2";

			interrupt-controller;

			#interrupt-cells = <1>;



			pinctrl-0 = <&cdc_reset_active &wcd_intr_default>;

			pinctrl-names = "default";



			reset-gpios = <&tlmm 64 GPIO_ACTIVE_LOW>;

			slim-ifc-dev = <&tasha_ifd>;



			#sound-dai-cells = <1>;



			vdd-buck-supply = <&vreg_s4a_1p8>;

			vdd-buck-sido-supply = <&vreg_s4a_1p8>;

			vdd-rx-supply = <&vreg_s4a_1p8>;

			vdd-tx-supply = <&vreg_s4a_1p8>;

			vdd-vbat-supply = <&vph_pwr>;

			vdd-micbias-supply = <&vph_pwr_bbyp>;

			vdd-io-supply = <&vreg_s4a_1p8>;

		};

	};

};



&slpi_pil {

&slpi_pil {

	status = "okay";

	status = "okay";
@@ -395,20 +441,6 @@ &venus { 
	status = "okay";

	status = "okay";

};

};





&wcd9335 {

	clock-names = "mclk", "slimbus";

	clocks = <&divclk1_cdc>,

		 <&rpmcc RPM_SMD_BB_CLK1>;



	vdd-buck-supply = <&vreg_s4a_1p8>;

	vdd-buck-sido-supply = <&vreg_s4a_1p8>;

	vdd-rx-supply = <&vreg_s4a_1p8>;

	vdd-tx-supply = <&vreg_s4a_1p8>;

	vdd-vbat-supply = <&vph_pwr>;

	vdd-micbias-supply = <&vph_pwr_bbyp>;

	vdd-io-supply = <&vreg_s4a_1p8>;

};



&rpm_requests {

&rpm_requests {

	regulators-0 {

	regulators-0 {

		compatible = "qcom,rpm-pm8994-regulators";

		compatible = "qcom,rpm-pm8994-regulators";

arch/arm64/boot/dts/qcom/msm8996.dtsi

+1 −29
Original line number Original line Diff line number Diff line
@@ -3383,36 +3383,8 @@ slim_msm: slim-ngd@91c0000 { 
			dma-names = "rx", "tx";

			dma-names = "rx", "tx";

			#address-cells = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			#size-cells = <0>;

			slim@1 {

				reg = <1>;

				#address-cells = <2>;

				#size-cells = <0>;



				tasha_ifd: tas-ifd@0,0 {

					compatible = "slim217,1a0";

					reg = <0 0>;

				};



				wcd9335: codec@1,0 {

					pinctrl-0 = <&cdc_reset_active &wcd_intr_default>;

					pinctrl-names = "default";



					compatible = "slim217,1a0";

					reg = <1 0>;





					interrupt-parent = <&tlmm>;

			status = "disabled";

					interrupts = <54 IRQ_TYPE_LEVEL_HIGH>,

						     <53 IRQ_TYPE_LEVEL_HIGH>;

					interrupt-names = "intr1", "intr2";

					interrupt-controller;

					#interrupt-cells = <1>;

					reset-gpios = <&tlmm 64 GPIO_ACTIVE_LOW>;



					slim-ifc-dev = <&tasha_ifd>;



					#sound-dai-cells = <1>;

				};

			};

		};

		};





		adsp_pil: remoteproc@9300000 {

		adsp_pil: remoteproc@9300000 {