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

Commit 5fe8f11c authored Jun 13, 2012 by Alexandre Pereira da Silva Committed by Roland Stigge Jun 14, 2012

ARM: LPC32xx: Move uart6 irda disable to serial.c



Move the irda configuration to serial.c where other special cases are
handled

Signed-off-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
Signed-off-by: Roland Stigge <stigge@antcom.de>

parent 112e9add

arch/arm/mach-lpc32xx/phy3250.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -260,11 +260,6 @@ static void __init lpc3250_machine_init(void)
	LPC32XX_CLKPWR_I2CCLK_I2C2HI_DRIVE;		LPC32XX_CLKPWR_I2CCLK_I2C2HI_DRIVE;
	__raw_writel(tmp, LPC32XX_CLKPWR_I2C_CLK_CTRL);		__raw_writel(tmp, LPC32XX_CLKPWR_I2C_CLK_CTRL);

	/* Disable IrDA pulsing support on UART6 */
	tmp = __raw_readl(LPC32XX_UARTCTL_CTRL);
	tmp \|= LPC32XX_UART_UART6_IRDAMOD_BYPASS;
	__raw_writel(tmp, LPC32XX_UARTCTL_CTRL);

	/* Enable DMA for I2S1 channel */		/* Enable DMA for I2S1 channel */
	tmp = __raw_readl(LPC32XX_CLKPWR_I2S_CLK_CTRL);		tmp = __raw_readl(LPC32XX_CLKPWR_I2S_CLK_CTRL);
	tmp = LPC32XX_CLKPWR_I2SCTRL_I2S1_USE_DMA;		tmp = LPC32XX_CLKPWR_I2SCTRL_I2S1_USE_DMA;

arch/arm/mach-lpc32xx/serial.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -118,6 +118,11 @@ void __init lpc32xx_serial_init(void)
	__raw_writel(0, LPC32XX_UART_IIR_FCR(puart));		__raw_writel(0, LPC32XX_UART_IIR_FCR(puart));
	}		}

			/* Disable IrDA pulsing support on UART6 */
			tmp = __raw_readl(LPC32XX_UARTCTL_CTRL);
			tmp \|= LPC32XX_UART_UART6_IRDAMOD_BYPASS;
			__raw_writel(tmp, LPC32XX_UARTCTL_CTRL);

	/* Disable UART5->USB transparent mode or USB won't work */		/* Disable UART5->USB transparent mode or USB won't work */
	tmp = __raw_readl(LPC32XX_UARTCTL_CTRL);		tmp = __raw_readl(LPC32XX_UARTCTL_CTRL);
	tmp &= ~LPC32XX_UART_U5_ROUTE_TO_USB;		tmp &= ~LPC32XX_UART_U5_ROUTE_TO_USB;