Merge tag 'lzo-update-signature-20130226' of git://github.com/markus-oberhumer/linux

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / arm / mach-exynos / clock-exynos4212.c

diff --git a/arch/arm/mach-exynos/clock-exynos4212.c b/arch/arm/mach-exynos/clock-exynos4212.c
index 8fba0b5fb8ab895d6ef8c65b0aec576a6ad650df..529476f8ec71280c4e9014c167da4a1b1df5e8d7 100644 (file)
--- a/arch/arm/mach-exynos/clock-exynos4212.c
+++ b/arch/arm/mach-exynos/clock-exynos4212.c
@@ -26,7 +26,6 @@
 #include <mach/hardware.h>
 #include <mach/map.h>
 #include <mach/regs-clock.h>
-#include <mach/sysmmu.h>
 
 #include "common.h"
 #include "clock-exynos4.h"
@@ -111,20 +110,30 @@ static struct clksrc_clk clksrcs[] = {
 
 static struct clk init_clocks_off[] = {
        {
-               .name           = SYSMMU_CLOCK_NAME,
-               .devname        = SYSMMU_CLOCK_DEVNAME(2d, 14),
+               .name           = "sysmmu",
+               .devname        = "exynos-sysmmu.9",
                .enable         = exynos4_clk_ip_dmc_ctrl,
                .ctrlbit        = (1 << 24),
        }, {
-               .name           = SYSMMU_CLOCK_NAME,
-               .devname        = SYSMMU_CLOCK_DEVNAME(isp, 9),
+               .name           = "sysmmu",
+               .devname        = "exynos-sysmmu.12",
                .enable         = exynos4212_clk_ip_isp0_ctrl,
                .ctrlbit        = (7 << 8),
        }, {
-               .name           = SYSMMU_CLOCK_NAME2,
-               .devname        = SYSMMU_CLOCK_DEVNAME(isp, 9),
+               .name           = "sysmmu",
+               .devname        = "exynos-sysmmu.13",
                .enable         = exynos4212_clk_ip_isp1_ctrl,
                .ctrlbit        = (1 << 4),
+       }, {
+               .name           = "sysmmu",
+               .devname        = "exynos-sysmmu.14",
+               .enable         = exynos4212_clk_ip_isp0_ctrl,
+               .ctrlbit        = (1 << 11),
+       }, {
+               .name           = "sysmmu",
+               .devname        = "exynos-sysmmu.15",
+               .enable         = exynos4212_clk_ip_isp0_ctrl,
+               .ctrlbit        = (1 << 12),
        }, {
                .name           = "flite",
                .devname        = "exynos-fimc-lite.0",