Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df072717 authored by Alexandre Pereira da Silva's avatar Alexandre Pereira da Silva Committed by Roland Stigge
Browse files

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: default avatarAlexandre Pereira da Silva <aletes.xgr@gmail.com>
Signed-off-by: default avatarRoland Stigge <stigge@antcom.de>
parent 5fe8f11c

arch/arm/mach-lpc32xx/clock.c

+2 −1
Original line number Diff line number Diff line
@@ -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,

};

arch/arm/mach-lpc32xx/phy3250.c

+0 −5
Original line number Diff line number Diff line
@@ -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);