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

Commit aaeedff6 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Kukjin Kim
Browse files

ARM: S5PC100: cleanup hsmmc clock definitions 



This patch performs minor clocks cleanup for S5PC100 SoC. HSMMC special
clocks has been renamed back to sclk_mmc to match the common style of
clock names. This clock has been also added to sdhci clock source list.
The duplicate HCLK clock entry for sdhci-s3c has been disabled.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent fa9ce742

arch/arm/mach-s5pc100/clock.c

+3 −3
Original line number Diff line number Diff line
@@ -1078,7 +1078,7 @@ static struct clksrc_clk clksrcs[] = { 
		.reg_div = { .reg = S5P_CLK_DIV3, .shift = 24, .size = 4 },

	}, {

		.clk	= {

			.name		= "mmc_bus",

			.name		= "sclk_mmc",

			.id		= 0,

			.ctrlbit	= (1 << 12),

			.enable		= s5pc100_sclk1_ctrl,
@@ -1089,7 +1089,7 @@ static struct clksrc_clk clksrcs[] = { 
		.reg_div = { .reg = S5P_CLK_DIV3, .shift = 0, .size = 4 },

	}, {

		.clk	= {

			.name		= "mmc_bus",

			.name		= "sclk_mmc",

			.id		= 1,

			.ctrlbit	= (1 << 13),

			.enable		= s5pc100_sclk1_ctrl,
@@ -1100,7 +1100,7 @@ static struct clksrc_clk clksrcs[] = { 
		.reg_div = { .reg = S5P_CLK_DIV3, .shift = 4, .size = 4 },

	}, {

		.clk	= {

			.name		= "mmc_bus",

			.name		= "sclk_mmc",

			.id		= 2,

			.ctrlbit	= (1 << 14),

			.enable		= s5pc100_sclk1_ctrl,

arch/arm/mach-s5pc100/setup-sdhci.c

+4 −4
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ 
/* clock sources for the mmc bus clock, order as for the ctrl2[5..4] */



char *s5pc100_hsmmc_clksrcs[4] = {

	[0] = "hsmmc",

	[1] = "hsmmc",

	/* [2] = "mmc_bus", not yet successfully used yet */

	[0] = "hsmmc",		/* HCLK */

	/* [1] = "hsmmc",	- duplicate HCLK entry */

	[2] = "sclk_mmc",	/* mmc_bus */

	/* [3] = "48m",		- note not successfully used yet */

};