Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e1985e1 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

sh: get rid of div6 clock names 



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

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 098ec49b

arch/sh/include/asm/clock.h

+5 −6
Original line number Diff line number Diff line
@@ -151,9 +151,8 @@ 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)	\

#define SH_CLK_DIV6(_parent, _reg, _flags)	\

{						\

	.name = _name,					\

	.parent = _parent,			\

	.enable_reg = (void __iomem *)_reg,	\

	.flags = _flags,			\

arch/sh/kernel/cpu/sh4a/clock-sh7343.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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] = {

arch/sh/kernel/cpu/sh4a/clock-sh7723.c

+1 −1
Original line number Diff line number Diff line
@@ -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[] = {