lkml.org 
[lkml]   [2012]   [Jun]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 21/23] ARM: LPC32xx: Move uart6 irda disable to serial.c
    Date
    From: Alexandre Pereira da Silva <aletes.xgr@gmail.com>

    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>
    ---
    arch/arm/mach-lpc32xx/phy3250.c | 5 -----
    arch/arm/mach-lpc32xx/serial.c | 5 +++++
    2 files changed, 5 insertions(+), 5 deletions(-)

    --- linux-2.6.orig/arch/arm/mach-lpc32xx/phy3250.c
    +++ linux-2.6/arch/arm/mach-lpc32xx/phy3250.c
    @@ -260,11 +260,6 @@ static void __init lpc3250_machine_init(
    LPC32XX_CLKPWR_I2CCLK_I2C2HI_DRIVE;
    __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 */
    tmp = __raw_readl(LPC32XX_CLKPWR_I2S_CLK_CTRL);
    tmp = LPC32XX_CLKPWR_I2SCTRL_I2S1_USE_DMA;
    --- linux-2.6.orig/arch/arm/mach-lpc32xx/serial.c
    +++ linux-2.6/arch/arm/mach-lpc32xx/serial.c
    @@ -118,6 +118,11 @@ void __init lpc32xx_serial_init(void)
    __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 */
    tmp = __raw_readl(LPC32XX_UARTCTL_CTRL);
    tmp &= ~LPC32XX_UART_U5_ROUTE_TO_USB;

    \
     
     \ /
      Last update: 2012-06-14 19:21    [W:0.028 / U:3.556 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site