projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'samsung/soc' into next/soc2
[cascardo/linux.git]
/
arch
/
arm
/
mach-s3c64xx
/
clock.c
diff --git
a/arch/arm/mach-s3c64xx/clock.c
b/arch/arm/mach-s3c64xx/clock.c
index
63f2c8a
..
52f079a
100644
(file)
--- a/
arch/arm/mach-s3c64xx/clock.c
+++ b/
arch/arm/mach-s3c64xx/clock.c
@@
-138,6
+138,11
@@
static struct clk init_clocks_off[] = {
.ctrlbit = S3C_CLKCON_PCLK_TSADC,
}, {
.name = "i2c",
+#ifdef CONFIG_S3C_DEV_I2C1
+ .devname = "s3c2440-i2c.0",
+#else
+ .devname = "s3c2440-i2c",
+#endif
.parent = &clk_p,
.enable = s3c64xx_pclk_ctrl,
.ctrlbit = S3C_CLKCON_PCLK_IIC,