Commit 5ea0cf77 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'auxdisplay-6.6' of https://github.com/ojeda/linux 

Pull auxdisplay update from Miguel Ojeda:

 - hd44780: move cursor home after clear display command

   The change allows to support displays like the NewHaven
   NHD-0220DZW-AG5 which has a non-standard controller.

* tag 'auxdisplay-6.6' of https://github.com/ojeda/linux:
  auxdisplay: hd44780: move cursor home after clear display command
parents a031fe8d 35b464e3

drivers/auxdisplay/hd44780_common.c

+9 −1
Original line number Diff line number Diff line
@@ -82,7 +82,15 @@ int hd44780_common_clear_display(struct charlcd *lcd) 
	hdc->write_cmd(hdc, LCD_CMD_DISPLAY_CLEAR);

	/* datasheet says to wait 1,64 milliseconds */

	long_sleep(2);

	return 0;



	/*

	 * The Hitachi HD44780 controller (and compatible ones) reset the DDRAM

	 * address when executing the DISPLAY_CLEAR command, thus the

	 * following call is not required. However, other controllers do not

	 * (e.g. NewHaven NHD-0220DZW-AG5), thus move the cursor to home

	 * unconditionally to support both.

	 */

	return hd44780_common_home(lcd);

}

EXPORT_SYMBOL_GPL(hd44780_common_clear_display);