Merge tag 'sound-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / imx27-phytec-phycore-som.dtsi

diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
index 31e9f7049f73351f325c3e58b1fb6e4e116763df..b4e955e3be8d26deae9a68364b2952b7fccd8f71 100644 (file)
--- a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
@@ -51,7 +51,7 @@
                        compatible = "usb-nop-xceiv";
                        reg = <0>;
                        vcc-supply = <&sw3_reg>;
-                       clocks = <&clks 0>;
+                       clocks = <&clks IMX27_CLK_DUMMY>;
                        clock-names = "main_clk";
                };
        };
@@ -310,7 +310,6 @@
 &ssi1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_ssi1>;
-       fsl,mode = "i2s-slave";
        status = "okay";
 };