Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / imx6qdl-sabresd.dtsi

diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 05f5ff75c0ea6cee5c5e541a1c126206321c1f7d..f1cd2147421d2e0f82e2a921cc5c449d8ff6d1b4 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -107,10 +107,8 @@
                        "Headphone Jack", "HPOUTR",
                        "Ext Spk", "SPKOUTL",
                        "Ext Spk", "SPKOUTR",
-                       "MICBIAS", "AMIC",
-                       "IN3R", "MICBIAS",
-                       "DMIC", "MICBIAS",
-                       "DMICDAT", "DMIC";
+                       "AMIC", "MICBIAS",
+                       "IN3R", "AMIC";
                mux-int-port = <2>;
                mux-ext-port = <3>;
        };
@@ -179,7 +177,7 @@
        codec: wm8962@1a {
                compatible = "wlf,wm8962";
                reg = <0x1a>;
-               clocks = <&clks 201>;
+               clocks = <&clks IMX6QDL_CLK_CKO>;
                DCVDD-supply = <&reg_audio>;
                DBVDD-supply = <&reg_audio>;
                AVDD-supply = <&reg_audio>;