On 22/06/2022 08:47, Yassine Oudjana wrote:
> From: Yassine Oudjana <y.oudjana@xxxxxxxxxxxxxx>
>
> Replace DAI indices in codec nodes with definitions from the WCD9335
> DT bindings for devices that use WCD9335.
>
> Signed-off-by: Yassine Oudjana <y.oudjana@xxxxxxxxxxxxxx>
> ---
> arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 5 +++--
> arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 5 +++--
> arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts | 5 +++--
> 3 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
> index 49afbb1a066a..ff915cd8e5a6 100644
> --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
> +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
> @@ -13,6 +13,7 @@
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
> #include <dt-bindings/sound/qcom,q6afe.h>
> #include <dt-bindings/sound/qcom,q6asm.h>
> +#include <dt-bindings/sound/qcom,wcd9335.h>
>
> /*
> * GPIO name legend: proper name = the GPIO line is used as GPIO
> @@ -1009,7 +1010,7 @@ platform {
> };
>
> codec {
> - sound-dai = <&wcd9335 6>;
> + sound-dai = <&wcd9335 AIF4_PB>;
> };
> };
>
> @@ -1024,7 +1025,7 @@ platform {
> };
>
> codec {
> - sound-dai = <&wcd9335 1>;
> + sound-dai = <&wcd9335 AIF1_CAP>;
> };
> };
> };
> diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
> index 22978d06f85b..261f2ea7def0 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
> @@ -9,6 +9,7 @@
> #include <dt-bindings/sound/qcom,q6afe.h>
> #include <dt-bindings/sound/qcom,q6asm.h>
> #include <dt-bindings/input/ti-drv260x.h>
> +#include <dt-bindings/sound/qcom,wcd9335.h>
Keep the order, so this goes before input (even though it is not really
alphabetical, but that's life...).
>
> / {
> model = "Xiaomi Mi 5";
> @@ -193,7 +194,7 @@ platform {
> };
>
> codec {
> - sound-dai = <&wcd9335 6>;
> + sound-dai = <&wcd9335 AIF4_PB>;
> };
> };
>
> @@ -208,7 +209,7 @@ platform {
> };
>
> codec {
> - sound-dai = <&wcd9335 1>;
> + sound-dai = <&wcd9335 AIF1_CAP>;
> };
> };
> };
> diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts
> index 1e2dd6763ad1..c9f935cfb587 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts
> @@ -9,6 +9,7 @@
> #include "pmi8996.dtsi"
> #include <dt-bindings/sound/qcom,q6afe.h>
> #include <dt-bindings/sound/qcom,q6asm.h>
> +#include <dt-bindings/sound/qcom,wcd9335.h>
>
> / {
> model = "Xiaomi Mi Note 2";
> @@ -171,7 +172,7 @@ platform {
> };
>
> codec {
> - sound-dai = <&wcd9335 6>;
> + sound-dai = <&wcd9335 AIF4_PB>;
> };
> };
>
> @@ -186,7 +187,7 @@ platform {
> };
>
> codec {
> - sound-dai = <&wcd9335 1>;
> + sound-dai = <&wcd9335 AIF1_CAP>;
> };
> };
> };
Best regards,
Krzysztof
