Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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"
+6
-28
+6
-28
drivers/i2c/muxes/i2c-mux-pca954x.c
+6
-28
drivers/i2c/muxes/i2c-mux-pca954x.c
···
35
35
* warranty of any kind, whether express or implied.
36
36
*/
37
37
38
-
#include <linux/acpi.h>
39
38
#include <linux/device.h>
40
39
#include <linux/gpio/consumer.h>
41
40
#include <linux/i2c.h>
···
116
117
.has_irq = 1,
117
118
.muxtype = pca954x_isswi,
118
119
},
120
+
[pca_9546] = {
121
+
.nchans = 4,
122
+
.muxtype = pca954x_isswi,
123
+
},
119
124
[pca_9547] = {
120
125
.nchans = 8,
121
126
.enable = 0x8,
···
137
134
{ "pca9543", pca_9543 },
138
135
{ "pca9544", pca_9544 },
139
136
{ "pca9545", pca_9545 },
140
-
{ "pca9546", pca_9545 },
137
+
{ "pca9546", pca_9546 },
141
138
{ "pca9547", pca_9547 },
142
139
{ "pca9548", pca_9548 },
143
140
{ }
144
141
};
145
142
MODULE_DEVICE_TABLE(i2c, pca954x_id);
146
-
147
-
#ifdef CONFIG_ACPI
148
-
static const struct acpi_device_id pca954x_acpi_ids[] = {
149
-
{ .id = "PCA9540", .driver_data = pca_9540 },
150
-
{ .id = "PCA9542", .driver_data = pca_9542 },
151
-
{ .id = "PCA9543", .driver_data = pca_9543 },
152
-
{ .id = "PCA9544", .driver_data = pca_9544 },
153
-
{ .id = "PCA9545", .driver_data = pca_9545 },
154
-
{ .id = "PCA9546", .driver_data = pca_9545 },
155
-
{ .id = "PCA9547", .driver_data = pca_9547 },
156
-
{ .id = "PCA9548", .driver_data = pca_9548 },
157
-
{ }
158
-
};
159
-
MODULE_DEVICE_TABLE(acpi, pca954x_acpi_ids);
160
-
#endif
161
143
162
144
#ifdef CONFIG_OF
163
145
static const struct of_device_id pca954x_of_match[] = {
···
381
393
match = of_match_device(of_match_ptr(pca954x_of_match), &client->dev);
382
394
if (match)
383
395
data->chip = of_device_get_match_data(&client->dev);
384
-
else if (id)
396
+
else
385
397
data->chip = &chips[id->driver_data];
386
-
else {
387
-
const struct acpi_device_id *acpi_id;
388
-
389
-
acpi_id = acpi_match_device(ACPI_PTR(pca954x_acpi_ids),
390
-
&client->dev);
391
-
if (!acpi_id)
392
-
return -ENODEV;
393
-
data->chip = &chips[acpi_id->driver_data];
394
-
}
395
398
396
399
data->last_chan = 0; /* force the first selection */
397
400
···
471
492
.name = "pca954x",
472
493
.pm = &pca954x_pm,
473
494
.of_match_table = of_match_ptr(pca954x_of_match),
474
-
.acpi_match_table = ACPI_PTR(pca954x_acpi_ids),
475
495
},
476
496
.probe = pca954x_probe,
477
497
.remove = pca954x_remove,