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

Commit 9ee8008e authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Simon Horman
Browse files

ARM: shmobile: sh7372: sh7372_fsidivX_clk become non-global 



Not only sh7372 but also many Renesas chip has FSI-DIV clock,
and we can share its sh_clk_ops.
To support common FSI-DIV clock, sh7372_fsidivX_clk
becomes non-global by this patch.
This is preparation for FSI DT support.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 9d626ecc

arch/arm/mach-shmobile/board-ap4evb.c

+1 −1
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ static int fsi_ak4642_set_rate(struct device *dev, int rate, int enable) 
static int fsi_hdmi_set_rate(struct device *dev, int rate, int enable)

{

	struct clk *fsib_clk;

	struct clk *fdiv_clk = &sh7372_fsidivb_clk;

	struct clk *fdiv_clk = clk_get(NULL, "fsidivb");

	long fsib_rate = 0;

	long fdiv_rate = 0;

	int ackmd_bpfmd;

arch/arm/mach-shmobile/board-mackerel.c

+1 −1
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ static int __fsi_set_round_rate(struct clk *clk, long rate, int enable) 
static int fsi_b_set_rate(struct device *dev, int rate, int enable)

{

	struct clk *fsib_clk;

	struct clk *fdiv_clk = &sh7372_fsidivb_clk;

	struct clk *fdiv_clk = clk_get(NULL, "fsidivb");

	long fsib_rate = 0;

	long fdiv_rate = 0;

	int ackmd_bpfmd;

arch/arm/mach-shmobile/clock-sh7372.c

+6 −4
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ static struct clk_mapping fsidiva_clk_mapping = { 
	.len	= 8,

};



struct clk sh7372_fsidiva_clk = {

static struct clk fsidiva_clk = {

	.ops		= &fsidiv_clk_ops,

	.parent		= &div6_reparent_clks[DIV6_FSIA], /* late install */

	.mapping	= &fsidiva_clk_mapping,
@@ -492,15 +492,15 @@ static struct clk_mapping fsidivb_clk_mapping = { 
	.len	= 8,

};



struct clk sh7372_fsidivb_clk = {

static struct clk fsidivb_clk = {

	.ops		= &fsidiv_clk_ops,

	.parent		= &div6_reparent_clks[DIV6_FSIB],  /* late install */

	.mapping	= &fsidivb_clk_mapping,

};



static struct clk *late_main_clks[] = {

	&sh7372_fsidiva_clk,

	&sh7372_fsidivb_clk,

	&fsidiva_clk,

	&fsidivb_clk,

};



enum { MSTP001, MSTP000,
@@ -583,6 +583,8 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_CON_ID("pllc1_clk", &pllc1_clk),

	CLKDEV_CON_ID("pllc1_div2_clk", &pllc1_div2_clk),

	CLKDEV_CON_ID("pllc2_clk", &sh7372_pllc2_clk),

	CLKDEV_CON_ID("fsidiva", &fsidiva_clk),

	CLKDEV_CON_ID("fsidivb", &fsidivb_clk),



	/* DIV4 clocks */

	CLKDEV_CON_ID("i_clk", &div4_clks[DIV4_I]),

arch/arm/mach-shmobile/include/mach/sh7372.h

+0 −2
Original line number Diff line number Diff line
@@ -479,8 +479,6 @@ extern struct clk sh7372_dv_clki_div2_clk; 
extern struct clk sh7372_pllc2_clk;

extern struct clk sh7372_fsiack_clk;

extern struct clk sh7372_fsibck_clk;

extern struct clk sh7372_fsidiva_clk;

extern struct clk sh7372_fsidivb_clk;



extern void sh7372_intcs_suspend(void);

extern void sh7372_intcs_resume(void);