diff options
| author | Tomasz Figa <t.figa@samsung.com> | 2014-06-30 17:06:43 +0400 |
|---|---|---|
| committer | Tomasz Figa <t.figa@samsung.com> | 2014-06-30 17:06:43 +0400 |
| commit | bdfcdf18c380a3c376b42709a89eb2cc52e95ae0 (patch) | |
| tree | c6a93004468a92c606bf0dd435bdbfa6f10bc49b /drivers/clk/samsung/clk-s3c64xx.c | |
| parent | 27b8d5f723e64b5f7beac45a4d5785906d0a2f9d (diff) | |
| parent | 44ff0254b89079a8a95e652635e760d93196ac1f (diff) | |
| download | linux-bdfcdf18c380a3c376b42709a89eb2cc52e95ae0.tar.xz | |
Merge branch 'v3.16-samsung-clk-fixes-1' into samsung-clk-next
Diffstat (limited to 'drivers/clk/samsung/clk-s3c64xx.c')
| -rw-r--r-- | drivers/clk/samsung/clk-s3c64xx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/clk/samsung/clk-s3c64xx.c b/drivers/clk/samsung/clk-s3c64xx.c index efa16ee592c8..8889ff1c10fc 100644 --- a/drivers/clk/samsung/clk-s3c64xx.c +++ b/drivers/clk/samsung/clk-s3c64xx.c @@ -418,8 +418,10 @@ static struct samsung_clock_alias s3c64xx_clock_aliases[] = { ALIAS(SCLK_MMC2, "s3c-sdhci.2", "mmc_busclk.2"), ALIAS(SCLK_MMC1, "s3c-sdhci.1", "mmc_busclk.2"), ALIAS(SCLK_MMC0, "s3c-sdhci.0", "mmc_busclk.2"), - ALIAS(SCLK_SPI1, "s3c6410-spi.1", "spi-bus"), - ALIAS(SCLK_SPI0, "s3c6410-spi.0", "spi-bus"), + ALIAS(PCLK_SPI1, "s3c6410-spi.1", "spi_busclk0"), + ALIAS(SCLK_SPI1, "s3c6410-spi.1", "spi_busclk2"), + ALIAS(PCLK_SPI0, "s3c6410-spi.0", "spi_busclk0"), + ALIAS(SCLK_SPI0, "s3c6410-spi.0", "spi_busclk2"), ALIAS(SCLK_AUDIO1, "samsung-pcm.1", "audio-bus"), ALIAS(SCLK_AUDIO1, "samsung-i2s.1", "audio-bus"), ALIAS(SCLK_AUDIO0, "samsung-pcm.0", "audio-bus"), |