Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client

[cascardo/linux.git] / arch / arm / boot / dts / exynos4x12.dtsi

diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index c452499..3394bdc 100644 (file)
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -157,7 +157,9 @@
                                 <&clock CLK_MOUT_MPLL_USER_T>,
                                 <&clock CLK_FIMC_ISP>, <&clock CLK_FIMC_DRC>,
                                 <&clock CLK_FIMC_FD>, <&clock CLK_MCUISP>,
-                                <&clock CLK_DIV_ISP0>,<&clock CLK_DIV_ISP1>,
+                                <&clock CLK_GICISP>, <&clock CLK_MCUCTL_ISP>,
+                                <&clock CLK_PWM_ISP>,
+                                <&clock CLK_DIV_ISP0>, <&clock CLK_DIV_ISP1>,
                                 <&clock CLK_DIV_MCUISP0>,
                                 <&clock CLK_DIV_MCUISP1>,
                                 <&clock CLK_UART_ISP_SCLK>,
@@ -167,6 +169,7 @@
                        clock-names = "lite0", "lite1", "ppmuispx",
                                      "ppmuispmx", "mpll", "isp",
                                      "drc", "fd", "mcuisp",
+                                     "gicisp", "mcuctl_isp", "pwm_isp",
                                      "ispdiv0", "ispdiv1", "mcuispdiv0",
                                      "mcuispdiv1", "uart", "aclk200",
                                      "div_aclk200", "aclk400mcuisp",