Merge branch 'i2c/for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[mirror_ubuntu-zesty-kernel.git] / drivers / i2c / muxes / i2c-mux-pca954x.c

diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index 8bc3d36d28379ee9bf834b49d8022a310e55aee4..9a348ee4dc14deb9eb1686fd1a20dc672b73a5df 100644 (file)
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -35,6 +35,7 @@
  * 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>
@@ -120,6 +121,21 @@ static const struct i2c_device_id pca954x_id[] = {
 };
 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 = "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] },
@@ -245,8 +261,17 @@ 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
+       else if (id)
                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 */
 
@@ -321,6 +346,7 @@ 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,