Commit 1de785a5 authored by Jeff LaBundy's avatar Jeff LaBundy Committed by Lee Jones
Browse files

mfd: iqs62x: Provide device revision to sub-devices 



Individual sub-devices may elect to make decisions based on the
specific revision of silicon encountered at probe. This data is
already read from the device, but is not retained.

Pass this data on to the sub-devices by adding the software and
hardware numbers (registers 0x01 and 0x02, respectively) to the
iqs62x_core struct.

Signed-off-by: default avatarJeff LaBundy <jeff@labundy.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent e783362e

drivers/mfd/iqs62x.c

+3 −3
Original line number Diff line number Diff line
@@ -898,7 +898,6 @@ static int iqs62x_probe(struct i2c_client *client) 
	struct iqs62x_info info;

	unsigned int val;

	int ret, i, j;

	u8 sw_num = 0;

	const char *fw_name = NULL;



	iqs62x = devm_kzalloc(&client->dev, sizeof(*iqs62x), GFP_KERNEL);
@@ -949,7 +948,8 @@ static int iqs62x_probe(struct i2c_client *client) 
		if (info.sw_num < iqs62x->dev_desc->sw_num)

			continue;



		sw_num = info.sw_num;

		iqs62x->sw_num = info.sw_num;

		iqs62x->hw_num = info.hw_num;



		/*

		 * Read each of the device's designated calibration registers,
@@ -985,7 +985,7 @@ static int iqs62x_probe(struct i2c_client *client) 
		return -EINVAL;

	}



	if (!sw_num) {

	if (!iqs62x->sw_num) {

		dev_err(&client->dev, "Unrecognized software number: 0x%02X\n",

			info.sw_num);

		return -EINVAL;

include/linux/mfd/iqs62x.h

+7 −0
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@ 
#define IQS624_PROD_NUM				0x43

#define IQS625_PROD_NUM				0x4E



#define IQS620_HW_NUM_V0			0x82

#define IQS620_HW_NUM_V1			IQS620_HW_NUM_V0

#define IQS620_HW_NUM_V2			IQS620_HW_NUM_V0

#define IQS620_HW_NUM_V3			0x92



#define IQS621_ALS_FLAGS			0x16

#define IQS622_ALS_FLAGS			0x14
@@ -129,6 +134,8 @@ struct iqs62x_core { 
	struct completion fw_done;

	enum iqs62x_ui_sel ui_sel;

	unsigned long event_cache;

	u8 sw_num;

	u8 hw_num;

};



extern const struct iqs62x_event_desc iqs62x_events[IQS62X_NUM_EVENTS];