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: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230220094339.47370-1-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
index fe6c415e82297ef103263ca44aa5fbb39cd1dc45..ce189dea276071e02801755e3ace3e7cb1fd5f7d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
@@ -974,6 +974,50 @@
        };
 };
 
+&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 {
        compatible = "qcom,apq8096-sndcard";
        model = "DB820c";
@@ -1101,15 +1145,3 @@
 &venus {
        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>;
-};

diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
index 2994337c60464c4a578b0924159d20d7f06fb6f3..104deaee74e5ca88c9aa0e99d7fcaf87cacbf9e1 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
@@ -504,6 +504,50 @@
        };
 };
 
+&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 {
        status = "okay";
 };
@@ -772,15 +816,3 @@
 &venus {
        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>;
-};

diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
index 2acfed28e3cb4b662dd40a0b0b0bfe48bb244d61..446b1d23dec037a4c54b86b7f75af420109f861d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
@@ -337,6 +337,52 @@
        };
 };
 
+&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 {
        status = "okay";
 
@@ -395,20 +441,6 @@
        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 {
        regulators-0 {
                compatible = "qcom,rpm-pm8994-regulators";

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 905678e7175d8d33b5567155186d34103645ecad..293ed2e60691216b14fef9291b2b029cfa80aede 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -3383,36 +3383,8 @@
                        dma-names = "rx", "tx";
                        #address-cells = <1>;
                        #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>;
-                                       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>;
-                               };
-                       };
+                       status = "disabled";
                };
 
                adsp_pil: remoteproc@9300000 {