sh: Get rid of sh7724 div6 clock names
PATCH 8/13 sh: Get rid of sh7724 div6 clock names
From: Magnus Damm <[email protected]>
Get rid of the name from the sh7724 div6 clocks. The div6 clocks for all processors must be updated before this can be applied.
Signed-off-by Magnus Damm <[email protected]>
---
arch/sh/include/asm/clock.h | 3 +-- arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 13 +++++-------- 2 files changed, 6 insertions(+), 10 deletions(-)
arch/sh/include/asm/clock.h +1 -2
@@ -151,9 +151,8 @@ int sh_clk_div4_enable_register(struct cint sh_clk_div4_reparent_register (struct clk *clks,int nr,struct clk_div4_table *table); -#define SH_CLK_DIV6 (_name, _parent, _reg, _flags) \ +#define SH_CLK_DIV6 (_parent, _reg, _flags) \ { \ - .name = _name, \ .parent = _parent, \ .enable_reg = (void __iomem *)_reg, \ .flags = _flags, \
arch/sh/kernel/cpu/sh4a/clock-sh7724.c +5 -8
@@ -166,15 +166,12 @@ struct clk div4_clks[DIV4_NR] = {enum {DIV6_V ,DIV6_FA ,DIV6_FB ,DIV6_I ,DIV6_S ,DIV6_NR }; -#define DIV6 (_str, _reg, _flags) \ - SH_CLK_DIV6(_str, &div3_clk, _reg, _flags) -struct clk div6_clks[DIV6_NR ] = { - [DIV6_V ] =DIV6 ("video_clk" ,VCLKCR ,0 ), - [DIV6_FA ] =DIV6 ("fsia_clk" ,FCLKACR ,0 ), - [DIV6_FB ] =DIV6 ("fsib_clk" ,FCLKBCR ,0 ), - [DIV6_I ] =DIV6 ("irda_clk" ,IRDACLKCR ,0 ), - [DIV6_S ] =DIV6 ("spu_clk" ,SPUCLKCR ,CLK_ENABLE_ON_INIT ), + [DIV6_V ] =SH_CLK_DIV6 (&div3_clk,VCLKCR ,0 ), + [DIV6_FA ] =SH_CLK_DIV6 (&div3_clk,FCLKACR ,0 ), + [DIV6_FB ] =SH_CLK_DIV6 (&div3_clk,FCLKBCR ,0 ), + [DIV6_I ] =SH_CLK_DIV6 (&div3_clk,IRDACLKCR ,0 ), + [DIV6_S ] =SH_CLK_DIV6 (&div3_clk,SPUCLKCR ,CLK_ENABLE_ON_INIT ), };#define R_CLK (&r_clk)