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

Commit f9c4f1e4 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: S3C64XX: Cleanup common init code in s3c6400-clock.c 



Remove the four fields from clksrc_clk.clk which are always the same
and init them when the clock is registered. This helps remove the amount
of repeated code.

This is a re-work of Harald Welte's clock changes for the latest kernel.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 70792bcf

arch/arm/plat-s3c64xx/s3c6400-clock.c

+5 −44
Original line number Diff line number Diff line
@@ -360,10 +360,6 @@ static struct clksrc_clk clk_mmc0 = { 
		.id		= 0,

		.ctrlbit        = S3C_CLKCON_SCLK_MMC0,

		.enable		= s3c64xx_sclk_ctrl,

		.set_parent	= s3c64xx_setparent_clksrc,

		.get_rate	= s3c64xx_getrate_clksrc,

		.set_rate	= s3c64xx_setrate_clksrc,

		.round_rate	= s3c64xx_roundrate_clksrc,

	},

	.shift		= S3C6400_CLKSRC_MMC0_SHIFT,

	.mask		= S3C6400_CLKSRC_MMC0_MASK,
@@ -378,10 +374,6 @@ static struct clksrc_clk clk_mmc1 = { 
		.id		= 1,

		.ctrlbit        = S3C_CLKCON_SCLK_MMC1,

		.enable		= s3c64xx_sclk_ctrl,

		.get_rate	= s3c64xx_getrate_clksrc,

		.set_rate	= s3c64xx_setrate_clksrc,

		.set_parent	= s3c64xx_setparent_clksrc,

		.round_rate	= s3c64xx_roundrate_clksrc,

	},

	.shift		= S3C6400_CLKSRC_MMC1_SHIFT,

	.mask		= S3C6400_CLKSRC_MMC1_MASK,
@@ -396,10 +388,6 @@ static struct clksrc_clk clk_mmc2 = { 
		.id		= 2,

		.ctrlbit        = S3C_CLKCON_SCLK_MMC2,

		.enable		= s3c64xx_sclk_ctrl,

		.get_rate	= s3c64xx_getrate_clksrc,

		.set_rate	= s3c64xx_setrate_clksrc,

		.set_parent	= s3c64xx_setparent_clksrc,

		.round_rate	= s3c64xx_roundrate_clksrc,

	},

	.shift		= S3C6400_CLKSRC_MMC2_SHIFT,

	.mask		= S3C6400_CLKSRC_MMC2_MASK,
@@ -414,10 +402,6 @@ static struct clksrc_clk clk_usbhost = { 
		.id		= -1,

		.ctrlbit        = S3C_CLKCON_SCLK_UHOST,

		.enable		= s3c64xx_sclk_ctrl,

		.set_parent	= s3c64xx_setparent_clksrc,

		.get_rate	= s3c64xx_getrate_clksrc,

		.set_rate	= s3c64xx_setrate_clksrc,

		.round_rate	= s3c64xx_roundrate_clksrc,

	},

	.shift		= S3C6400_CLKSRC_UHOST_SHIFT,

	.mask		= S3C6400_CLKSRC_UHOST_MASK,
@@ -432,10 +416,6 @@ static struct clksrc_clk clk_uart_uclk1 = { 
		.id		= -1,

		.ctrlbit        = S3C_CLKCON_SCLK_UART,

		.enable		= s3c64xx_sclk_ctrl,

		.set_parent	= s3c64xx_setparent_clksrc,

		.get_rate	= s3c64xx_getrate_clksrc,

		.set_rate	= s3c64xx_setrate_clksrc,

		.round_rate	= s3c64xx_roundrate_clksrc,

	},

	.shift		= S3C6400_CLKSRC_UART_SHIFT,

	.mask		= S3C6400_CLKSRC_UART_MASK,
@@ -452,10 +432,6 @@ static struct clksrc_clk clk_spi0 = { 
		.id		= 0,

		.ctrlbit        = S3C_CLKCON_SCLK_SPI0,

		.enable		= s3c64xx_sclk_ctrl,

		.set_parent	= s3c64xx_setparent_clksrc,

		.get_rate	= s3c64xx_getrate_clksrc,

		.set_rate	= s3c64xx_setrate_clksrc,

		.round_rate	= s3c64xx_roundrate_clksrc,

	},

	.shift		= S3C6400_CLKSRC_SPI0_SHIFT,

	.mask		= S3C6400_CLKSRC_SPI0_MASK,
@@ -470,10 +446,6 @@ static struct clksrc_clk clk_spi1 = { 
		.id		= 1,

		.ctrlbit        = S3C_CLKCON_SCLK_SPI1,

		.enable		= s3c64xx_sclk_ctrl,

		.set_parent	= s3c64xx_setparent_clksrc,

		.get_rate	= s3c64xx_getrate_clksrc,

		.set_rate	= s3c64xx_setrate_clksrc,

		.round_rate	= s3c64xx_roundrate_clksrc,

	},

	.shift		= S3C6400_CLKSRC_SPI1_SHIFT,

	.mask		= S3C6400_CLKSRC_SPI1_MASK,
@@ -516,10 +488,6 @@ static struct clksrc_clk clk_audio0 = { 
		.id		= 0,

		.ctrlbit        = S3C_CLKCON_SCLK_AUDIO0,

		.enable		= s3c64xx_sclk_ctrl,

		.set_parent	= s3c64xx_setparent_clksrc,

		.get_rate	= s3c64xx_getrate_clksrc,

		.set_rate	= s3c64xx_setrate_clksrc,

		.round_rate	= s3c64xx_roundrate_clksrc,

	},

	.shift		= S3C6400_CLKSRC_AUDIO0_SHIFT,

	.mask		= S3C6400_CLKSRC_AUDIO0_MASK,
@@ -547,10 +515,6 @@ static struct clksrc_clk clk_audio1 = { 
		.id		= 1,

		.ctrlbit        = S3C_CLKCON_SCLK_AUDIO1,

		.enable		= s3c64xx_sclk_ctrl,

		.set_parent	= s3c64xx_setparent_clksrc,

		.get_rate	= s3c64xx_getrate_clksrc,

		.set_rate	= s3c64xx_setrate_clksrc,

		.round_rate	= s3c64xx_roundrate_clksrc,

	},

	.shift		= S3C6400_CLKSRC_AUDIO1_SHIFT,

	.mask		= S3C6400_CLKSRC_AUDIO1_MASK,
@@ -565,10 +529,6 @@ static struct clksrc_clk clk_irda = { 
		.id		= 0,

		.ctrlbit        = S3C_CLKCON_SCLK_IRDA,

		.enable		= s3c64xx_sclk_ctrl,

		.set_parent	= s3c64xx_setparent_clksrc,

		.get_rate	= s3c64xx_getrate_clksrc,

		.set_rate	= s3c64xx_setrate_clksrc,

		.round_rate	= s3c64xx_roundrate_clksrc,

	},

	.shift		= S3C6400_CLKSRC_IRDA_SHIFT,

	.mask		= S3C6400_CLKSRC_IRDA_MASK,
@@ -592,10 +552,6 @@ static struct clksrc_clk clk_camif = { 
		.id		= -1,

		.ctrlbit        = S3C_CLKCON_SCLK_CAM,

		.enable		= s3c64xx_sclk_ctrl,

		.set_parent	= s3c64xx_setparent_clksrc,

		.get_rate	= s3c64xx_getrate_clksrc,

		.set_rate	= s3c64xx_setrate_clksrc,

		.round_rate	= s3c64xx_roundrate_clksrc,

	},

	.shift		= 0,

	.mask		= 0,
@@ -637,6 +593,11 @@ static void __init_or_cpufreq s3c6400_set_clksrc(struct clksrc_clk *clk) 
		return;

	}



	clk->clk.get_rate = s3c64xx_getrate_clksrc;

	clk->clk.set_rate = s3c64xx_setrate_clksrc;

	clk->clk.set_parent = s3c64xx_setparent_clksrc;

	clk->clk.round_rate = s3c64xx_roundrate_clksrc;



	clk->clk.parent = srcs->sources[clksrc];



	printk(KERN_INFO "%s: source is %s (%d), rate is %ld\n",