dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Alexandre Pereira da Silva 2012-06-13 19:38:48 -03:00 committed by Roland Stigge
parent 5fe8f11ccb
commit df072717eb
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-lpc32xx/clock.c
View File

@ -718,7 +718,8 @@ static struct clk clk_i2s1 = {
.parent = &clk_hclk,
.enable = local_onoff_enable,
.enable_reg = LPC32XX_CLKPWR_I2S_CLK_CTRL,
.enable_mask = LPC32XX_CLKPWR_I2SCTRL_I2SCLK1_EN,
.enable_mask = LPC32XX_CLKPWR_I2SCTRL_I2SCLK1_EN |
LPC32XX_CLKPWR_I2SCTRL_I2S1_USE_DMA,
.get_rate = local_return_parent_rate,
};

5
arch/arm/mach-lpc32xx/phy3250.c
View File

@ -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);