diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2012-04-24 21:07:03 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-04-24 21:07:03 -0400 |
| commit | 5c2f2917168e7a36c0fda0e7c2b0246c83eb7fe0 (patch) | |
| tree | d649fcb8ba50b3f3c1f994c55d8d1315db636519 | |
| parent | 97e1ed7960bc3b86c51aef8d3d014286032d476e (diff) | |
ARM: S3C24XX: Add clock-lookup entries required by s3c64xx-spi
Currently usable are busclk0 and busclk2.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| -rw-r--r-- | arch/arm/mach-s3c24xx/clock-s3c2416.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/clock-s3c2443.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/common-s3c2443.c | 15 |
3 files changed, 12 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c24xx/clock-s3c2416.c b/arch/arm/mach-s3c24xx/clock-s3c2416.c index dbc9ab4aaca2..8702ecfaab30 100644 --- a/arch/arm/mach-s3c24xx/clock-s3c2416.c +++ b/arch/arm/mach-s3c24xx/clock-s3c2416.c | |||
| @@ -144,6 +144,7 @@ static struct clk_lookup s3c2416_clk_lookup[] = { | |||
| 144 | CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.0", &hsmmc0_clk), | 144 | CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.0", &hsmmc0_clk), |
| 145 | CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &hsmmc_mux0.clk), | 145 | CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &hsmmc_mux0.clk), |
| 146 | CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &hsmmc_mux1.clk), | 146 | CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &hsmmc_mux1.clk), |
| 147 | CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk2", &hsspi_mux.clk), | ||
| 147 | }; | 148 | }; |
| 148 | 149 | ||
| 149 | void __init s3c2416_init_clocks(int xtal) | 150 | void __init s3c2416_init_clocks(int xtal) |
diff --git a/arch/arm/mach-s3c24xx/clock-s3c2443.c b/arch/arm/mach-s3c24xx/clock-s3c2443.c index bce1cd3a91da..a4c5a520d994 100644 --- a/arch/arm/mach-s3c24xx/clock-s3c2443.c +++ b/arch/arm/mach-s3c24xx/clock-s3c2443.c | |||
| @@ -181,6 +181,7 @@ static struct clk *clks[] __initdata = { | |||
| 181 | 181 | ||
| 182 | static struct clk_lookup s3c2443_clk_lookup[] = { | 182 | static struct clk_lookup s3c2443_clk_lookup[] = { |
| 183 | CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &clk_hsmmc), | 183 | CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &clk_hsmmc), |
| 184 | CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk2", &clk_hsspi.clk), | ||
| 184 | }; | 185 | }; |
| 185 | 186 | ||
| 186 | void __init s3c2443_init_clocks(int xtal) | 187 | void __init s3c2443_init_clocks(int xtal) |
diff --git a/arch/arm/mach-s3c24xx/common-s3c2443.c b/arch/arm/mach-s3c24xx/common-s3c2443.c index 460431589f39..aeeb2be283fa 100644 --- a/arch/arm/mach-s3c24xx/common-s3c2443.c +++ b/arch/arm/mach-s3c24xx/common-s3c2443.c | |||
| @@ -424,11 +424,6 @@ static struct clk init_clocks_off[] = { | |||
| 424 | .enable = s3c2443_clkcon_enable_p, | 424 | .enable = s3c2443_clkcon_enable_p, |
| 425 | .ctrlbit = S3C2443_PCLKCON_IIS, | 425 | .ctrlbit = S3C2443_PCLKCON_IIS, |
| 426 | }, { | 426 | }, { |
| 427 | .name = "hsspi", | ||
| 428 | .parent = &clk_p, | ||
| 429 | .enable = s3c2443_clkcon_enable_p, | ||
| 430 | .ctrlbit = S3C2443_PCLKCON_HSSPI, | ||
| 431 | }, { | ||
| 432 | .name = "adc", | 427 | .name = "adc", |
| 433 | .parent = &clk_p, | 428 | .parent = &clk_p, |
| 434 | .enable = s3c2443_clkcon_enable_p, | 429 | .enable = s3c2443_clkcon_enable_p, |
| @@ -562,6 +557,14 @@ static struct clk hsmmc1_clk = { | |||
| 562 | .ctrlbit = S3C2443_HCLKCON_HSMMC, | 557 | .ctrlbit = S3C2443_HCLKCON_HSMMC, |
| 563 | }; | 558 | }; |
| 564 | 559 | ||
| 560 | static struct clk hsspi_clk = { | ||
| 561 | .name = "spi", | ||
| 562 | .devname = "s3c64xx-spi.0", | ||
| 563 | .parent = &clk_p, | ||
| 564 | .enable = s3c2443_clkcon_enable_p, | ||
| 565 | .ctrlbit = S3C2443_PCLKCON_HSSPI, | ||
| 566 | }; | ||
| 567 | |||
| 565 | /* EPLLCON compatible enough to get on/off information */ | 568 | /* EPLLCON compatible enough to get on/off information */ |
| 566 | 569 | ||
| 567 | void __init_or_cpufreq s3c2443_common_setup_clocks(pll_fn get_mpll) | 570 | void __init_or_cpufreq s3c2443_common_setup_clocks(pll_fn get_mpll) |
| @@ -612,6 +615,7 @@ static struct clk *clks[] __initdata = { | |||
| 612 | &clk_usb_bus, | 615 | &clk_usb_bus, |
| 613 | &clk_armdiv, | 616 | &clk_armdiv, |
| 614 | &hsmmc1_clk, | 617 | &hsmmc1_clk, |
| 618 | &hsspi_clk, | ||
| 615 | }; | 619 | }; |
| 616 | 620 | ||
| 617 | static struct clksrc_clk *clksrcs[] __initdata = { | 621 | static struct clksrc_clk *clksrcs[] __initdata = { |
| @@ -629,6 +633,7 @@ static struct clk_lookup s3c2443_clk_lookup[] = { | |||
| 629 | CLKDEV_INIT(NULL, "clk_uart_baud2", &clk_p), | 633 | CLKDEV_INIT(NULL, "clk_uart_baud2", &clk_p), |
| 630 | CLKDEV_INIT(NULL, "clk_uart_baud3", &clk_esys_uart.clk), | 634 | CLKDEV_INIT(NULL, "clk_uart_baud3", &clk_esys_uart.clk), |
| 631 | CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.0", &hsmmc1_clk), | 635 | CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.0", &hsmmc1_clk), |
| 636 | CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk0", &hsspi_clk), | ||
| 632 | }; | 637 | }; |
| 633 | 638 | ||
| 634 | void __init s3c2443_common_init_clocks(int xtal, pll_fn get_mpll, | 639 | void __init s3c2443_common_init_clocks(int xtal, pll_fn get_mpll, |
