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

Commit 2c20d92d authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman
Browse files

staging: panel: fix lcd type 



the lcd type as defined in the Kconfig is not matching in the code.
as a result the rs, rw and en pins were getting interchanged.
Kconfig defines the value of PANEL_LCD to be 1 if we select custom
configuration but in the code LCD_TYPE_CUSTOM is defined as 5.

my hardware is LCD_TYPE_CUSTOM, but the pins were assigned to it
as pins of LCD_TYPE_OLD, and it was not working.
Now values are corrected with referenece to the values defined in
Kconfig and it is working.
checked on JHD204A lcd with LCD_TYPE_CUSTOM configuration.

Cc: <stable@vger.kernel.org> # 2.6.32+
Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Acked-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8e43c9c7

drivers/staging/panel/panel.c

+6 −6
Original line number Diff line number Diff line
@@ -335,11 +335,11 @@ static unsigned char lcd_bits[LCD_PORTS][LCD_BITS][BIT_STATES]; 
 * LCD types

 */

#define LCD_TYPE_NONE		0

#define LCD_TYPE_OLD		1

#define LCD_TYPE_KS0074		2

#define LCD_TYPE_HANTRONIX	3

#define LCD_TYPE_NEXCOM		4

#define LCD_TYPE_CUSTOM		5

#define LCD_TYPE_CUSTOM		1

#define LCD_TYPE_OLD		2

#define LCD_TYPE_KS0074		3

#define LCD_TYPE_HANTRONIX	4

#define LCD_TYPE_NEXCOM		5



/*

 * keypad types
@@ -500,7 +500,7 @@ MODULE_PARM_DESC(keypad_type, 
static int lcd_type = NOT_SET;

module_param(lcd_type, int, 0000);

MODULE_PARM_DESC(lcd_type,

		 "LCD type: 0=none, 1=old //, 2=serial ks0074, 3=hantronix //, 4=nexcom //, 5=compiled-in");

		 "LCD type: 0=none, 1=compiled-in, 2=old, 3=serial ks0074, 4=hantronix, 5=nexcom");



static int lcd_height = NOT_SET;

module_param(lcd_height, int, 0000);