Merge git://git.denx.de/u-boot-spi
This commit is contained in:
@@ -70,26 +70,26 @@ void lcd_ctrl_init(void *lcdbase)
|
||||
|
||||
/* Disable DISP signal */
|
||||
writel(LCDC_LCDDIS_DISPDIS, ®s->lcdc_lcddis);
|
||||
ret = wait_for_bit(__func__, ®s->lcdc_lcdsr, LCDC_LCDSR_DISPSTS,
|
||||
false, 1000, false);
|
||||
ret = wait_for_bit_le32(®s->lcdc_lcdsr, LCDC_LCDSR_DISPSTS,
|
||||
false, 1000, false);
|
||||
if (ret)
|
||||
printf("%s: %d: Timeout!\n", __func__, __LINE__);
|
||||
/* Disable synchronization */
|
||||
writel(LCDC_LCDDIS_SYNCDIS, ®s->lcdc_lcddis);
|
||||
ret = wait_for_bit(__func__, ®s->lcdc_lcdsr, LCDC_LCDSR_LCDSTS,
|
||||
false, 1000, false);
|
||||
ret = wait_for_bit_le32(®s->lcdc_lcdsr, LCDC_LCDSR_LCDSTS,
|
||||
false, 1000, false);
|
||||
if (ret)
|
||||
printf("%s: %d: Timeout!\n", __func__, __LINE__);
|
||||
/* Disable pixel clock */
|
||||
writel(LCDC_LCDDIS_CLKDIS, ®s->lcdc_lcddis);
|
||||
ret = wait_for_bit(__func__, ®s->lcdc_lcdsr, LCDC_LCDSR_CLKSTS,
|
||||
false, 1000, false);
|
||||
ret = wait_for_bit_le32(®s->lcdc_lcdsr, LCDC_LCDSR_CLKSTS,
|
||||
false, 1000, false);
|
||||
if (ret)
|
||||
printf("%s: %d: Timeout!\n", __func__, __LINE__);
|
||||
/* Disable PWM */
|
||||
writel(LCDC_LCDDIS_PWMDIS, ®s->lcdc_lcddis);
|
||||
ret = wait_for_bit(__func__, ®s->lcdc_lcdsr, LCDC_LCDSR_PWMSTS,
|
||||
false, 1000, false);
|
||||
ret = wait_for_bit_le32(®s->lcdc_lcdsr, LCDC_LCDSR_PWMSTS,
|
||||
false, 1000, false);
|
||||
if (ret)
|
||||
printf("%s: %d: Timeout!\n", __func__, __LINE__);
|
||||
|
||||
@@ -215,26 +215,26 @@ void lcd_ctrl_init(void *lcdbase)
|
||||
/* Enable LCD */
|
||||
value = readl(®s->lcdc_lcden);
|
||||
writel(value | LCDC_LCDEN_CLKEN, ®s->lcdc_lcden);
|
||||
ret = wait_for_bit(__func__, ®s->lcdc_lcdsr, LCDC_LCDSR_CLKSTS,
|
||||
true, 1000, false);
|
||||
ret = wait_for_bit_le32(®s->lcdc_lcdsr, LCDC_LCDSR_CLKSTS,
|
||||
true, 1000, false);
|
||||
if (ret)
|
||||
printf("%s: %d: Timeout!\n", __func__, __LINE__);
|
||||
value = readl(®s->lcdc_lcden);
|
||||
writel(value | LCDC_LCDEN_SYNCEN, ®s->lcdc_lcden);
|
||||
ret = wait_for_bit(__func__, ®s->lcdc_lcdsr, LCDC_LCDSR_LCDSTS,
|
||||
true, 1000, false);
|
||||
ret = wait_for_bit_le32(®s->lcdc_lcdsr, LCDC_LCDSR_LCDSTS,
|
||||
true, 1000, false);
|
||||
if (ret)
|
||||
printf("%s: %d: Timeout!\n", __func__, __LINE__);
|
||||
value = readl(®s->lcdc_lcden);
|
||||
writel(value | LCDC_LCDEN_DISPEN, ®s->lcdc_lcden);
|
||||
ret = wait_for_bit(__func__, ®s->lcdc_lcdsr, LCDC_LCDSR_DISPSTS,
|
||||
true, 1000, false);
|
||||
ret = wait_for_bit_le32(®s->lcdc_lcdsr, LCDC_LCDSR_DISPSTS,
|
||||
true, 1000, false);
|
||||
if (ret)
|
||||
printf("%s: %d: Timeout!\n", __func__, __LINE__);
|
||||
value = readl(®s->lcdc_lcden);
|
||||
writel(value | LCDC_LCDEN_PWMEN, ®s->lcdc_lcden);
|
||||
ret = wait_for_bit(__func__, ®s->lcdc_lcdsr, LCDC_LCDSR_PWMSTS,
|
||||
true, 1000, false);
|
||||
ret = wait_for_bit_le32(®s->lcdc_lcdsr, LCDC_LCDSR_PWMSTS,
|
||||
true, 1000, false);
|
||||
if (ret)
|
||||
printf("%s: %d: Timeout!\n", __func__, __LINE__);
|
||||
|
||||
@@ -299,26 +299,26 @@ static void atmel_hlcdc_init(struct udevice *dev)
|
||||
|
||||
/* Disable DISP signal */
|
||||
writel(LCDC_LCDDIS_DISPDIS, ®s->lcdc_lcddis);
|
||||
ret = wait_for_bit(__func__, ®s->lcdc_lcdsr, LCDC_LCDSR_DISPSTS,
|
||||
false, 1000, false);
|
||||
ret = wait_for_bit_le32(®s->lcdc_lcdsr, LCDC_LCDSR_DISPSTS,
|
||||
false, 1000, false);
|
||||
if (ret)
|
||||
printf("%s: %d: Timeout!\n", __func__, __LINE__);
|
||||
/* Disable synchronization */
|
||||
writel(LCDC_LCDDIS_SYNCDIS, ®s->lcdc_lcddis);
|
||||
ret = wait_for_bit(__func__, ®s->lcdc_lcdsr, LCDC_LCDSR_LCDSTS,
|
||||
false, 1000, false);
|
||||
ret = wait_for_bit_le32(®s->lcdc_lcdsr, LCDC_LCDSR_LCDSTS,
|
||||
false, 1000, false);
|
||||
if (ret)
|
||||
printf("%s: %d: Timeout!\n", __func__, __LINE__);
|
||||
/* Disable pixel clock */
|
||||
writel(LCDC_LCDDIS_CLKDIS, ®s->lcdc_lcddis);
|
||||
ret = wait_for_bit(__func__, ®s->lcdc_lcdsr, LCDC_LCDSR_CLKSTS,
|
||||
false, 1000, false);
|
||||
ret = wait_for_bit_le32(®s->lcdc_lcdsr, LCDC_LCDSR_CLKSTS,
|
||||
false, 1000, false);
|
||||
if (ret)
|
||||
printf("%s: %d: Timeout!\n", __func__, __LINE__);
|
||||
/* Disable PWM */
|
||||
writel(LCDC_LCDDIS_PWMDIS, ®s->lcdc_lcddis);
|
||||
ret = wait_for_bit(__func__, ®s->lcdc_lcdsr, LCDC_LCDSR_PWMSTS,
|
||||
false, 1000, false);
|
||||
ret = wait_for_bit_le32(®s->lcdc_lcdsr, LCDC_LCDSR_PWMSTS,
|
||||
false, 1000, false);
|
||||
if (ret)
|
||||
printf("%s: %d: Timeout!\n", __func__, __LINE__);
|
||||
|
||||
@@ -451,26 +451,26 @@ static void atmel_hlcdc_init(struct udevice *dev)
|
||||
/* Enable LCD */
|
||||
value = readl(®s->lcdc_lcden);
|
||||
writel(value | LCDC_LCDEN_CLKEN, ®s->lcdc_lcden);
|
||||
ret = wait_for_bit(__func__, ®s->lcdc_lcdsr, LCDC_LCDSR_CLKSTS,
|
||||
true, 1000, false);
|
||||
ret = wait_for_bit_le32(®s->lcdc_lcdsr, LCDC_LCDSR_CLKSTS,
|
||||
true, 1000, false);
|
||||
if (ret)
|
||||
printf("%s: %d: Timeout!\n", __func__, __LINE__);
|
||||
value = readl(®s->lcdc_lcden);
|
||||
writel(value | LCDC_LCDEN_SYNCEN, ®s->lcdc_lcden);
|
||||
ret = wait_for_bit(__func__, ®s->lcdc_lcdsr, LCDC_LCDSR_LCDSTS,
|
||||
true, 1000, false);
|
||||
ret = wait_for_bit_le32(®s->lcdc_lcdsr, LCDC_LCDSR_LCDSTS,
|
||||
true, 1000, false);
|
||||
if (ret)
|
||||
printf("%s: %d: Timeout!\n", __func__, __LINE__);
|
||||
value = readl(®s->lcdc_lcden);
|
||||
writel(value | LCDC_LCDEN_DISPEN, ®s->lcdc_lcden);
|
||||
ret = wait_for_bit(__func__, ®s->lcdc_lcdsr, LCDC_LCDSR_DISPSTS,
|
||||
true, 1000, false);
|
||||
ret = wait_for_bit_le32(®s->lcdc_lcdsr, LCDC_LCDSR_DISPSTS,
|
||||
true, 1000, false);
|
||||
if (ret)
|
||||
printf("%s: %d: Timeout!\n", __func__, __LINE__);
|
||||
value = readl(®s->lcdc_lcden);
|
||||
writel(value | LCDC_LCDEN_PWMEN, ®s->lcdc_lcden);
|
||||
ret = wait_for_bit(__func__, ®s->lcdc_lcdsr, LCDC_LCDSR_PWMSTS,
|
||||
true, 1000, false);
|
||||
ret = wait_for_bit_le32(®s->lcdc_lcdsr, LCDC_LCDSR_PWMSTS,
|
||||
true, 1000, false);
|
||||
if (ret)
|
||||
printf("%s: %d: Timeout!\n", __func__, __LINE__);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user