[U-Boot] [PATCH ... resent] Atmel LCD driver GUARDTIME fix

Mark Jackson
2009-06-22T15:01:43Z

Mark Jackson wrote:
> This patch correctly sets up the guard time parameter in
> the Atmel LCDC driver.
>
> This works on the AVR32 platform, but needs to be tested
> under the AT91 platform which shares the same code base.
>
> Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
> ---
> drivers/video/atmel_lcdfb.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
> index 3a51cc7..14f578e 100644
> --- a/drivers/video/atmel_lcdfb.c
> +++ b/drivers/video/atmel_lcdfb.c
> @@ -42,6 +42,7 @@ short console_row;
> /* configurable parameters */
> #define ATMEL_LCDC_CVAL_DEFAULT 0xc8
> #define ATMEL_LCDC_DMA_BURST_LEN 8
> +#define ATMEL_LCDC_GUARD_TIME 2

This should be ...

> #define ATMEL_LCDC_CVAL_DEFAULT 0xc8
> #define ATMEL_LCDC_DMA_BURST_LEN 8
> +#define ATMEL_LCDC_GUARD_TIME 2

... without the extra space at the start.

>
> #if defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91CAP9)
> #define ATMEL_LCDC_FIFO_SIZE 2048
> @@ -69,7 +70,7 @@ void lcd_ctrl_init(void *lcdbase)
>
> /* Turn off the LCD controller and the DMA controller */
> lcdc_writel(panel_info.mmio, ATMEL_LCDC_PWRCON,
> - 1 << ATMEL_LCDC_GUARDT_OFFSET);
> + ATMEL_LCDC_GUARD_TIME << ATMEL_LCDC_GUARDT_OFFSET);
>
> /* Wait for the LCDC core to become idle */
> while (lcdc_readl(panel_info.mmio, ATMEL_LCDC_PWRCON) & ATMEL_LCDC_BUSY)
> @@ -150,7 +151,7 @@ void lcd_ctrl_init(void *lcdbase)
>
> lcdc_writel(panel_info.mmio, ATMEL_LCDC_DMACON, ATMEL_LCDC_DMAEN);
> lcdc_writel(panel_info.mmio, ATMEL_LCDC_PWRCON,
> - (1 << ATMEL_LCDC_GUARDT_OFFSET) | ATMEL_LCDC_PWR);
> + (ATMEL_LCDC_GUARD_TIME << ATMEL_LCDC_GUARDT_OFFSET) | ATMEL_LCDC_PWR);
> }
>
> ulong calc_fbsize(void)

My patch has been mangled ... there's an extra space at the start of each
"unchanged" patch line.

Any ideas ?