sh: get rid of div6 clock names
PATCH 7/7 sh: get rid of div6 clock names
From: Magnus Damm <[email protected]>
Get rid of div6 clock names on
sh7343/sh7366/sh7722/sh7723/sh7724
Signed-off-by Magnus Damm <[email protected]>
---
arch/sh/include/asm/clock.h | 11 +++++------ arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7366.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 13 +++++-------- 6 files changed, 14 insertions(+), 18 deletions(-)
arch/sh/include/asm/clock.h +5 -6
@@ -151,12 +151,11 @@ 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) \ -{ \ - .name = _name, \ - .parent = _parent, \ - .enable_reg = (void __iomem *)_reg, \ - .flags = _flags, \ +#define SH_CLK_DIV6 (_parent, _reg, _flags) \ +{ \ + .parent = _parent, \ + .enable_reg = (void __iomem *)_reg, \ + .flags = _flags, \ }int sh_clk_div6_register (struct clk *clks,int nr);
arch/sh/kernel/cpu/sh4a/clock-sh7343.c +1 -1
@@ -139,7 +139,7 @@ struct clk div4_clks[DIV4_NR] = {enum {DIV6_V ,DIV6_NR };struct clk div6_clks[DIV6_NR ] = { - [DIV6_V ] =SH_CLK_DIV6 ("video_clk" , &pll_clk,VCLKCR ,0 ), + [DIV6_V ] =SH_CLK_DIV6 (&pll_clk,VCLKCR ,0 ), };#define MSTP (_str, _parent, _reg, _bit, _flags) \
arch/sh/kernel/cpu/sh4a/clock-sh7366.c +1 -1
@@ -142,7 +142,7 @@ struct clk div4_clks[DIV4_NR] = {enum {DIV6_V ,DIV6_NR };struct clk div6_clks[DIV6_NR ] = { - [DIV6_V ] =SH_CLK_DIV6 ("video_clk" , &pll_clk,VCLKCR ,0 ), + [DIV6_V ] =SH_CLK_DIV6 (&pll_clk,VCLKCR ,0 ), };#define MSTP (_str, _parent, _reg, _bit, _flags) \
arch/sh/kernel/cpu/sh4a/clock-sh7722.c +1 -1
@@ -152,7 +152,7 @@ struct clk div4_reparent_clks[DIV4_REPARenum {DIV6_V ,DIV6_NR };struct clk div6_clks[DIV6_NR ] = { - [DIV6_V ] =SH_CLK_DIV6 ("video_clk" , &pll_clk,VCLKCR ,0 ), + [DIV6_V ] =SH_CLK_DIV6 (&pll_clk,VCLKCR ,0 ), };static struct clk mstp_clks[HWBLK_NR ] = {
arch/sh/kernel/cpu/sh4a/clock-sh7723.c +1 -1
@@ -152,7 +152,7 @@ struct clk div4_reparent_clks[DIV4_REPARenum {DIV6_V ,DIV6_NR };struct clk div6_clks[DIV6_NR ] = { - [DIV6_V ] =SH_CLK_DIV6 ("video_clk" , &pll_clk,VCLKCR ,0 ), + [DIV6_V ] =SH_CLK_DIV6 (&pll_clk,VCLKCR ,0 ), };static struct clk mstp_clks[] = {
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 ), };static struct clk mstp_clks[HWBLK_NR ] = {