Skip to content

Commit 05eab54

Browse files
kaecheledtor
authored andcommitted
Input: himax_hx83112b - use more descriptive register defines
Himax uses an AHB-style bus to communicate with different parts of the display driver and touch controller system. Use more descriptive names for the register and address defines. The names were taken from a driver submission for the similar HX83102J chip. Signed-off-by: Felix Kaechele <felix@kaechele.ca> Link: https://lore.kernel.org/all/TY0PR06MB561105A3386E9D76F429110D9E0F2@TY0PR06MB5611.apcprd06.prod.outlook.com/ Link: https://lore.kernel.org/r/20240620145019.156187-3-felix@kaechele.ca Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent a742e61 commit 05eab54

1 file changed

Lines changed: 13 additions & 10 deletions

File tree

drivers/input/touchscreen/himax_hx83112b.c

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@
2424

2525
#define HIMAX_MAX_POINTS 10
2626

27-
#define HIMAX_REG_CFG_SET_ADDR 0x00
28-
#define HIMAX_REG_CFG_INIT_READ 0x0c
29-
#define HIMAX_REG_CFG_READ_VALUE 0x08
30-
#define HIMAX_REG_READ_EVENT 0x30
27+
#define HIMAX_AHB_ADDR_BYTE_0 0x00
28+
#define HIMAX_AHB_ADDR_RDATA_BYTE_0 0x08
29+
#define HIMAX_AHB_ADDR_ACCESS_DIRECTION 0x0c
30+
#define HIMAX_AHB_ADDR_EVENT_STACK 0x30
3131

32-
#define HIMAX_CFG_PRODUCT_ID 0x900000d0
32+
#define HIMAX_AHB_CMD_ACCESS_DIRECTION_READ 0x00
33+
34+
#define HIMAX_REG_ADDR_ICID 0x900000d0
3335

3436
#define HIMAX_INVALID_COORD 0xffff
3537

@@ -67,15 +69,16 @@ static int himax_read_config(struct himax_ts_data *ts, u32 address, u32 *dst)
6769
{
6870
int error;
6971

70-
error = regmap_write(ts->regmap, HIMAX_REG_CFG_SET_ADDR, address);
72+
error = regmap_write(ts->regmap, HIMAX_AHB_ADDR_BYTE_0, address);
7173
if (error)
7274
return error;
7375

74-
error = regmap_write(ts->regmap, HIMAX_REG_CFG_INIT_READ, 0x0);
76+
error = regmap_write(ts->regmap, HIMAX_AHB_ADDR_ACCESS_DIRECTION,
77+
HIMAX_AHB_CMD_ACCESS_DIRECTION_READ);
7578
if (error)
7679
return error;
7780

78-
error = regmap_read(ts->regmap, HIMAX_REG_CFG_READ_VALUE, dst);
81+
error = regmap_read(ts->regmap, HIMAX_AHB_ADDR_RDATA_BYTE_0, dst);
7982
if (error)
8083
return error;
8184

@@ -101,7 +104,7 @@ static int himax_read_product_id(struct himax_ts_data *ts, u32 *product_id)
101104
{
102105
int error;
103106

104-
error = himax_read_config(ts, HIMAX_CFG_PRODUCT_ID, product_id);
107+
error = himax_read_config(ts, HIMAX_REG_ADDR_ICID, product_id);
105108
if (error)
106109
return error;
107110

@@ -235,7 +238,7 @@ static int himax_handle_input(struct himax_ts_data *ts)
235238
int error;
236239
struct himax_event event;
237240

238-
error = regmap_raw_read(ts->regmap, HIMAX_REG_READ_EVENT, &event,
241+
error = regmap_raw_read(ts->regmap, HIMAX_AHB_ADDR_EVENT_STACK, &event,
239242
sizeof(event));
240243
if (error) {
241244
dev_err(&ts->client->dev, "Failed to read input event: %d\n",

0 commit comments

Comments
 (0)