Commit b68cec9d authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman

staging: panel: fix lcd type

commit 2c20d92d upstream.

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.
Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Acked-by: default avatarWilly Tarreau <w@1wt.eu>
[wt: backport to 3.10 and 3.14]
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db834988
...@@ -275,11 +275,11 @@ static unsigned char lcd_bits[LCD_PORTS][LCD_BITS][BIT_STATES]; ...@@ -275,11 +275,11 @@ static unsigned char lcd_bits[LCD_PORTS][LCD_BITS][BIT_STATES];
* LCD types * LCD types
*/ */
#define LCD_TYPE_NONE 0 #define LCD_TYPE_NONE 0
#define LCD_TYPE_OLD 1 #define LCD_TYPE_CUSTOM 1
#define LCD_TYPE_KS0074 2 #define LCD_TYPE_OLD 2
#define LCD_TYPE_HANTRONIX 3 #define LCD_TYPE_KS0074 3
#define LCD_TYPE_NEXCOM 4 #define LCD_TYPE_HANTRONIX 4
#define LCD_TYPE_CUSTOM 5 #define LCD_TYPE_NEXCOM 5
/* /*
* keypad types * keypad types
...@@ -457,8 +457,7 @@ MODULE_PARM_DESC(keypad_enabled, "Deprecated option, use keypad_type instead"); ...@@ -457,8 +457,7 @@ MODULE_PARM_DESC(keypad_enabled, "Deprecated option, use keypad_type instead");
static int lcd_type = -1; static int lcd_type = -1;
module_param(lcd_type, int, 0000); module_param(lcd_type, int, 0000);
MODULE_PARM_DESC(lcd_type, MODULE_PARM_DESC(lcd_type,
"LCD type: 0=none, 1=old //, 2=serial ks0074, " "LCD type: 0=none, 1=compiled-in, 2=old, 3=serial ks0074, 4=hantronix, 5=nexcom");
"3=hantronix //, 4=nexcom //, 5=compiled-in");
static int lcd_proto = -1; static int lcd_proto = -1;
module_param(lcd_proto, int, 0000); module_param(lcd_proto, int, 0000);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment