Re: [PATCH 2/2] OMAP: UART: omap_device converions, remove implicit 8520 assumptions

[Kevin Hilman <khilman@deeprootsystems.com>]

"Nayak, Rajendra" <rnayak@ti.com> writes:

[...]

>> +             /*
>> +              * Need to block sleep long enough for interrupt driven
>> +              * driver to start.  Console driver is in polling mode
>> +              * so device needs to be kept enabled while
>> polling driver
>> +              * is in use.
>> +              */
>> +             uart->timeout = (30 * HZ);
>> +             omap_uart_block_sleep(uart);
>> +             uart->timeout = DEFAULT_TIMEOUT;
>> +
>> +             if ((cpu_is_omap34xx() && uart->padconf) ||
>> +                 (uart->wk_en && uart->wk_mask)) {
>> +                     device_init_wakeup(&od->pdev.dev, true);
>> +                     DEV_CREATE_FILE(&od->pdev.dev,
>> &dev_attr_sleep_timeout);
>> +             }
>> +
>> +#ifdef CONFIG_SERIAL_8250_CONSOLE
>>               /* omap44xx: Never read empty UART fifo
>>                * omap3xxx: Never read empty UART fifo on UARTs
>>                * with IP rev >=0x52
>>                */
>>               if (cpu_is_omap44xx())
>> -                     uart->p->serial_in = serial_in_override;
>> -             else if ((serial_read_reg(uart->p,
>> UART_OMAP_MVER) & 0xFF)
>> +                     p->serial_in = serial_in_override;
>> +             else if ((serial_read_reg(uart, UART_OMAP_MVER) & 0xFF)
>>                               >= UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV)
>> -                     uart->p->serial_in = serial_in_override;
>> +                     p->serial_in = serial_in_override;
>> +#endif
>
> I think this (overriding serial_in) needs to be done sometime before you do a
> omap_device_build() call. Else this has no affect.
>

Thanks Rajendra, you're right, good catch.

Will fix in next spin.

Thanks ,

Kevin