sh: Get rid of sh7724 div4 clock names
PATCH 10/13 sh: Get rid of sh7724 div4 clock names
From: Magnus Damm <[email protected]>
Get rid of name from common code and sh7724 div4 clocks. Obviously all div4 clocks need to be updated first.
Signed-off-by Magnus Damm <[email protected]>
---
arch/sh/include/asm/clock.h | 15 +++++++-------- arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 14 +++++++------- 2 files changed, 14 insertions(+), 15 deletions(-)
arch/sh/include/asm/clock.h +7 -8
@@ -129,14 +129,13 @@ int clk_rate_table_find(struct clk *clk,int sh_clk_mstp32_register (struct clk *clks,int nr); -#define SH_CLK_DIV4 (_name, _parent, _reg, _shift, _div_bitmap, _flags) \ -{ \ - .name = _name, \ - .parent = _parent, \ - .enable_reg = (void __iomem *)_reg, \ - .enable_bit = _shift, \ - .arch_flags = _div_bitmap, \ - .flags = _flags, \ +#define SH_CLK_DIV4 (_parent, _reg, _shift, _div_bitmap, _flags) \ +{ \ + .parent = _parent, \ + .enable_reg = (void __iomem *)_reg, \ + .enable_bit = _shift, \ + .arch_flags = _div_bitmap, \ + .flags = _flags, \ }struct clk_div4_table {
arch/sh/kernel/cpu/sh4a/clock-sh7724.c +7 -7
@@ -153,15 +153,15 @@ static struct clk_div4_table div4_tableenum {DIV4_I ,DIV4_SH ,DIV4_B ,DIV4_P ,DIV4_M1 ,DIV4_NR }; -#define DIV4 (_str, _reg, _bit, _mask, _flags) \ - SH_CLK_DIV4(_str, &pll_clk, _reg, _bit, _mask, _flags) +#define DIV4 (_reg, _bit, _mask, _flags) \ + SH_CLK_DIV4(&pll_clk, _reg, _bit, _mask, _flags)struct clk div4_clks[DIV4_NR ] = { - [DIV4_I ] =DIV4 ("cpu_clk" ,FRQCRA ,20 ,0x2f7d ,CLK_ENABLE_ON_INIT ), - [DIV4_SH ] =DIV4 ("shyway_clk" ,FRQCRA ,12 ,0x2f7c ,CLK_ENABLE_ON_INIT ), - [DIV4_B ] =DIV4 ("bus_clk" ,FRQCRA ,8 ,0x2f7c ,CLK_ENABLE_ON_INIT ), - [DIV4_P ] =DIV4 ("peripheral_clk" ,FRQCRA ,0 ,0x2f7c ,0 ), - [DIV4_M1 ] =DIV4 ("vpu_clk" ,FRQCRB ,4 ,0x2f7c ,CLK_ENABLE_ON_INIT ), + [DIV4_I ] =DIV4 (FRQCRA ,20 ,0x2f7d ,CLK_ENABLE_ON_INIT ), + [DIV4_SH ] =DIV4 (FRQCRA ,12 ,0x2f7c ,CLK_ENABLE_ON_INIT ), + [DIV4_B ] =DIV4 (FRQCRA ,8 ,0x2f7c ,CLK_ENABLE_ON_INIT ), + [DIV4_P ] =DIV4 (FRQCRA ,0 ,0x2f7c ,0 ), + [DIV4_M1 ] =DIV4 (FRQCRB ,4 ,0x2f7c ,CLK_ENABLE_ON_INIT ), };enum {DIV6_V ,DIV6_FA ,DIV6_FB ,DIV6_I ,DIV6_S ,DIV6_NR };