diff options
| author | Magnus Damm <damm@opensource.se> | 2010-05-10 10:01:22 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-10 22:48:39 -0400 |
| commit | fd30401b07fdcf21e4be87fd276d1b2c84d712a3 (patch) | |
| tree | eba1a28658d1e83e4e86c785db7cfcbe0db50d0b /arch/sh/kernel/cpu/sh4a/clock-sh7722.c | |
| parent | e4e06697977bf6731d940ab1bd84e16cb53c3ae3 (diff) | |
sh: tie in hwblk clocks using clkdev
Use clkdev for lookup of hwblk clocks on
sh7722/sh7723/sh7724.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/clock-sh7722.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c index ed57c631b09a..2a122e0d3983 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c | |||
| @@ -186,7 +186,12 @@ static struct clk mstp_clks[HWBLK_NR] = { | |||
| 186 | SH_HWBLK_CLK("lcdc0", -1, P_CLK, HWBLK_LCDC, 0), | 186 | SH_HWBLK_CLK("lcdc0", -1, P_CLK, HWBLK_LCDC, 0), |
| 187 | }; | 187 | }; |
| 188 | 188 | ||
| 189 | #define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk } | ||
| 190 | |||
| 189 | static struct clk_lookup lookups[] = { | 191 | static struct clk_lookup lookups[] = { |
| 192 | /* MSTP clocks */ | ||
| 193 | CLKDEV_CON_ID("uram0", &mstp_clks[HWBLK_URAM]), | ||
| 194 | CLKDEV_CON_ID("xymem0", &mstp_clks[HWBLK_XYMEM]), | ||
| 190 | { | 195 | { |
| 191 | /* TMU0 */ | 196 | /* TMU0 */ |
| 192 | .dev_id = "sh_tmu.0", | 197 | .dev_id = "sh_tmu.0", |
| @@ -202,7 +207,11 @@ static struct clk_lookup lookups[] = { | |||
| 202 | .dev_id = "sh_tmu.2", | 207 | .dev_id = "sh_tmu.2", |
| 203 | .con_id = "tmu_fck", | 208 | .con_id = "tmu_fck", |
| 204 | .clk = &mstp_clks[HWBLK_TMU], | 209 | .clk = &mstp_clks[HWBLK_TMU], |
| 205 | }, { | 210 | }, |
| 211 | CLKDEV_CON_ID("cmt_fck", &mstp_clks[HWBLK_CMT]), | ||
| 212 | CLKDEV_CON_ID("rwdt0", &mstp_clks[HWBLK_RWDT]), | ||
| 213 | CLKDEV_CON_ID("flctl0", &mstp_clks[HWBLK_FLCTL]), | ||
| 214 | { | ||
| 206 | /* SCIF0 */ | 215 | /* SCIF0 */ |
| 207 | .dev_id = "sh-sci.0", | 216 | .dev_id = "sh-sci.0", |
| 208 | .con_id = "sci_fck", | 217 | .con_id = "sci_fck", |
| @@ -218,6 +227,20 @@ static struct clk_lookup lookups[] = { | |||
| 218 | .con_id = "sci_fck", | 227 | .con_id = "sci_fck", |
| 219 | .clk = &mstp_clks[HWBLK_SCIF2], | 228 | .clk = &mstp_clks[HWBLK_SCIF2], |
| 220 | }, | 229 | }, |
| 230 | CLKDEV_CON_ID("i2c0", &mstp_clks[HWBLK_IIC]), | ||
| 231 | CLKDEV_CON_ID("rtc0", &mstp_clks[HWBLK_RTC]), | ||
| 232 | CLKDEV_CON_ID("sdhi0", &mstp_clks[HWBLK_SDHI]), | ||
| 233 | CLKDEV_CON_ID("keysc0", &mstp_clks[HWBLK_KEYSC]), | ||
| 234 | CLKDEV_CON_ID("usbf0", &mstp_clks[HWBLK_USBF]), | ||
| 235 | CLKDEV_CON_ID("2dg0", &mstp_clks[HWBLK_2DG]), | ||
| 236 | CLKDEV_CON_ID("siu0", &mstp_clks[HWBLK_SIU]), | ||
| 237 | CLKDEV_CON_ID("vou0", &mstp_clks[HWBLK_VOU]), | ||
| 238 | CLKDEV_CON_ID("jpu0", &mstp_clks[HWBLK_JPU]), | ||
| 239 | CLKDEV_CON_ID("beu0", &mstp_clks[HWBLK_BEU]), | ||
| 240 | CLKDEV_CON_ID("ceu0", &mstp_clks[HWBLK_CEU]), | ||
| 241 | CLKDEV_CON_ID("veu0", &mstp_clks[HWBLK_VEU]), | ||
| 242 | CLKDEV_CON_ID("vpu0", &mstp_clks[HWBLK_VPU]), | ||
| 243 | CLKDEV_CON_ID("lcdc0", &mstp_clks[HWBLK_LCDC]), | ||
| 221 | }; | 244 | }; |
| 222 | 245 | ||
| 223 | int __init arch_clk_init(void) | 246 | int __init arch_clk_init(void) |