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

Commit 5a847b4a authored by Jongpill Lee's avatar Jongpill Lee Committed by Kukjin Kim
Browse files

ARM: S5PV310: Fix missed uart clocks 



This patch adds missed uart clocks for S5PV310/S5PC210.

Signed-off-by: default avatarJongpill Lee <boyko.lee@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 3ff31020

arch/arm/mach-s5pv310/clock.c

+37 −7
Original line number Original line Diff line number Diff line
@@ -30,6 +30,11 @@ static struct clk clk_sclk_hdmi27m = { 
	.rate		= 27000000,

	.rate		= 27000000,

};

};





static int s5pv310_clk_ip_peril_ctrl(struct clk *clk, int enable)

{

	return s5p_gatectrl(S5P_CLKGATE_IP_PERIL, clk, enable);

}



/* Core list of CMU_CPU side */

/* Core list of CMU_CPU side */





static struct clksrc_clk clk_mout_apll = {

static struct clksrc_clk clk_mout_apll = {
@@ -329,11 +334,6 @@ static struct clksrc_clk clk_sclk_vpll = { 
	.reg_src	= { .reg = S5P_CLKSRC_TOP0, .shift = 8, .size = 1 },

	.reg_src	= { .reg = S5P_CLKSRC_TOP0, .shift = 8, .size = 1 },

};

};





static int s5pv310_clk_ip_peril_ctrl(struct clk *clk, int enable)

{

	return s5p_gatectrl(S5P_CLKGATE_IP_PERIL, clk, enable);

}



static struct clk init_clocks_disable[] = {

static struct clk init_clocks_disable[] = {

	{

	{

		.name		= "timers",

		.name		= "timers",
@@ -345,7 +345,37 @@ static struct clk init_clocks_disable[] = { 
};

};





static struct clk init_clocks[] = {

static struct clk init_clocks[] = {

	/* Nothing here yet */

	{

		.name		= "uart",

		.id		= 0,

		.enable		= s5pv310_clk_ip_peril_ctrl,

		.ctrlbit	= (1 << 0),

	}, {

		.name		= "uart",

		.id		= 1,

		.enable		= s5pv310_clk_ip_peril_ctrl,

		.ctrlbit	= (1 << 1),

	}, {

		.name		= "uart",

		.id		= 2,

		.enable		= s5pv310_clk_ip_peril_ctrl,

		.ctrlbit	= (1 << 2),

	}, {

		.name		= "uart",

		.id		= 3,

		.enable		= s5pv310_clk_ip_peril_ctrl,

		.ctrlbit	= (1 << 3),

	}, {

		.name		= "uart",

		.id		= 4,

		.enable		= s5pv310_clk_ip_peril_ctrl,

		.ctrlbit	= (1 << 4),

	}, {

		.name		= "uart",

		.id		= 5,

		.enable		= s5pv310_clk_ip_peril_ctrl,

		.ctrlbit	= (1 << 5),

	}

};

};





static struct clk *clkset_group_list[] = {

static struct clk *clkset_group_list[] = {
@@ -367,8 +397,8 @@ static struct clksrc_clk clksrcs[] = { 
		.clk	= {

		.clk	= {

			.name		= "uclk1",

			.name		= "uclk1",

			.id		= 0,

			.id		= 0,

			.ctrlbit	= (1 << 0),

			.enable		= s5pv310_clk_ip_peril_ctrl,

			.enable		= s5pv310_clk_ip_peril_ctrl,

			.ctrlbit	= (1 << 0),

		},

		},

		.sources = &clkset_group,

		.sources = &clkset_group,

		.reg_src = { .reg = S5P_CLKSRC_PERIL0, .shift = 0, .size = 4 },

		.reg_src = { .reg = S5P_CLKSRC_PERIL0, .shift = 0, .size = 4 },