summaryrefslogtreecommitdiff
path: root/arch/sh
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2011-07-05 09:38:09 +0000
committerPaul Mundt <lethal@linux-sh.org>2011-07-11 15:02:18 +0900
commit36d1753ac124cb1bf7b8f6856b35489bf45a2f86 (patch)
tree5427bfc1b8b2d6d8ab26ce340e94586ac5fd9378 /arch/sh
parent16d9856a02d6f10d42717fdc4e42567061c539f2 (diff)
downloadlinux-3.10-36d1753ac124cb1bf7b8f6856b35489bf45a2f86.tar.gz
linux-3.10-36d1753ac124cb1bf7b8f6856b35489bf45a2f86.tar.bz2
linux-3.10-36d1753ac124cb1bf7b8f6856b35489bf45a2f86.zip
sh: clock-sh7343: modify I2C clock settings
I2C doesn't work without this patch on SH7343 Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7343.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
index 93c646072c1..a6d134857ec 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
@@ -195,6 +195,7 @@ static struct clk mstp_clks[MSTP_NR] = {
};
#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
+#define CLKDEV_DEV_ID(_id, _clk) { .dev_id = _id, .clk = _clk }
static struct clk_lookup lookups[] = {
/* main clocks */
@@ -257,8 +258,8 @@ static struct clk_lookup lookups[] = {
CLKDEV_CON_ID("sio0", &mstp_clks[MSTP003]),
CLKDEV_CON_ID("siof0", &mstp_clks[MSTP002]),
CLKDEV_CON_ID("siof1", &mstp_clks[MSTP001]),
- CLKDEV_CON_ID("i2c0", &mstp_clks[MSTP109]),
- CLKDEV_CON_ID("i2c1", &mstp_clks[MSTP108]),
+ CLKDEV_DEV_ID("i2c-sh_mobile.0", &mstp_clks[MSTP109]),
+ CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[MSTP108]),
CLKDEV_CON_ID("tpu0", &mstp_clks[MSTP225]),
CLKDEV_CON_ID("irda0", &mstp_clks[MSTP224]),
CLKDEV_CON_ID("sdhi0", &mstp_clks[MSTP218]),