diff options
| author |   Jeff LaBundy <jeff@labundy.com> | 2022-01-23 13:01:05 -0600 |
|---|---|---|
| committer |   Lee Jones <lee.jones@linaro.org> | 2022-02-14 13:07:22 +0000 |
| commit | 1de785a58035031f81a43c42f355fa1db510dc36 (patch) | |
| tree | 18f8025a6e87aad2f838da63a9eeb6e071bfd719 /drivers/mfd | |
| parent | Linux 5.17-rc1 (diff) | |
| download | linux-dev-1de785a58035031f81a43c42f355fa1db510dc36.tar.xz linux-dev-1de785a58035031f81a43c42f355fa1db510dc36.zip | |
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: Jeff LaBundy <jeff@labundy.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/iqs62x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/iqs62x.c b/drivers/mfd/iqs62x.c index 9805cf191245..575ab67e243d 100644 --- a/drivers/mfd/iqs62x.c +++ b/drivers/mfd/iqs62x.c @@ -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; |