8 files changed, 549 insertions, 1 deletions

diff --git a/Documentation/devicetree/bindings/clock/exynos3250-clock.txt b/Documentation/devicetree/bindings/clock/exynos3250-clock.txt
index f57d9dd9ea85..f1738b88c225 100644
--- a/Documentation/devicetree/bindings/clock/exynos3250-clock.txt
+++ b/Documentation/devicetree/bindings/clock/exynos3250-clock.txt
@@ -9,6 +9,8 @@ Required Properties:
   - "samsung,exynos3250-cmu" - controller compatible with Exynos3250 SoC.
   - "samsung,exynos3250-cmu-dmc" - controller compatible with
     Exynos3250 SoC for Dynamic Memory Controller domain.
+  - "samsung,exynos3250-cmu-isp" - ISP block clock controller compatible
+     with Exynos3250 SOC
 
 - reg: physical base address of the controller and length of memory mapped
   region.
@@ -36,6 +38,12 @@ Example 1: Examples of clock controller nodes are listed below.
                 #clock-cells = <1>;
         };
 
+        cmu_isp: clock-controller@10048000 {
+                compatible = "samsung,exynos3250-cmu-isp";
+                reg = <0x10048000 0x1000>;
+                #clock-cells = <1>;
+        };
+
 Example 2: UART controller node that consumes the clock generated by the clock
            controller. Refer to the standard clock bindings for information
            about 'clocks' and 'clock-names' property.
diff --git a/Documentation/devicetree/bindings/clock/exynos5433-clock.txt b/Documentation/devicetree/bindings/clock/exynos5433-clock.txt
new file mode 100644
index 000000000000..63379b04e052
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/exynos5433-clock.txt
@@ -0,0 +1,462 @@
+* Samsung Exynos5433 CMU (Clock Management Units)
+
+The Exynos5433 clock controller generates and supplies clock to various
+controllers within the Exynos5433 SoC.
+
+Required Properties:
+
+- compatible: should be one of the following.
+  - "samsung,exynos5433-cmu-top"   - clock controller compatible for CMU_TOP
+    which generates clocks for IMEM/FSYS/G3D/GSCL/HEVC/MSCL/G2D/MFC/PERIC/PERIS
+    domains and bus clocks.
+  - "samsung,exynos5433-cmu-cpif"  - clock controller compatible for CMU_CPIF
+    which generates clocks for LLI (Low Latency Interface) IP.
+  - "samsung,exynos5433-cmu-mif"   - clock controller compatible for CMU_MIF
+    which generates clocks for DRAM Memory Controller domain.
+  - "samsung,exynos5433-cmu-peric" - clock controller compatible for CMU_PERIC
+    which generates clocks for UART/I2C/SPI/I2S/PCM/SPDIF/PWM/SLIMBUS IPs.
+  - "samsung,exynos5433-cmu-peris" - clock controller compatible for CMU_PERIS
+    which generates clocks for PMU/TMU/MCT/WDT/RTC/SECKEY/TZPC IPs.
+  - "samsung,exynos5433-cmu-fsys"  - clock controller compatible for CMU_FSYS
+    which generates clocks for USB/UFS/SDMMC/TSI/PDMA IPs.
+  - "samsung,exynos5433-cmu-g2d"   - clock controller compatible for CMU_G2D
+    which generates clocks for G2D/MDMA IPs.
+  - "samsung,exynos5433-cmu-disp"  - clock controller compatible for CMU_DISP
+    which generates clocks for Display (DECON/HDMI/DSIM/MIXER) IPs.
+  - "samsung,exynos5433-cmu-aud"   - clock controller compatible for CMU_AUD
+    which generates clocks for Cortex-A5/BUS/AUDIO clocks.
+  - "samsung,exynos5433-cmu-bus0", "samsung,exynos5433-cmu-bus1"
+    and "samsung,exynos5433-cmu-bus2" - clock controller compatible for CMU_BUS
+    which generates global data buses clock and global peripheral buses clock.
+  - "samsung,exynos5433-cmu-g3d"  - clock controller compatible for CMU_G3D
+    which generates clocks for 3D Graphics Engine IP.
+  - "samsung,exynos5433-cmu-gscl"  - clock controller compatible for CMU_GSCL
+    which generates clocks for GSCALER IPs.
+  - "samsung,exynos5433-cmu-apollo"- clock controller compatible for CMU_APOLLO
+    which generates clocks for Cortex-A53 Quad-core processor.
+  - "samsung,exynos5433-cmu-atlas" - clock controller compatible for CMU_ATLAS
+    which generates clocks for Cortex-A57 Quad-core processor, CoreSight and
+    L2 cache controller.
+  - "samsung,exynos5433-cmu-mscl" - clock controller compatible for CMU_MSCL
+    which generates clocks for M2M (Memory to Memory) scaler and JPEG IPs.
+  - "samsung,exynos5433-cmu-mfc"  - clock controller compatible for CMU_MFC
+    which generates clocks for MFC(Multi-Format Codec) IP.
+  - "samsung,exynos5433-cmu-hevc" - clock controller compatible for CMU_HEVC
+    which generates clocks for HEVC(High Efficiency Video Codec) decoder IP.
+  - "samsung,exynos5433-cmu-isp" - clock controller compatible for CMU_ISP
+    which generates clocks for FIMC-ISP/DRC/SCLC/DIS/3DNR IPs.
+  - "samsung,exynos5433-cmu-cam0" - clock controller compatible for CMU_CAM0
+    which generates clocks for MIPI_CSIS{0|1}/FIMC_LITE_{A|B|D}/FIMC_3AA{0|1}
+    IPs.
+  - "samsung,exynos5433-cmu-cam1" - clock controller compatible for CMU_CAM1
+    which generates clocks for Cortex-A5/MIPI_CSIS2/FIMC-LITE_C/FIMC-FD IPs.
+
+- reg: physical base address of the controller and length of memory mapped
+  region.
+
+- #clock-cells: should be 1.
+
+- clocks: list of the clock controller input clock identifiers,
+        from common clock bindings. Please refer the next section
+        to find the input clocks for a given controller.
+
+- clock-names: list of the clock controller input clock names,
+        as described in clock-bindings.txt.
+
+        Input clocks for top clock controller:
+                - oscclk
+                - sclk_mphy_pll
+                - sclk_mfc_pll
+                - sclk_bus_pll
+
+        Input clocks for cpif clock controller:
+                - oscclk
+
+        Input clocks for mif clock controller:
+                - oscclk
+                - sclk_mphy_pll
+
+        Input clocks for fsys clock controller:
+                - oscclk
+                - sclk_ufs_mphy
+                - div_aclk_fsys_200
+                - sclk_pcie_100_fsys
+                - sclk_ufsunipro_fsys
+                - sclk_mmc2_fsys
+                - sclk_mmc1_fsys
+                - sclk_mmc0_fsys
+                - sclk_usbhost30_fsys
+                - sclk_usbdrd30_fsys
+
+        Input clocks for g2d clock controller:
+                - oscclk
+                - aclk_g2d_266
+                - aclk_g2d_400
+
+        Input clocks for disp clock controller:
+                - oscclk
+                - sclk_dsim1_disp
+                - sclk_dsim0_disp
+                - sclk_dsd_disp
+                - sclk_decon_tv_eclk_disp
+                - sclk_decon_vclk_disp
+                - sclk_decon_eclk_disp
+                - sclk_decon_tv_vclk_disp
+                - aclk_disp_333
+
+        Input clocks for bus0 clock controller:
+                - aclk_bus0_400
+
+        Input clocks for bus1 clock controller:
+                - aclk_bus1_400
+
+        Input clocks for bus2 clock controller:
+                - oscclk
+                - aclk_bus2_400
+
+        Input clocks for g3d clock controller:
+                - oscclk
+                - aclk_g3d_400
+
+        Input clocks for gscl clock controller:
+                - oscclk
+                - aclk_gscl_111
+                - aclk_gscl_333
+
+        Input clocks for apollo clock controller:
+                - oscclk
+                - sclk_bus_pll_apollo
+
+        Input clocks for atlas clock controller:
+                - oscclk
+                - sclk_bus_pll_atlas