dts: rockchip: rename property 'i2s-controller' to 'audio-controller'

because we have i2s controller, spdif controller, so we use audio-controller
to include both.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

diff --git a/Documentation/devicetree/bindings/sound/rockchip-audio.txt b/Documentation/devicetree/bindings/sound/rockchip-audio.txt
index 413bfe500d13547bacda636a5c32264046909120..55025950dfef801cc983822be6018595b411bb2a 100644 (file)
--- a/Documentation/devicetree/bindings/sound/rockchip-audio.txt
+++ b/Documentation/devicetree/bindings/sound/rockchip-audio.txt
@@ -24,7 +24,7 @@ rockchip-audio {
        dais {
                dai0 {
                        audio-codec = <&codec>;
-                       i2s-controller = <&i2s>;
+                       audio-controller = <&i2s>;
                        format = "i2s";
                        //continuous-clock;
                        //bitclock-inversion;
@@ -58,7 +58,7 @@ rockchip-audio {
         dais {
                 dai0 {
                         audio-codec = <&codec>;
-                        i2s-controller = <&i2s1>;
+                        audio-controller = <&i2s1>;
                         format = "i2s";
                         //continuous-clock;
                         //bitclock-inversion;

diff --git a/arch/arm/boot/dts/rk3036-new.dts b/arch/arm/boot/dts/rk3036-new.dts
index 8ff6addfcfe6876808f8a958b97ba714a9a01d79..30ea4737b58b3af2f90b5ba14e96a69c7b5d4746 100755 (executable)
--- a/arch/arm/boot/dts/rk3036-new.dts
+++ b/arch/arm/boot/dts/rk3036-new.dts
@@ -127,7 +127,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };
@@ -138,7 +138,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };
@@ -148,7 +148,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;

diff --git a/arch/arm/boot/dts/rk3036-rk88.dts b/arch/arm/boot/dts/rk3036-rk88.dts
index cc2b5f58eb33798bd2e329f178bcf1716d31fde3..e997bcc1f608af1d98d483a974416c64c74d37c4 100755 (executable)
--- a/arch/arm/boot/dts/rk3036-rk88.dts
+++ b/arch/arm/boot/dts/rk3036-rk88.dts
@@ -124,7 +124,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };
@@ -134,7 +134,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };
@@ -144,7 +144,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;

diff --git a/arch/arm/boot/dts/rk3036-sdk.dts b/arch/arm/boot/dts/rk3036-sdk.dts
index 15a598b6abb146afe3ede3eb05b08e9f69f565f3..52ecd752509ee498fec5788ec9ace24e4a15dc80 100755 (executable)
--- a/arch/arm/boot/dts/rk3036-sdk.dts
+++ b/arch/arm/boot/dts/rk3036-sdk.dts
@@ -110,7 +110,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };
@@ -120,7 +120,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };
@@ -130,7 +130,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;

diff --git a/arch/arm/boot/dts/rk3128-box-rk88.dts b/arch/arm/boot/dts/rk3128-box-rk88.dts
index 080336f2e02b2192a4a680fd873f5056a4cc2121..4c265eee23c0a3366a3559c501e703472de42ca3 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-box-rk88.dts
+++ b/arch/arm/boot/dts/rk3128-box-rk88.dts
@@ -76,7 +76,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };

diff --git a/arch/arm/boot/dts/rk3128-box.dts b/arch/arm/boot/dts/rk3128-box.dts
index 844e0c473f8744eb818b678f1f209f05248487e1..c42731ffe9da545fee35f52ab5d1b594392f4735 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-box.dts
+++ b/arch/arm/boot/dts/rk3128-box.dts
@@ -63,7 +63,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };

diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi
index 58add870beef3d8ffef1ff5b1416f20ea108abe7..46fb32d7b5c93633f6b17105a2cc4fd50628e30d 100755 (executable)
--- a/arch/arm/boot/dts/rk312x.dtsi
+++ b/arch/arm/boot/dts/rk312x.dtsi
@@ -976,7 +976,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };
@@ -995,7 +995,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec>;
-                               i2s-controller = <&i2s1>;
+                               audio-controller = <&i2s1>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -1005,7 +1005,7 @@
                        };
                        dai1 {
                                audio-codec = <&codec>;
-                               i2s-controller = <&i2s1>;
+                               audio-controller = <&i2s1>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;

diff --git a/arch/arm/boot/dts/rk3188-lr097.dts b/arch/arm/boot/dts/rk3188-lr097.dts
index 51af9b197aa524afa27cc7f345ba7e01cc6486aa..9ca13b42739def8b9aa1fdfc65ba683a987a2371 100644 (file)
--- a/arch/arm/boot/dts/rk3188-lr097.dts
+++ b/arch/arm/boot/dts/rk3188-lr097.dts
@@ -71,7 +71,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt5631>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -87,7 +87,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rk610_codec>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -103,7 +103,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;

diff --git a/arch/arm/boot/dts/rk3188-tb.dts b/arch/arm/boot/dts/rk3188-tb.dts
index 2d8c2fc9bf76d8b3959c50b48a5b494a571013a3..ae319eb725c0931ed0a45951e9f8e27409a4f0e8 100644 (file)
--- a/arch/arm/boot/dts/rk3188-tb.dts
+++ b/arch/arm/boot/dts/rk3188-tb.dts
@@ -97,7 +97,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt5631>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -113,7 +113,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rk610_codec>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -129,7 +129,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -145,7 +145,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };

diff --git a/arch/arm/boot/dts/rk3288-chrome.dts b/arch/arm/boot/dts/rk3288-chrome.dts
index 44c622dda6ab9159f2baada88ec925fb9364e991..d50420099480d07a1999bc6dc475030ce1cc6aa7 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-chrome.dts
+++ b/arch/arm/boot/dts/rk3288-chrome.dts
@@ -92,7 +92,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -108,7 +108,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };
@@ -118,7 +118,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt5631>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -134,7 +134,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt3261>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -144,7 +144,7 @@
                        };
                        dai1 {
                                audio-codec = <&rt3261>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "dsp_a";
                                //continuous-clock;
                                bitclock-inversion;

diff --git a/arch/arm/boot/dts/rk3288-p977.dts b/arch/arm/boot/dts/rk3288-p977.dts
index a6072b0ad3bd37d8d3fa1d5ff38efba6d58e29f6..c567b687e2f90ab58fecdcaf5947146cf8c4361e 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-p977.dts
+++ b/arch/arm/boot/dts/rk3288-p977.dts
@@ -108,7 +108,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -124,7 +124,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };              
        };
@@ -134,7 +134,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt5631>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;

diff --git a/arch/arm/boot/dts/rk3288-p977_8846.dts b/arch/arm/boot/dts/rk3288-p977_8846.dts
index b092288ea96dd43fd028b813537e5380f1db7033..c36df0d7c26338ad879d9bbaceca1a71f12f1bad 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-p977_8846.dts
+++ b/arch/arm/boot/dts/rk3288-p977_8846.dts
@@ -110,7 +110,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -126,7 +126,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };              
        };
@@ -136,7 +136,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt5631>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;

diff --git a/arch/arm/boot/dts/rk3288-tb.dts b/arch/arm/boot/dts/rk3288-tb.dts
index 74e89529c61de6c828acf77e0248972ac015ffd7..71ee1bc56086653e2c66aac4b11bd4b03ba54a9b 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-tb.dts
+++ b/arch/arm/boot/dts/rk3288-tb.dts
@@ -108,7 +108,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -124,7 +124,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };
@@ -134,7 +134,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt5631>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -150,7 +150,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt3261>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -160,7 +160,7 @@
                        };
                        dai1 {
                                audio-codec = <&rt3261>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "dsp_a";
                                //continuous-clock;
                                bitclock-inversion;

diff --git a/arch/arm/boot/dts/rk3288-tb_8846.dts b/arch/arm/boot/dts/rk3288-tb_8846.dts
index e32edd8dc1368d6636ee1d35d9cc4bcf7d502eb4..230a75d6689065a00bf36a0554b9b261b35a4a15 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-tb_8846.dts
+++ b/arch/arm/boot/dts/rk3288-tb_8846.dts
@@ -120,7 +120,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -136,7 +136,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };
@@ -146,7 +146,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt5631>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -162,7 +162,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt3261>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -172,7 +172,7 @@
                        };
                        dai1 {
                                audio-codec = <&rt3261>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "dsp_a";
                                //continuous-clock;
                                bitclock-inversion;

diff --git a/arch/arm/boot/dts/rk3288-tesco.dts b/arch/arm/boot/dts/rk3288-tesco.dts
index 7abfad5762e0a7aa8ca6e226695e73731dba7ff2..50c0a14fc5b49104b641b5a620b33a76f2524890 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-tesco.dts
+++ b/arch/arm/boot/dts/rk3288-tesco.dts
@@ -92,7 +92,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -108,7 +108,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                                format = "spdif";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -124,7 +124,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt5631>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -140,7 +140,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt3261>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -150,7 +150,7 @@
                        };
                        dai1 {
                                audio-codec = <&rt3261>;
-                               i2s-controller = <&i2s>;
+                               audio-controller = <&i2s>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;

diff --git a/arch/arm64/boot/dts/rk3368-box-r88.dts b/arch/arm64/boot/dts/rk3368-box-r88.dts
index 907f0dffd92f423578d5c317fe0b6c709ed4b554..de019ed08fcbb3d4fbe3155758906296a0cb2998 100755 (executable)
--- a/arch/arm64/boot/dts/rk3368-box-r88.dts
+++ b/arch/arm64/boot/dts/rk3368-box-r88.dts
@@ -129,7 +129,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -147,7 +147,7 @@
                        dais {
                                dai0 {
                                        audio-codec = <&codec_hdmi_spdif>;
-                                       i2s-controller = <&spdif>;
+                                       audio-controller = <&spdif>;
                                };
                        };
                };
@@ -156,7 +156,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rk1000_codec>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                        };
                };
@@ -166,7 +166,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt5631>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -182,7 +182,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt3261>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -192,7 +192,7 @@
                        };
                        dai1 {
                                audio-codec = <&rt3261>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "dsp_a";
                                //continuous-clock;
                                bitclock-inversion;

diff --git a/arch/arm64/boot/dts/rk3368-box.dts b/arch/arm64/boot/dts/rk3368-box.dts
index a52821ee628c5fc63de6a5dc72fb40c339d40a0a..133e57d3c294da53c74c565e0386daea1e5836b4 100755 (executable)
--- a/arch/arm64/boot/dts/rk3368-box.dts
+++ b/arch/arm64/boot/dts/rk3368-box.dts
@@ -129,7 +129,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -147,7 +147,7 @@
                        dais {
                                dai0 {
                                        audio-codec = <&codec_hdmi_spdif>;
-                                       i2s-controller = <&spdif>;
+                                       audio-controller = <&spdif>;
                                };
                        };
                };
@@ -156,7 +156,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rk1000_codec>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                        };
                };
@@ -166,7 +166,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt5631>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -182,7 +182,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt3261>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -192,7 +192,7 @@
                        };
                        dai1 {
                                audio-codec = <&rt3261>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "dsp_a";
                                //continuous-clock;
                                bitclock-inversion;

diff --git a/arch/arm64/boot/dts/rk3368-p9_818.dts b/arch/arm64/boot/dts/rk3368-p9_818.dts
index f3032d5574035fd4b3716efa0a26c8f455bdf027..8943150c823ecc22df93b69047acb203c03c8c29 100755 (executable)
--- a/arch/arm64/boot/dts/rk3368-p9_818.dts
+++ b/arch/arm64/boot/dts/rk3368-p9_818.dts
@@ -111,7 +111,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                        };
                };
@@ -122,7 +122,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };
@@ -132,7 +132,7 @@
                 dais {
                         dai0 {
                                 audio-codec = <&es8316>;
-                                i2s-controller = <&i2s0>;
+                                audio-controller = <&i2s0>;
                                 format = "i2s";
                         };
                };

diff --git a/arch/arm64/boot/dts/rk3368-tb_8846.dts b/arch/arm64/boot/dts/rk3368-tb_8846.dts
index 59b43784404c1a29e25c5de13c2f98307cb1e18b..13c8692fdba00aba273a24cfa58d6ef7e021a52f 100644 (file)
--- a/arch/arm64/boot/dts/rk3368-tb_8846.dts
+++ b/arch/arm64/boot/dts/rk3368-tb_8846.dts
@@ -125,7 +125,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -141,7 +141,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };
@@ -151,7 +151,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt5631>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -167,7 +167,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt3261>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -177,7 +177,7 @@
                        };
                        dai1 {
                                audio-codec = <&rt3261>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "dsp_a";
                                //continuous-clock;
                                bitclock-inversion;