summaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-20 10:20:14 +0100
committerTakashi Iwai <tiwai@suse.de>2014-01-20 10:20:14 +0100
commit258753361534a40ad7180c742da813fc659e427b (patch)
tree58517f6ce46ab2c897d427b7d1bf29850be314fa /drivers/clk
parent315fba80a664e4bd928e0b85a38d26e60645b96a (diff)
parent2aff4c9ce898b9079658650c1ab33c44b100a203 (diff)
downloadlinux-258753361534a40ad7180c742da813fc659e427b.tar.bz2
Merge branch 'for-next' into for-linus
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/samsung/clk-s3c64xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/samsung/clk-s3c64xx.c b/drivers/clk/samsung/clk-s3c64xx.c
index 7d2c84265947..8e27aee6887e 100644
--- a/drivers/clk/samsung/clk-s3c64xx.c
+++ b/drivers/clk/samsung/clk-s3c64xx.c
@@ -331,8 +331,8 @@ static struct samsung_clock_alias s3c64xx_clock_aliases[] = {
ALIAS(HCLK_HSMMC1, "s3c-sdhci.1", "mmc_busclk.0"),
ALIAS(HCLK_HSMMC0, "s3c-sdhci.0", "hsmmc"),
ALIAS(HCLK_HSMMC0, "s3c-sdhci.0", "mmc_busclk.0"),
- ALIAS(HCLK_DMA1, NULL, "dma1"),
- ALIAS(HCLK_DMA0, NULL, "dma0"),
+ ALIAS(HCLK_DMA1, "dma-pl080s.1", "apb_pclk"),
+ ALIAS(HCLK_DMA0, "dma-pl080s.0", "apb_pclk"),
ALIAS(HCLK_CAMIF, "s3c-camif", "camif"),
ALIAS(HCLK_LCD, "s3c-fb", "lcd"),
ALIAS(PCLK_SPI1, "s3c6410-spi.1", "spi"),