Title: [9667] trunk/drivers/staging/iio/magnetometer/ak8975.c: merge from upstream: staging: iio: ak8975: add platform data.
- Revision
- 9667
- Author
- vapier
- Date
- 2011-03-01 16:17:16 -0500 (Tue, 01 Mar 2011)
Log Message
merge from upstream: staging: iio: ak8975: add platform data.
From: Tony SIM <[email protected]>
As some of the platform not support irq_to_gpio, we pass gpio port
by platform data.
Signed-off-by: Tony SIM <[email protected]>
Signed-off-by: Andrew Chew <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Modified Paths
Diff
Modified: trunk/drivers/staging/iio/magnetometer/ak8975.c (9666 => 9667)
--- trunk/drivers/staging/iio/magnetometer/ak8975.c 2011-03-01 21:17:12 UTC (rev 9666)
+++ trunk/drivers/staging/iio/magnetometer/ak8975.c 2011-03-01 21:17:16 UTC (rev 9667)
@@ -29,6 +29,7 @@
#include <linux/delay.h>
#include <linux/gpio.h>
+#include <linux/input/ak8975.h>
#include "../iio.h"
#include "magnet.h"
@@ -435,6 +436,7 @@
const struct i2c_device_id *id)
{
struct ak8975_data *data;
+ struct ak8975_platform_data *pdata;
int err;
/* Allocate our device context. */
@@ -452,7 +454,11 @@
/* Grab and set up the supplied GPIO. */
data->eoc_irq = client->irq;
- data->eoc_gpio = irq_to_gpio(client->irq);
+ pdata = client->dev.platform_data;
+ if (pdata)
+ data->eoc_gpio = pdata->gpio;
+ else
+ data->eoc_gpio = irq_to_gpio(client->irq);
if (!data->eoc_gpio) {
dev_err(&client->dev, "failed, no valid GPIO\n");
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
