diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2011-07-05 11:37:02 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-07-11 08:02:02 +0200 |
| commit | 1ec353a04e76c5737e84e2e31692bf8d8840075e (patch) | |
| tree | f073331c3740da803c297510f7520b7fbe9ac6c4 /arch | |
| parent | Merge branches 'common/serial-rework' and 'sh/stable-updates' into sh-latest (diff) | |
| download | linux-1ec353a04e76c5737e84e2e31692bf8d8840075e.tar.xz linux-1ec353a04e76c5737e84e2e31692bf8d8840075e.zip | |
sh: clock-sh7724: modify I2C clock settings
I2C doesn't work without this patch on SH7724
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c index d08fa953c88b..77bcef5031eb 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c @@ -253,6 +253,7 @@ static struct clk mstp_clks[HWBLK_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 */ @@ -358,8 +359,8 @@ static struct clk_lookup lookups[] = { CLKDEV_CON_ID("msiof1", &mstp_clks[HWBLK_MSIOF1]), CLKDEV_CON_ID("keysc0", &mstp_clks[HWBLK_KEYSC]), CLKDEV_CON_ID("rtc0", &mstp_clks[HWBLK_RTC]), - CLKDEV_CON_ID("i2c0", &mstp_clks[HWBLK_IIC0]), - CLKDEV_CON_ID("i2c1", &mstp_clks[HWBLK_IIC1]), + CLKDEV_DEV_ID("i2c-sh_mobile.0", &mstp_clks[HWBLK_IIC0]), + CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[HWBLK_IIC1]), CLKDEV_CON_ID("mmc0", &mstp_clks[HWBLK_MMC]), CLKDEV_CON_ID("eth0", &mstp_clks[HWBLK_ETHER]), CLKDEV_CON_ID("atapi0", &mstp_clks[HWBLK_ATAPI]), |