Merge tag 'iio-fixes-for-3.14a' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / iio / light / tsl2563.c

diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c
index 2be6df3a1350c7c15e711e59ee76524a7b0b05c2..94daa9fc12478b868dbe73a5cdce7a767bdc34a3 100644 (file)
--- a/drivers/iio/light/tsl2563.c
+++ b/drivers/iio/light/tsl2563.c
@@ -706,10 +706,10 @@ static const struct iio_info tsl2563_info = {
        .driver_module = THIS_MODULE,
        .read_raw = &tsl2563_read_raw,
        .write_raw = &tsl2563_write_raw,
-       .read_event_value_new = &tsl2563_read_thresh,
-       .write_event_value_new = &tsl2563_write_thresh,
-       .read_event_config_new = &tsl2563_read_interrupt_config,
-       .write_event_config_new = &tsl2563_write_interrupt_config,
+       .read_event_value = &tsl2563_read_thresh,
+       .write_event_value = &tsl2563_write_thresh,
+       .read_event_config = &tsl2563_read_interrupt_config,
+       .write_event_config = &tsl2563_write_interrupt_config,
 };
 
 static int tsl2563_probe(struct i2c_client *client,
@@ -718,6 +718,7 @@ static int tsl2563_probe(struct i2c_client *client,
        struct iio_dev *indio_dev;
        struct tsl2563_chip *chip;
        struct tsl2563_platform_data *pdata = client->dev.platform_data;
+       struct device_node *np = client->dev.of_node;
        int err = 0;
        u8 id = 0;
 
@@ -754,6 +755,9 @@ static int tsl2563_probe(struct i2c_client *client,
 
        if (pdata)
                chip->cover_comp_gain = pdata->cover_comp_gain;
+       else if (np)
+               of_property_read_u32(np, "amstaos,cover-comp-gain",
+                                    &chip->cover_comp_gain);
        else
                chip->cover_comp_gain = 1;