2 files changed, 27 insertions, 3 deletions

diff --git a/Documentation/devicetree/bindings/iio/magnetometer/ak8975.txt b/Documentation/devicetree/bindings/iio/magnetometer/ak8975.txt
new file mode 100644
index 000000000000..011679f1a425
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/magnetometer/ak8975.txt
@@ -0,0 +1,18 @@
+* AsahiKASEI AK8975 magnetometer sensor
+
+Required properties:
+
+  - compatible : should be "asahi-kasei,ak8975"
+  - reg : the I2C address of the magnetometer
+
+Optional properties:
+
+  - gpios : should be device tree identifier of the magnetometer DRDY pin
+
+Example:
+
+ak8975@0c {
+        compatible = "asahi-kasei,ak8975";
+        reg = <0x0c>;
+        gpios = <&gpj0 7 0>;
+};
diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
index af6c320a534e..d75cc23e8ae7 100644
--- a/drivers/iio/magnetometer/ak8975.c
+++ b/drivers/iio/magnetometer/ak8975.c
@@ -29,6 +29,7 @@
 #include <linux/delay.h>
 
 #include <linux/gpio.h>
+#include <linux/of_gpio.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
@@ -384,10 +385,15 @@ static int ak8975_probe(struct i2c_client *client,
         int err;
 
         /* Grab and set up the supplied GPIO. */
-        if (client->dev.platform_data == NULL)
-                eoc_gpio = -1;
-        else
+        if (client->dev.platform_data)
                 eoc_gpio = *(int *)(client->dev.platform_data);
+        else if (client->dev.of_node)
+                eoc_gpio = of_get_gpio(client->dev.of_node, 0);
+        else
+                eoc_gpio = -1;
+
+        if (eoc_gpio == -EPROBE_DEFER)
+                return -EPROBE_DEFER;
 
         /* We may not have a GPIO based IRQ to scan, that is fine, we will
            poll if so */