Commit 3fc04dd7 authored by Lars Poeschel's avatar Lars Poeschel Committed by Miguel Ojeda
Browse files

auxdisplay: Move ifwidth to struct hd44780_common 



Move struct charlcd member ifwidth to our new struct hd44780_common.
ifwidth is hd44780 device specific and is used by two drivers at the
moment, so we move it to a common place, where both can use this.

Reviewed-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarLars Poeschel <poeschel@lemonage.de>
Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent 2545c1c9

drivers/auxdisplay/charlcd.c

+6 −6
Original line number Diff line number Diff line
@@ -223,9 +223,10 @@ static int charlcd_init_display(struct charlcd *lcd) 
{

	void (*write_cmd_raw)(struct charlcd *lcd, int cmd);

	struct charlcd_priv *priv = charlcd_to_priv(lcd);

	struct hd44780_common *hdc = lcd->drvdata;

	u8 init;



	if (lcd->ifwidth != 4 && lcd->ifwidth != 8)

	if (hdc->ifwidth != 4 && hdc->ifwidth != 8)

		return -EINVAL;



	priv->flags = ((lcd->height > 1) ? LCD_FLAG_N : 0) | LCD_FLAG_D |
@@ -238,7 +239,7 @@ static int charlcd_init_display(struct charlcd *lcd) 
	 * the LCD is in 8-bit mode afterwards

	 */

	init = LCD_CMD_FUNCTION_SET | LCD_CMD_DATA_LEN_8BITS;

	if (lcd->ifwidth == 4) {

	if (hdc->ifwidth == 4) {

		init >>= 4;

		write_cmd_raw = lcd->ops->write_cmd_raw4;

	} else {
@@ -251,7 +252,7 @@ static int charlcd_init_display(struct charlcd *lcd) 
	write_cmd_raw(lcd, init);

	long_sleep(10);



	if (lcd->ifwidth == 4) {

	if (hdc->ifwidth == 4) {

		/* Switch to 4-bit mode, 1 line, small fonts */

		lcd->ops->write_cmd_raw4(lcd, LCD_CMD_FUNCTION_SET >> 4);

		long_sleep(10);
@@ -260,7 +261,7 @@ static int charlcd_init_display(struct charlcd *lcd) 
	/* set font height and lines number */

	lcd->ops->write_cmd(lcd,

		LCD_CMD_FUNCTION_SET |

		((lcd->ifwidth == 8) ? LCD_CMD_DATA_LEN_8BITS : 0) |

		((hdc->ifwidth == 8) ? LCD_CMD_DATA_LEN_8BITS : 0) |

		((priv->flags & LCD_FLAG_F) ? LCD_CMD_FONT_5X10_DOTS : 0) |

		((priv->flags & LCD_FLAG_N) ? LCD_CMD_TWO_LINES : 0));

	long_sleep(10);
@@ -543,7 +544,7 @@ static inline int handle_lcd_special_code(struct charlcd *lcd) 
	else if ((oldflags ^ priv->flags) & (LCD_FLAG_F | LCD_FLAG_N))

		lcd->ops->write_cmd(lcd,

			LCD_CMD_FUNCTION_SET |

			((lcd->ifwidth == 8) ? LCD_CMD_DATA_LEN_8BITS : 0) |

			((hdc->ifwidth == 8) ? LCD_CMD_DATA_LEN_8BITS : 0) |

			((priv->flags & LCD_FLAG_F) ? LCD_CMD_FONT_5X10_DOTS : 0) |

			((priv->flags & LCD_FLAG_N) ? LCD_CMD_TWO_LINES : 0));

	/* check whether L flag was changed */
@@ -794,7 +795,6 @@ struct charlcd *charlcd_alloc(void) 
	priv->esc_seq.len = -1;



	lcd = &priv->lcd;

	lcd->ifwidth = 8;



	return lcd;

}

drivers/auxdisplay/charlcd.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ struct charlcd { 
	const struct charlcd_ops *ops;

	const unsigned char *char_conv;	/* Optional */



	int ifwidth;			/* 4-bit or 8-bit (default) */

	int height;

	int width;

drivers/auxdisplay/hd44780.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static int hd44780_probe(struct platform_device *pdev) 
	/* Optional properties */

	device_property_read_u32(dev, "internal-buffer-width", &hdc->bwidth);



	lcd->ifwidth = ifwidth;

	hdc->ifwidth = ifwidth;

	lcd->ops = ifwidth == 8 ? &hd44780_ops_gpio8 : &hd44780_ops_gpio4;



	ret = charlcd_register(lcd);

drivers/auxdisplay/hd44780_common.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ struct hd44780_common *hd44780_common_alloc(void) 
	if (!hd)

		return NULL;



	hd->ifwidth = 8;

	hd->bwidth = DEFAULT_LCD_BWIDTH;

	hd->hwidth = DEFAULT_LCD_HWIDTH;

	return hd;

drivers/auxdisplay/hd44780_common.h

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#define DEFAULT_LCD_HWIDTH      64



struct hd44780_common {

	int ifwidth;			/* 4-bit or 8-bit (default) */

	int bwidth;			/* Default set by hd44780_alloc() */

	int hwidth;			/* Default set by hd44780_alloc() */

	void *hd44780;