summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-lpc32xx/phy3250.c
diff options
context:
space:
mode:
authorAlexandre Pereira da Silva <aletes.xgr@gmail.com>2012-06-14 00:38:48 +0200
committerRoland Stigge <stigge@antcom.de>2012-06-14 16:16:19 +0200
commitdf072717eb0050326f0f63eed98200412c395831 (patch)
tree317bbb7b61f4da27fcac17b92899f3575148e026 /arch/arm/mach-lpc32xx/phy3250.c
parentARM: LPC32xx: Move uart6 irda disable to serial.c (diff)
downloadlinux-df072717eb0050326f0f63eed98200412c395831.tar.xz
linux-df072717eb0050326f0f63eed98200412c395831.zip
ARM: LPC32xx: Move i2s1 dma enabling to clock.c
Move i2s1 dma init to be done when it's clock is enabled. Signed-off-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com> Signed-off-by: Roland Stigge <stigge@antcom.de>
Diffstat (limited to 'arch/arm/mach-lpc32xx/phy3250.c')
-rw-r--r--arch/arm/mach-lpc32xx/phy3250.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c
index eb22fbf029ea..c1aabfcbde49 100644
--- a/arch/arm/mach-lpc32xx/phy3250.c
+++ b/arch/arm/mach-lpc32xx/phy3250.c
@@ -260,11 +260,6 @@ static void __init lpc3250_machine_init(void)
LPC32XX_CLKPWR_I2CCLK_I2C2HI_DRIVE;
__raw_writel(tmp, LPC32XX_CLKPWR_I2C_CLK_CTRL);
- /* Enable DMA for I2S1 channel */
- tmp = __raw_readl(LPC32XX_CLKPWR_I2S_CLK_CTRL);
- tmp = LPC32XX_CLKPWR_I2SCTRL_I2S1_USE_DMA;
- __raw_writel(tmp, LPC32XX_CLKPWR_I2S_CLK_CTRL);
-
lpc32xx_serial_init();
tmp = __raw_readl(LPC32XX_CLKPWR_MS_CTRL);