Commit aebfc52c authored by Hans de Goede's avatar Hans de Goede Committed by Dmitry Torokhov
Browse files

Input: goodix - move defines to above struct goodix_ts_data declaration 

Move the  defines to above the struct goodix_ts_data declaration, so
that the MAX defines can be used inside the struct goodix_ts_data
declaration. No functional changes, just moving a block of code.

BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1786317
BugLink: https://github.com/nexus511/gpd-ubuntu-packages/issues/10
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=199207


Reviewed-by: default avatarBastien Nocera <hadess@hadess.net>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20200307121505.3707-7-hdegoede@redhat.com


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent c5fca485

drivers/input/touchscreen/goodix.c

+30 −30
Original line number Diff line number Diff line
@@ -29,6 +29,36 @@ 
#include <linux/of.h>

#include <asm/unaligned.h>



#define GOODIX_GPIO_INT_NAME		"irq"

#define GOODIX_GPIO_RST_NAME		"reset"



#define GOODIX_MAX_HEIGHT		4096

#define GOODIX_MAX_WIDTH		4096

#define GOODIX_INT_TRIGGER		1

#define GOODIX_CONTACT_SIZE		8

#define GOODIX_MAX_CONTACT_SIZE		9

#define GOODIX_MAX_CONTACTS		10



#define GOODIX_CONFIG_MAX_LENGTH	240

#define GOODIX_CONFIG_911_LENGTH	186

#define GOODIX_CONFIG_967_LENGTH	228



/* Register defines */

#define GOODIX_REG_COMMAND		0x8040

#define GOODIX_CMD_SCREEN_OFF		0x05



#define GOODIX_READ_COOR_ADDR		0x814E

#define GOODIX_GT1X_REG_CONFIG_DATA	0x8050

#define GOODIX_GT9X_REG_CONFIG_DATA	0x8047

#define GOODIX_REG_ID			0x8140



#define GOODIX_BUFFER_STATUS_READY	BIT(7)

#define GOODIX_BUFFER_STATUS_TIMEOUT	20



#define RESOLUTION_LOC		1

#define MAX_CONTACTS_LOC	5

#define TRIGGER_LOC		6



struct goodix_ts_data;



enum goodix_irq_pin_access_method {
@@ -68,36 +98,6 @@ struct goodix_ts_data { 
	unsigned int contact_size;

};



#define GOODIX_GPIO_INT_NAME		"irq"

#define GOODIX_GPIO_RST_NAME		"reset"



#define GOODIX_MAX_HEIGHT		4096

#define GOODIX_MAX_WIDTH		4096

#define GOODIX_INT_TRIGGER		1

#define GOODIX_CONTACT_SIZE		8

#define GOODIX_MAX_CONTACT_SIZE		9

#define GOODIX_MAX_CONTACTS		10



#define GOODIX_CONFIG_MAX_LENGTH	240

#define GOODIX_CONFIG_911_LENGTH	186

#define GOODIX_CONFIG_967_LENGTH	228



/* Register defines */

#define GOODIX_REG_COMMAND		0x8040

#define GOODIX_CMD_SCREEN_OFF		0x05



#define GOODIX_READ_COOR_ADDR		0x814E

#define GOODIX_GT1X_REG_CONFIG_DATA	0x8050

#define GOODIX_GT9X_REG_CONFIG_DATA	0x8047

#define GOODIX_REG_ID			0x8140



#define GOODIX_BUFFER_STATUS_READY	BIT(7)

#define GOODIX_BUFFER_STATUS_TIMEOUT	20



#define RESOLUTION_LOC		1

#define MAX_CONTACTS_LOC	5

#define TRIGGER_LOC		6



static int goodix_check_cfg_8(struct goodix_ts_data *ts,

			const struct firmware *cfg);

static int goodix_check_cfg_16(struct goodix_ts_data *ts,

CRA Git | Maintained and supported by SUSTech CRA and CCSE