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

Commit 909f10de authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

sh: LCDC SYS bus access wait fix 



Update the SuperH Mobile LCDC driver to wait for SYS bus to
become idle after reading or writing. This is needed by the
kfr2r09 board, but also fixes potential problems on other
boards making use of the LCDC in a SYS configuration.

Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent c1155e34

drivers/video/sh_mobile_lcdcfb.c

+3 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ static void lcdc_sys_write_index(void *handle, unsigned long data) 
	lcdc_write(ch->lcdc, _LDDWD0R, data | 0x10000000);

	lcdc_wait_bit(ch->lcdc, _LDSR, 2, 0);

	lcdc_write(ch->lcdc, _LDDWAR, 1 | (lcdc_chan_is_sublcd(ch) ? 2 : 0));

	lcdc_wait_bit(ch->lcdc, _LDSR, 2, 0);

}



static void lcdc_sys_write_data(void *handle, unsigned long data)
@@ -163,6 +164,7 @@ static void lcdc_sys_write_data(void *handle, unsigned long data) 
	lcdc_write(ch->lcdc, _LDDWD0R, data | 0x11000000);

	lcdc_wait_bit(ch->lcdc, _LDSR, 2, 0);

	lcdc_write(ch->lcdc, _LDDWAR, 1 | (lcdc_chan_is_sublcd(ch) ? 2 : 0));

	lcdc_wait_bit(ch->lcdc, _LDSR, 2, 0);

}



static unsigned long lcdc_sys_read_data(void *handle)
@@ -173,6 +175,7 @@ static unsigned long lcdc_sys_read_data(void *handle) 
	lcdc_wait_bit(ch->lcdc, _LDSR, 2, 0);

	lcdc_write(ch->lcdc, _LDDRAR, 1 | (lcdc_chan_is_sublcd(ch) ? 2 : 0));

	udelay(1);

	lcdc_wait_bit(ch->lcdc, _LDSR, 2, 0);



	return lcdc_read(ch->lcdc, _LDDRDR) & 0xffff;

}