diff options
author | Phil Reid <preid@electromag.com.au> | 2017-01-25 09:31:06 +0800 |
---|---|---|
committer | Peter Rosin <peda@axentia.se> | 2017-02-10 08:23:50 +0100 |
commit | f8251f1dfda9e1200545bf19270d9df2273bdfa1 (patch) | |
tree | a4cdab07403a8de1265eb67c0332764b44017894 /drivers/i2c | |
parent | 7a308bb3016f57e5be11a677d15b821536419d36 (diff) | |
download | blackbird-op-linux-f8251f1dfda9e1200545bf19270d9df2273bdfa1.tar.gz blackbird-op-linux-f8251f1dfda9e1200545bf19270d9df2273bdfa1.zip |
i2c: mux: pca954x: Add missing pca9542 definition to chip_desc
The spec for the pca954x was missing. This chip is the same as the pca9540
except that it has interrupt lines. While the i2c_device_id table mapped
the pca9542 to the pca9540 definition the compatible table did not. In
preparation for irq support add the pca9542 definition.
Signed-off-by: Phil Reid <preid@electromag.com.au>
Signed-off-by: Peter Rosin <peda@axentia.se>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/muxes/i2c-mux-pca954x.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c index dd18b9ccb1f4..bbf088e08d73 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -84,6 +84,11 @@ static const struct chip_desc chips[] = { .enable = 0x4, .muxtype = pca954x_ismux, }, + [pca_9542] = { + .nchans = 2, + .enable = 0x4, + .muxtype = pca954x_ismux, + }, [pca_9543] = { .nchans = 2, .muxtype = pca954x_isswi, @@ -110,7 +115,7 @@ static const struct chip_desc chips[] = { static const struct i2c_device_id pca954x_id[] = { { "pca9540", pca_9540 }, - { "pca9542", pca_9540 }, + { "pca9542", pca_9542 }, { "pca9543", pca_9543 }, { "pca9544", pca_9544 }, { "pca9545", pca_9545 }, @@ -124,7 +129,7 @@ MODULE_DEVICE_TABLE(i2c, pca954x_id); #ifdef CONFIG_ACPI static const struct acpi_device_id pca954x_acpi_ids[] = { { .id = "PCA9540", .driver_data = pca_9540 }, - { .id = "PCA9542", .driver_data = pca_9540 }, + { .id = "PCA9542", .driver_data = pca_9542 }, { .id = "PCA9543", .driver_data = pca_9543 }, { .id = "PCA9544", .driver_data = pca_9544 }, { .id = "PCA9545", .driver_data = pca_9545 }, |