Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6sll.dtsi

diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi
index beefa1b2049d7b56476a62429c2b4e4abf65ad33..62847c68330bb835c64f6769daba5668ca8cd71f 100644 (file)
--- a/arch/arm/boot/dts/imx6sll.dtsi
+++ b/arch/arm/boot/dts/imx6sll.dtsi
@@ -593,7 +593,6 @@
                                #interrupt-cells = <3>;
                                interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
                                interrupt-parent = <&intc>;
-                               fsl,mf-mix-wakeup-irq = <0x7c00000 0x7d00 0x0 0x1400640>;
                        };
 
                        iomuxc: pinctrl@20e0000 {
@@ -770,6 +769,7 @@
                        mmdc: memory-controller@21b0000 {
                                compatible = "fsl,imx6sll-mmdc", "fsl,imx6q-mmdc";
                                reg = <0x021b0000 0x4000>;
+                               clocks = <&clks IMX6SLL_CLK_MMDC_P0_IPG>;
                        };
 
                        ocotp: ocotp-ctrl@21bc000 {