From: Jonathan Cameron <jic23@kernel.org>
To: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: linux-iio@vger.kernel.org
Subject: Re: [PATCH 1/3] iio: imu: inv_mpu6050: ACPI enumeration
Date: Sat, 15 Mar 2014 15:56:09 +0000 [thread overview]
Message-ID: <53247819.8070709@kernel.org> (raw)
In-Reply-To: <1394571854-6737-1-git-send-email-srinivas.pandruvada@linux.intel.com>
On 11/03/14 21:04, Srinivas Pandruvada wrote:
> Added changes so that the module can be enumerated via ACPI.
> Also if there is no platform data available, it will use a default
> orientation data.
>
You add the mpu6500 to this driver? If so, that needs documenting etc.
> Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> ---
> drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 30 ++++++++++++++++++++++++++++--
> 1 file changed, 28 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> index df7f1e1..4a76697 100644
> --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> @@ -24,8 +24,16 @@
> #include <linux/kfifo.h>
> #include <linux/spinlock.h>
> #include <linux/iio/iio.h>
> +#include <linux/acpi.h>
> #include "inv_mpu_iio.h"
>
> +/* Define some default platform data, if not supplied */
> +static struct inv_mpu6050_platform_data inv_def_platform_data = {
> + .orientation = {-1, 0, 0,
> + 0, 1, 0,
> + 0, 0, -1 }
> +};
> +
> /*
> * this is the gyro scale translated from dynamic range plus/minus
> * {250, 500, 1000, 2000} to rad/s
> @@ -662,6 +670,7 @@ static int inv_mpu_probe(struct i2c_client *client,
> struct inv_mpu6050_state *st;
> struct iio_dev *indio_dev;
> int result;
> + char *name;
>
> if (!i2c_check_functionality(client->adapter,
> I2C_FUNC_SMBUS_I2C_BLOCK))
> @@ -673,7 +682,10 @@ static int inv_mpu_probe(struct i2c_client *client,
>
> st = iio_priv(indio_dev);
> st->client = client;
> - st->plat_data = *(struct inv_mpu6050_platform_data
> + if (!dev_get_platdata(&client->dev))
> + st->plat_data = inv_def_platform_data;
> + else
> + st->plat_data = *(struct inv_mpu6050_platform_data
> *)dev_get_platdata(&client->dev);
> /* power is turned on inside check chip type*/
> result = inv_check_and_setup_chip(st, id);
> @@ -689,7 +701,14 @@ static int inv_mpu_probe(struct i2c_client *client,
>
> i2c_set_clientdata(client, indio_dev);
> indio_dev->dev.parent = &client->dev;
> - indio_dev->name = id->name;
> + if (id && id->name)
As far as I know, there isn't a way for id->name to be null is there?
> + name = (char *)id->name;
> + else {
> + name = (char *)dev_name(&client->dev);
> + if (!name)
> + dev_err(&client->dev, "No iio dev name\n");
If it's an error, then you out to return an error from here rather than
carrying on.
> + }
> + indio_dev->name = name;
> indio_dev->channels = inv_mpu_channels;
> indio_dev->num_channels = ARRAY_SIZE(inv_mpu_channels);
>
> @@ -770,12 +789,19 @@ static const struct i2c_device_id inv_mpu_id[] = {
>
> MODULE_DEVICE_TABLE(i2c, inv_mpu_id);
>
> +static const struct acpi_device_id inv_acpi_match[] = {
> + {"INVN6500", 0},
For i2c we have the second field as INV_MPU6050. Now I'll admit it
doesn't seem to be used for anything, but it would be nice to be consistent.
> + { },
> +};
> +MODULE_DEVICE_TABLE(acpi, inv_acpi_match);
> +
> static struct i2c_driver inv_mpu_driver = {
> .probe = inv_mpu_probe,
> .remove = inv_mpu_remove,
> .id_table = inv_mpu_id,
> .driver = {
> .owner = THIS_MODULE,
> + .acpi_match_table = ACPI_PTR(inv_acpi_match),
> .name = "inv-mpu6050",
> .pm = INV_MPU6050_PMOPS,
> },
>
next prev parent reply other threads:[~2014-03-15 15:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-11 21:04 [PATCH 1/3] iio: imu: inv_mpu6050: ACPI enumeration Srinivas Pandruvada
2014-03-11 21:04 ` [PATCH 2/3] iio: imu: inv_mpu6050: Enable default bypass mode Srinivas Pandruvada
2014-03-15 16:01 ` Jonathan Cameron
2014-03-17 7:22 ` Manuel Stahl
2014-03-17 15:40 ` Srinivas Pandruvada
2014-03-17 17:17 ` Jonathan Cameron
2014-03-11 21:04 ` [PATCH 3/3] iio: imu: Enable checking of presence of device Srinivas Pandruvada
2014-03-15 16:04 ` Jonathan Cameron
2014-03-17 15:47 ` Srinivas Pandruvada
2014-03-15 15:56 ` Jonathan Cameron [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-12-15 21:19 [PATCH 0/3] Enable AK8963 conneted via INV6500 Srinivas Pandruvada
2014-12-15 21:19 ` [PATCH 1/3] iio: imu: inv_mpu6050: ACPI enumeration Srinivas Pandruvada
2014-12-26 12:39 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53247819.8070709@kernel.org \
--to=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=srinivas.pandruvada@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).