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

Commit 4a81fe62 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

sh: switch sh7785 to clkdev 



This patch converts the remaining sh7785 clocks
to use clkdev for lookup. The now unused name
and id from struct clk are also removed.

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

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -24,8 +24,6 @@ 
 * from the platform code.

 * from the platform code.

 */

 */

static struct clk extal_clk = {

static struct clk extal_clk = {

	.name		= "extal",

	.id		= -1,

	.rate		= 33333333,

	.rate		= 33333333,

};

};
@@ -43,8 +41,6 @@ static struct clk_ops pll_clk_ops = { 
};

};





static struct clk pll_clk = {

static struct clk pll_clk = {

	.name		= "pll_clk",

	.id		= -1,

	.ops		= &pll_clk_ops,

	.ops		= &pll_clk_ops,

	.parent		= &extal_clk,

	.parent		= &extal_clk,

	.flags		= CLK_ENABLE_ON_INIT,

	.flags		= CLK_ENABLE_ON_INIT,
@@ -123,6 +119,10 @@ static struct clk mstp_clks[MSTP_NR] = { 
#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }

#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }





static struct clk_lookup lookups[] = {

static struct clk_lookup lookups[] = {

	/* main clocks */

	CLKDEV_CON_ID("extal", &extal_clk),

	CLKDEV_CON_ID("pll_clk", &pll_clk),



	/* DIV4 clocks */

	/* DIV4 clocks */

	CLKDEV_CON_ID("peripheral_clk", &div4_clks[DIV4_P]),

	CLKDEV_CON_ID("peripheral_clk", &div4_clks[DIV4_P]),

	CLKDEV_CON_ID("du_clk", &div4_clks[DIV4_DU]),

	CLKDEV_CON_ID("du_clk", &div4_clks[DIV4_DU]),