diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-17 07:22:50 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-17 07:22:50 -0400 |
| commit | 8eb41582d2106eccc7717047d1184481f5a1b3a6 (patch) | |
| tree | 12257bbe39b5c8ae6918198fde682ed0aacd8e00 /arch/arm/mach-exynos4/clock.c | |
| parent | 127d4eb97b7bebc15fd692603263e75c220e24f9 (diff) | |
| parent | 1cb17e2dbd09436069733500ea48e0c9b1f0a1cc (diff) | |
Merge branch 'ep93xx/board' into next/board
Diffstat (limited to 'arch/arm/mach-exynos4/clock.c')
| -rw-r--r-- | arch/arm/mach-exynos4/clock.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-exynos4/clock.c b/arch/arm/mach-exynos4/clock.c index 2a037cc221d0..0d59be3fa1fe 100644 --- a/arch/arm/mach-exynos4/clock.c +++ b/arch/arm/mach-exynos4/clock.c | |||
| @@ -948,8 +948,7 @@ static struct clksrc_clk clksrcs[] = { | |||
| 948 | .reg_div = { .reg = S5P_CLKDIV_CAM, .shift = 28, .size = 4 }, | 948 | .reg_div = { .reg = S5P_CLKDIV_CAM, .shift = 28, .size = 4 }, |
| 949 | }, { | 949 | }, { |
| 950 | .clk = { | 950 | .clk = { |
| 951 | .name = "sclk_cam", | 951 | .name = "sclk_cam0", |
| 952 | .devname = "exynos4-fimc.0", | ||
| 953 | .enable = exynos4_clksrc_mask_cam_ctrl, | 952 | .enable = exynos4_clksrc_mask_cam_ctrl, |
| 954 | .ctrlbit = (1 << 16), | 953 | .ctrlbit = (1 << 16), |
| 955 | }, | 954 | }, |
| @@ -958,8 +957,7 @@ static struct clksrc_clk clksrcs[] = { | |||
| 958 | .reg_div = { .reg = S5P_CLKDIV_CAM, .shift = 16, .size = 4 }, | 957 | .reg_div = { .reg = S5P_CLKDIV_CAM, .shift = 16, .size = 4 }, |
| 959 | }, { | 958 | }, { |
| 960 | .clk = { | 959 | .clk = { |
| 961 | .name = "sclk_cam", | 960 | .name = "sclk_cam1", |
| 962 | .devname = "exynos4-fimc.1", | ||
| 963 | .enable = exynos4_clksrc_mask_cam_ctrl, | 961 | .enable = exynos4_clksrc_mask_cam_ctrl, |
| 964 | .ctrlbit = (1 << 20), | 962 | .ctrlbit = (1 << 20), |
| 965 | }, | 963 | }, |