diff options
| author | Magnus Damm <damm@opensource.se> | 2010-05-11 03:06:13 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 04:35:05 -0400 |
| commit | 914ebf0bbb24696cd7eecee8942efecca5653126 (patch) | |
| tree | 5ca384ba927ada56c6a3462977dc6268d6f72b16 /arch/sh/kernel/cpu/sh4a/clock-sh7366.c | |
| parent | 1fe3d19883b1f6a243b03456a47e0fdc9629bea6 (diff) | |
sh: get rid of div4 clock name
Remove the name parameter from SH_CLK_DIV4() and
adjust the processor specific code. The lookup
happens using clkdev so the name is unused.
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-sh7366.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/clock-sh7366.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7366.c b/arch/sh/kernel/cpu/sh4a/clock-sh7366.c index 35290b8be2a7..4c3a5a583012 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7366.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7366.c | |||
| @@ -125,18 +125,18 @@ static struct clk_div4_table div4_table = { | |||
| 125 | enum { DIV4_I, DIV4_U, DIV4_SH, DIV4_B, DIV4_B3, DIV4_P, | 125 | enum { DIV4_I, DIV4_U, DIV4_SH, DIV4_B, DIV4_B3, DIV4_P, |
| 126 | DIV4_SIUA, DIV4_SIUB, DIV4_NR }; | 126 | DIV4_SIUA, DIV4_SIUB, DIV4_NR }; |
| 127 | 127 | ||
| 128 | #define DIV4(_str, _reg, _bit, _mask, _flags) \ | 128 | #define DIV4(_reg, _bit, _mask, _flags) \ |
| 129 | SH_CLK_DIV4(_str, &pll_clk, _reg, _bit, _mask, _flags) | 129 | SH_CLK_DIV4(&pll_clk, _reg, _bit, _mask, _flags) |
| 130 | 130 | ||
| 131 | struct clk div4_clks[DIV4_NR] = { | 131 | struct clk div4_clks[DIV4_NR] = { |
| 132 | [DIV4_I] = DIV4("cpu_clk", FRQCR, 20, 0x1fef, CLK_ENABLE_ON_INIT), | 132 | [DIV4_I] = DIV4(FRQCR, 20, 0x1fef, CLK_ENABLE_ON_INIT), |
| 133 | [DIV4_U] = DIV4("umem_clk", FRQCR, 16, 0x1fff, CLK_ENABLE_ON_INIT), | 133 | [DIV4_U] = DIV4(FRQCR, 16, 0x1fff, CLK_ENABLE_ON_INIT), |
| 134 | [DIV4_SH] = DIV4("shyway_clk", FRQCR, 12, 0x1fff, CLK_ENABLE_ON_INIT), | 134 | [DIV4_SH] = DIV4(FRQCR, 12, 0x1fff, CLK_ENABLE_ON_INIT), |
| 135 | [DIV4_B] = DIV4("bus_clk", FRQCR, 8, 0x1fff, CLK_ENABLE_ON_INIT), | 135 | [DIV4_B] = DIV4(FRQCR, 8, 0x1fff, CLK_ENABLE_ON_INIT), |
| 136 | [DIV4_B3] = DIV4("b3_clk", FRQCR, 4, 0x1fff, CLK_ENABLE_ON_INIT), | 136 | [DIV4_B3] = DIV4(FRQCR, 4, 0x1fff, CLK_ENABLE_ON_INIT), |
| 137 | [DIV4_P] = DIV4("peripheral_clk", FRQCR, 0, 0x1fff, 0), | 137 | [DIV4_P] = DIV4(FRQCR, 0, 0x1fff, 0), |
| 138 | [DIV4_SIUA] = DIV4("siua_clk", SCLKACR, 0, 0x1fff, 0), | 138 | [DIV4_SIUA] = DIV4(SCLKACR, 0, 0x1fff, 0), |
| 139 | [DIV4_SIUB] = DIV4("siub_clk", SCLKBCR, 0, 0x1fff, 0), | 139 | [DIV4_SIUB] = DIV4(SCLKBCR, 0, 0x1fff, 0), |
| 140 | }; | 140 | }; |
| 141 | 141 | ||
| 142 | enum { DIV6_V, DIV6_NR }; | 142 | enum { DIV6_V, DIV6_NR }; |