diff options
author | Olof Johansson <olof@lixom.net> | 2014-05-29 12:37:21 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-05-29 12:37:21 -0700 |
commit | 7db76c4154a3633577903b171e3ddb484498df85 (patch) | |
tree | a4b6ef6964bd0b85e2abed6aa30832291af45269 /include/dt-bindings | |
parent | f48d5be2c3fc378e2c82d383b143128a0ca97768 (diff) | |
parent | bfed1074f213051e94648bfad0d0611a16d81366 (diff) | |
download | linux-7db76c4154a3633577903b171e3ddb484498df85.tar.gz linux-7db76c4154a3633577903b171e3ddb484498df85.tar.bz2 linux-7db76c4154a3633577903b171e3ddb484498df85.zip |
Merge tag 'samsung-clk-2' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc
Merge "Samsung 2nd clock updates for 3.16" from Kukjin Kim:
- Add missing sysmmu clocks for DISP and ISP blocks for exynos5250
* tag 'samsung-clk-2' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
clk: exynos5250: Add missing sysmmu clocks for DISP and ISP blocks
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/dt-bindings')
-rw-r--r-- | include/dt-bindings/clock/exynos5250.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/exynos5250.h b/include/dt-bindings/clock/exynos5250.h index 415d447e6e29..be6e97c54f54 100644 --- a/include/dt-bindings/clock/exynos5250.h +++ b/include/dt-bindings/clock/exynos5250.h @@ -152,6 +152,22 @@ #define CLK_SMMU_MDMA0 347 #define CLK_SSS 348 #define CLK_G3D 349 +#define CLK_SMMU_TV 350 +#define CLK_SMMU_FIMD1 351 +#define CLK_SMMU_2D 352 +#define CLK_SMMU_FIMC_ISP 353 +#define CLK_SMMU_FIMC_DRC 354 +#define CLK_SMMU_FIMC_SCC 355 +#define CLK_SMMU_FIMC_SCP 356 +#define CLK_SMMU_FIMC_FD 357 +#define CLK_SMMU_FIMC_MCU 358 +#define CLK_SMMU_FIMC_ODC 359 +#define CLK_SMMU_FIMC_DIS0 360 +#define CLK_SMMU_FIMC_DIS1 361 +#define CLK_SMMU_FIMC_3DNR 362 +#define CLK_SMMU_FIMC_LITE0 363 +#define CLK_SMMU_FIMC_LITE1 364 +#define CLK_CAMIF_TOP 365 /* mux clocks */ #define CLK_MOUT_HDMI 1024 |