diff options
| author | Russell King | 2013-08-04 21:27:03 +0200 |
|---|---|---|
| committer | Mark Brown | 2013-08-05 19:06:30 +0200 |
| commit | 64ddf1f89cd7a483e1204320395023774234b49a (patch) | |
| tree | 067139342472af7201368f0f758cb65f4fd741db /arch/arm/mach-dove | |
| parent | ASoC: kirkwood: provide KIRKWOOD_PLAYCTL_ENABLE_MASK (diff) | |
| download | kernel-qcow2-linux-64ddf1f89cd7a483e1204320395023774234b49a.tar.gz kernel-qcow2-linux-64ddf1f89cd7a483e1204320395023774234b49a.tar.xz kernel-qcow2-linux-64ddf1f89cd7a483e1204320395023774234b49a.zip | |
ASoC: kirkwood: combine kirkwood-i2s and kirkwood-dma drivers
These really should be a single driver because they're fully integrated
in hardware. Make them so.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'arch/arm/mach-dove')
| -rw-r--r-- | arch/arm/mach-dove/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c index 00247c771313..304f069ebf50 100644 --- a/arch/arm/mach-dove/common.c +++ b/arch/arm/mach-dove/common.c @@ -108,8 +108,8 @@ static void __init dove_clk_init(void) orion_clkdev_add(NULL, "sdhci-dove.1", sdio1); orion_clkdev_add(NULL, "orion_nand", nand); orion_clkdev_add(NULL, "cafe1000-ccic.0", camera); - orion_clkdev_add(NULL, "kirkwood-i2s.0", i2s0); - orion_clkdev_add(NULL, "kirkwood-i2s.1", i2s1); + orion_clkdev_add(NULL, "mvebu-audio.0", i2s0); + orion_clkdev_add(NULL, "mvebu-audio.1", i2s1); orion_clkdev_add(NULL, "mv_crypto", crypto); orion_clkdev_add(NULL, "dove-ac97", ac97); orion_clkdev_add(NULL, "dove-pdma", pdma); |