sh: get rid of div6 clock names

Get rid of div6 clock names on
sh7343/sh7366/sh7722/sh7723/sh7724

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/include/asm/clock.h b/arch/sh/include/asm/clock.h
index 4b19179230fec096cc3e133924ef7e328f29c58e..405a12c0996091b3152c4b27f67a34b6e2955cef 100644 (file)
--- a/arch/sh/include/asm/clock.h
+++ b/arch/sh/include/asm/clock.h
@@ -151,12 +151,11 @@ int sh_clk_div4_enable_register(struct clk *clks, int nr,
 int 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);

diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
index 9e4992a08e5132945f9c81f8832817295d3c6d42..a066c438b404654259c3e55b8cbd21cf4b77c6e0 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
@@ -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) \

diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7366.c b/arch/sh/kernel/cpu/sh4a/clock-sh7366.c
index 4eeeb240823e7a6e96a89cdf9980e2e8e5d1adae..44cc5a0965d995ff91984658ac6d0c1f18edede1 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7366.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7366.c
@@ -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) \

diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
index d8a7ad8a83b3c819378fb033da71a9fb5750cd86..2798ceaa648f28751ea485cd5817049612afaec6 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
@@ -152,7 +152,7 @@ struct clk div4_reparent_clks[DIV4_REPARENT_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),
 };
 
 static struct clk mstp_clks[HWBLK_NR] = {

diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7723.c b/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
index edb2414896b15f7df9464aae30a094f80f9f0442..500715f7814284e7217cc68598fd5ba4181cfdd2 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
@@ -152,7 +152,7 @@ struct clk div4_reparent_clks[DIV4_REPARENT_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),
 };
 
 static struct clk mstp_clks[] = {

diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
index ad57c007b05c70d654bc4564b6c9807d24ae165b..2bbff53fcd871390747eb52d624d3908a2b11ff6 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
@@ -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] = {