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

[pandora-kernel.git] / arch / arm / boot / dts / exynos5420.dtsi

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index b3d2d53..f67b23f 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -221,7 +221,7 @@
                compatible = "samsung,exynos4210-mct";
                reg = <0x101C0000 0x800>;
                interrupt-controller;
-               #interrups-cells = <1>;
+               #interrupt-cells = <1>;
                interrupt-parent = <&mct_map>;
                interrupts = <0>, <1>, <2>, <3>, <4>, <5>, <6>, <7>,
                                <8>, <9>, <10>, <11>;
@@ -251,6 +251,8 @@
                compatible = "samsung,exynos4210-pd";
                reg = <0x10044000 0x20>;
                #power-domain-cells = <0>;
+               clocks = <&clock CLK_GSCL0>, <&clock CLK_GSCL1>;
+               clock-names = "asb0", "asb1";
        };
 
        isp_pd: power-domain@10044020 {
@@ -283,9 +285,11 @@
                         <&clock CLK_MOUT_SW_ACLK300>,
                         <&clock CLK_MOUT_USER_ACLK300_DISP1>,
                         <&clock CLK_MOUT_SW_ACLK400>,
-                        <&clock CLK_MOUT_USER_ACLK400_DISP1>;
+                        <&clock CLK_MOUT_USER_ACLK400_DISP1>,
+                        <&clock CLK_FIMD1>, <&clock CLK_MIXER>;
                clock-names = "oscclk", "pclk0", "clk0",
-                             "pclk1", "clk1", "pclk2", "clk2";
+                             "pclk1", "clk1", "pclk2", "clk2",
+                             "asb0", "asb1";
        };
 
        pinctrl_0: pinctrl@13400000 {