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

Commit 5c2f2917 authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kukjin Kim
Browse files

ARM: S3C24XX: Add clock-lookup entries required by s3c64xx-spi 



Currently usable are busclk0 and busclk2.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 97e1ed79

arch/arm/mach-s3c24xx/clock-s3c2416.c

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ static struct clk_lookup s3c2416_clk_lookup[] = { 
	CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.0", &hsmmc0_clk),

	CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &hsmmc_mux0.clk),

	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &hsmmc_mux1.clk),

	CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk2", &hsspi_mux.clk),

};



void __init s3c2416_init_clocks(int xtal)

arch/arm/mach-s3c24xx/clock-s3c2443.c

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ static struct clk *clks[] __initdata = { 


static struct clk_lookup s3c2443_clk_lookup[] = {

	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &clk_hsmmc),

	CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk2", &clk_hsspi.clk),

};



void __init s3c2443_init_clocks(int xtal)

arch/arm/mach-s3c24xx/common-s3c2443.c

+10 −5
Original line number Diff line number Diff line
@@ -423,11 +423,6 @@ static struct clk init_clocks_off[] = { 
		.parent		= &clk_p,

		.enable		= s3c2443_clkcon_enable_p,

		.ctrlbit	= S3C2443_PCLKCON_IIS,

	}, {

		.name		= "hsspi",

		.parent		= &clk_p,

		.enable		= s3c2443_clkcon_enable_p,

		.ctrlbit	= S3C2443_PCLKCON_HSSPI,

	}, {

		.name		= "adc",

		.parent		= &clk_p,
@@ -562,6 +557,14 @@ static struct clk hsmmc1_clk = { 
	.ctrlbit	= S3C2443_HCLKCON_HSMMC,

};



static struct clk hsspi_clk = {

	.name		= "spi",

	.devname	= "s3c64xx-spi.0",

	.parent		= &clk_p,

	.enable		= s3c2443_clkcon_enable_p,

	.ctrlbit	= S3C2443_PCLKCON_HSSPI,

};



/* EPLLCON compatible enough to get on/off information */



void __init_or_cpufreq s3c2443_common_setup_clocks(pll_fn get_mpll)
@@ -612,6 +615,7 @@ static struct clk *clks[] __initdata = { 
	&clk_usb_bus,

	&clk_armdiv,

	&hsmmc1_clk,

	&hsspi_clk,

};



static struct clksrc_clk *clksrcs[] __initdata = {
@@ -629,6 +633,7 @@ static struct clk_lookup s3c2443_clk_lookup[] = { 
	CLKDEV_INIT(NULL, "clk_uart_baud2", &clk_p),

	CLKDEV_INIT(NULL, "clk_uart_baud3", &clk_esys_uart.clk),

	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.0", &hsmmc1_clk),

	CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk0", &hsspi_clk),

};



void __init s3c2443_common_init_clocks(int xtal, pll_fn get_mpll,