Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3188-lr097.dts

diff --git a/arch/arm/boot/dts/rk3188-lr097.dts b/arch/arm/boot/dts/rk3188-lr097.dts
index cc1e7ac6756d0a84b68b71f82db81e99aad5c42f..9ca13b42739def8b9aa1fdfc65ba683a987a2371 100644 (file)
--- a/arch/arm/boot/dts/rk3188-lr097.dts
+++ b/arch/arm/boot/dts/rk3188-lr097.dts
@@ -1,10 +1,8 @@
 /dts-v1/;
 
 #include "rk3188.dtsi"
-#include "rk3188-clocks.dtsi"
 #include "lcd-LP097Qx1.dtsi"
-#include "rk3188-mmc.dtsi"
-#include <dt-bindings/clock/ddr.h>
+
 / {
        memory {
                device_type = "memory";
@@ -73,7 +71,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rt5631>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -89,7 +87,7 @@
                dais {
                        dai0 {
                                audio-codec = <&rk610_codec>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;
@@ -105,7 +103,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                                //continuous-clock;
                                //bitclock-inversion;