On 11/03/14 21:15, Srinivas Pandruvada wrote:
Added capability so that this device can be enumerated via ACPI.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx>
Please include a relevant list for the ACPI side of this in the CCs for the next
version. I certainly have very little ACPI experience, so would be good if someone
who has can take a quick look!
The comments below are much the same as for the previous patch...
---
drivers/iio/magnetometer/ak8975.c | 35 ++++++++++++++++++++++++++++++++++-
1 file changed, 34 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
index a55c94f..fe5e9c8 100644
--- a/drivers/iio/magnetometer/ak8975.c
+++ b/drivers/iio/magnetometer/ak8975.c
@@ -31,6 +31,7 @@
#include <linux/bitops.h>
#include <linux/gpio.h>
#include <linux/of_gpio.h>
+#include <linux/acpi.h>
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
@@ -476,6 +477,27 @@ static const struct iio_info ak8975_info = {
.driver_module = THIS_MODULE,
};
+static const struct acpi_device_id ak_acpi_match[] = {
+ {"AK8975", 0},
As with the previous patch, use the enum entry for the 0 as well.
+ {"AK8963", AK8963},
+ {"INVN6500", AK8963},
I'll take your word for it that this last one makes sense!
+ { },
+};
+MODULE_DEVICE_TABLE(acpi, ak_acpi_match);
+
+static char *ak8975_match_acpi_device(struct device *dev,
+ int *chipset)
+{
+ const struct acpi_device_id *id;
+
+ id = acpi_match_device(dev->driver->acpi_match_table, dev);
+ if (!id)
+ return NULL;
+ *chipset = (int)id->driver_data;
+
+ return (char *)dev_name(dev);
+}
+
static int ak8975_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
@@ -483,7 +505,10 @@ static int ak8975_probe(struct i2c_client *client,
struct iio_dev *indio_dev;
int eoc_gpio;
int err;
+ char *name = NULL;
I'm guessing id still can't be null. Hence no need to set name to NULL either.
+ if (id)
+ name = (char *) id->name;
/* Grab and set up the supplied GPIO. */
if (client->dev.platform_data)
eoc_gpio = *(int *)(client->dev.platform_data);
@@ -529,6 +554,13 @@ static int ak8975_probe(struct i2c_client *client,
dev_dbg(&client->dev,
"AK8975 driver is running in normal mode\n");
}
+ if (ACPI_HANDLE(&client->dev)) {
+ int chip_id;
+
+ name = ak8975_match_acpi_device(&client->dev, &chip_id);
+ if (chip_id > 0)
+ data->chipset = chip_id;
+ }
/* Perform some basic start-of-day setup of the device. */
err = ak8975_setup(client);
@@ -545,7 +577,7 @@ static int ak8975_probe(struct i2c_client *client,
indio_dev->num_channels = ARRAY_SIZE(ak8975_channels);
indio_dev->info = &ak8975_info;
indio_dev->modes = INDIO_DIRECT_MODE;
-
Just use id->name directly?
+ indio_dev->name = name;
err = iio_device_register(indio_dev);
if (err < 0)
goto exit_free_iio;
@@ -600,6 +632,7 @@ static struct i2c_driver ak8975_driver = {
.driver = {
.name = "ak8975",
.of_match_table = ak8975_of_match,
+ .acpi_match_table = ACPI_PTR(ak_acpi_match),
},
.probe = ak8975_probe,
.remove = ak8975_remove,
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
