From 9a667b22a736284e5f7bf41f1b07df96a2b345d3 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 5 Jul 2011 09:37:55 +0000 Subject: [PATCH] --- yaml --- r: 261935 b: refs/heads/master c: 16d9856a02d6f10d42717fdc4e42567061c539f2 h: refs/heads/master i: 261933: f9609fd6e572611daf45351477d528a77f3f6b5f 261931: 2ef1671ae33bbb4d87cb9e20103246744222707f 261927: 1b9d39f13b67de11793af1e0fd83b02f499b8b1e 261919: 87896e856cd92db684e40a02f35131e887492c1c v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f96b983ecfdb..4cfbc13c2171 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2125a8a69b9909c1fa33c90fb9498a7be4a46bec +refs/heads/master: 16d9856a02d6f10d42717fdc4e42567061c539f2 diff --git a/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7723.c b/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7723.c index 55493cd5bd8f..7f708999f647 100644 --- a/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7723.c +++ b/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7723.c @@ -201,6 +201,7 @@ static struct clk mstp_clks[] = { }; #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 */ @@ -305,7 +306,7 @@ static struct clk_lookup lookups[] = { CLKDEV_CON_ID("msiof0", &mstp_clks[HWBLK_MSIOF0]), CLKDEV_CON_ID("msiof1", &mstp_clks[HWBLK_MSIOF1]), CLKDEV_CON_ID("meram0", &mstp_clks[HWBLK_MERAM]), - CLKDEV_CON_ID("i2c0", &mstp_clks[HWBLK_IIC]), + CLKDEV_DEV_ID("i2c-sh_mobile.0", &mstp_clks[HWBLK_IIC]), CLKDEV_CON_ID("rtc0", &mstp_clks[HWBLK_RTC]), CLKDEV_CON_ID("atapi0", &mstp_clks[HWBLK_ATAPI]), CLKDEV_CON_ID("adc0", &mstp_clks[HWBLK_ADC]),