Merge tag 'powerpc-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

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

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 878c979203d09ea403577317e3211e85329303fe..074147cebae49f965b254915240b667bffcf9d21 100644 (file)
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -661,6 +661,7 @@
                        reg = <0x4a0f4000 0x200>;
                        interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
                        ti,hwmods = "mailbox";
+                       #mbox-cells = <1>;
                        ti,mbox-num-users = <3>;
                        ti,mbox-num-fifos = <8>;
                        mbox_ipu: mbox_ipu {
@@ -895,7 +896,7 @@
                                reg = <0x58002000 0x1000>;
                                status = "disabled";
                                ti,hwmods = "dss_rfbi";
-                               clocks = <&dss_dss_clk>, <&dss_fck>;
+                               clocks = <&dss_dss_clk>, <&l3_div_ck>;
                                clock-names = "fck", "ick";
                        };