diff options
author | Olof Johansson <olof@lixom.net> | 2013-12-04 13:38:20 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-12-04 13:38:20 -0800 |
commit | d167e1f0c109555b4d2c57ea51eae0eb40527979 (patch) | |
tree | db89a17d78e51ce9c9f9f80f276005c3ac737d09 /drivers | |
parent | 5c748225889c0128dd8f48c45e115b0e8cc3db58 (diff) | |
parent | 3faecea70b0d6d050e0ae911032ec340341dc389 (diff) |
Merge tag 's3c64xx-dmaengine' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into next/drivers
From Tomasz Figa via Mark Brown:
ARM: s3c64xx: Convert to dmaengine
This series of commits from Tomasz converting s3c64xx to use dmaengine
rather than the old s3c-dma API missed the v3.13 merge window - Kukjin
said that he'd applied it (which should mean it's OK from a review point
of view) but it didn't make it into -next or a pull request.
Since a s3c64xx based system is one of my primary development platforms
it'd be really helpful if I could merge this into both ASoC and SPI,
I've got some patches for ASoC ready to go converting to use dmaengine
directly which help with multiplatform and there's some other dmaengine
work for SPI in progress too. I've therefore made this signed tag, it'd
be great if it could be merged into both arm-soc and those two trees.
* tag 's3c64xx-dmaengine' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc:
spi: s3c64xx: Always select S3C64XX_PL080 when ARCH_S3C64XX is enabled
clk: samsung: s3c64xx: Remove clock aliases of old DMA driver
ARM: s3c64xx: Remove legacy DMA driver
clk: samsung: s3c64xx: Add aliases for DMA clocks
ARM: s3c64xx: Add support for DMA using generic amba-pl08x driver
spi: s3c64xx: Do not require legacy DMA API in case of S3C64XX
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/clk/samsung/clk-s3c64xx.c | 4 | ||||
-rw-r--r-- | drivers/spi/Kconfig | 2 |
2 files changed, 3 insertions, 3 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"), diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index eb1f1ef5fa2e..e2dd2fbec5ee 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -395,7 +395,7 @@ config SPI_S3C24XX_FIQ config SPI_S3C64XX tristate "Samsung S3C64XX series type SPI" depends on PLAT_SAMSUNG - select S3C64XX_DMA if ARCH_S3C64XX + select S3C64XX_PL080 if ARCH_S3C64XX help SPI driver for Samsung S3C64XX and newer SoCs. |