Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang: "Two bugfixes from I2C, specifically the I2C mux section. Thanks to peda for collecting them" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: mux: pca954x: Add missing pca9546 definition to chip_desc Revert "i2c: mux: pca954x: Add ACPI support for pca954x"
This commit is contained in:
commit
1300dc689f
|
@ -35,7 +35,6 @@
|
|||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
#include <linux/acpi.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/gpio/consumer.h>
|
||||
#include <linux/i2c.h>
|
||||
|
@ -117,6 +116,10 @@ static const struct chip_desc chips[] = {
|
|||
.has_irq = 1,
|
||||
.muxtype = pca954x_isswi,
|
||||
},
|
||||
[pca_9546] = {
|
||||
.nchans = 4,
|
||||
.muxtype = pca954x_isswi,
|
||||
},
|
||||
[pca_9547] = {
|
||||
.nchans = 8,
|
||||
.enable = 0x8,
|
||||
|
@ -134,28 +137,13 @@ static const struct i2c_device_id pca954x_id[] = {
|
|||
{ "pca9543", pca_9543 },
|
||||
{ "pca9544", pca_9544 },
|
||||
{ "pca9545", pca_9545 },
|
||||
{ "pca9546", pca_9545 },
|
||||
{ "pca9546", pca_9546 },
|
||||
{ "pca9547", pca_9547 },
|
||||
{ "pca9548", pca_9548 },
|
||||
{ }
|
||||
};
|
||||
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_9542 },
|
||||
{ .id = "PCA9543", .driver_data = pca_9543 },
|
||||
{ .id = "PCA9544", .driver_data = pca_9544 },
|
||||
{ .id = "PCA9545", .driver_data = pca_9545 },
|
||||
{ .id = "PCA9546", .driver_data = pca_9545 },
|
||||
{ .id = "PCA9547", .driver_data = pca_9547 },
|
||||
{ .id = "PCA9548", .driver_data = pca_9548 },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(acpi, pca954x_acpi_ids);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static const struct of_device_id pca954x_of_match[] = {
|
||||
{ .compatible = "nxp,pca9540", .data = &chips[pca_9540] },
|
||||
|
@ -393,17 +381,8 @@ static int pca954x_probe(struct i2c_client *client,
|
|||
match = of_match_device(of_match_ptr(pca954x_of_match), &client->dev);
|
||||
if (match)
|
||||
data->chip = of_device_get_match_data(&client->dev);
|
||||
else if (id)
|
||||
else
|
||||
data->chip = &chips[id->driver_data];
|
||||
else {
|
||||
const struct acpi_device_id *acpi_id;
|
||||
|
||||
acpi_id = acpi_match_device(ACPI_PTR(pca954x_acpi_ids),
|
||||
&client->dev);
|
||||
if (!acpi_id)
|
||||
return -ENODEV;
|
||||
data->chip = &chips[acpi_id->driver_data];
|
||||
}
|
||||
|
||||
data->last_chan = 0; /* force the first selection */
|
||||
|
||||
|
@ -492,7 +471,6 @@ static struct i2c_driver pca954x_driver = {
|
|||
.name = "pca954x",
|
||||
.pm = &pca954x_pm,
|
||||
.of_match_table = of_match_ptr(pca954x_of_match),
|
||||
.acpi_match_table = ACPI_PTR(pca954x_acpi_ids),
|
||||
},
|
||||
.probe = pca954x_probe,
|
||||
.remove = pca954x_remove,
|
||||
|
|
Loading…
Reference in a new issue