git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5pv210
/
clock.c
diff --git
a/arch/arm/mach-s5pv210/clock.c
b/arch/arm/mach-s5pv210/clock.c
index
52a8e60
..
f5f8fa8
100644
(file)
--- a/
arch/arm/mach-s5pv210/clock.c
+++ b/
arch/arm/mach-s5pv210/clock.c
@@
-815,8
+815,7
@@
static struct clksrc_clk clksrcs[] = {
.reg_div = { .reg = S5P_CLK_DIV3, .shift = 20, .size = 4 },
}, {
.clk = {
.reg_div = { .reg = S5P_CLK_DIV3, .shift = 20, .size = 4 },
}, {
.clk = {
- .name = "sclk_cam",
- .devname = "s5pv210-fimc.0",
+ .name = "sclk_cam0",
.enable = s5pv210_clk_mask0_ctrl,
.ctrlbit = (1 << 3),
},
.enable = s5pv210_clk_mask0_ctrl,
.ctrlbit = (1 << 3),
},
@@
-825,8
+824,7
@@
static struct clksrc_clk clksrcs[] = {
.reg_div = { .reg = S5P_CLK_DIV1, .shift = 12, .size = 4 },
}, {
.clk = {
.reg_div = { .reg = S5P_CLK_DIV1, .shift = 12, .size = 4 },
}, {
.clk = {
- .name = "sclk_cam",
- .devname = "s5pv210-fimc.1",
+ .name = "sclk_cam1",
.enable = s5pv210_clk_mask0_ctrl,
.ctrlbit = (1 << 4),
},
.enable = s5pv210_clk_mask0_ctrl,
.ctrlbit = (1 << 4),
},