| Message ID | 20200815012227.32538-2-chris.ruehl@gtsys.com.hk (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | shtc1: add support for device tree bindings | expand |
On Sat, Aug 15, 2020 at 09:22:26AM +0800, Chris Ruehl wrote: > Add support for DTS bindings for the sensirion shtc1,shtw1 and shtc3. > > Signed-off-by: Chris Ruehl <chris.ruehl@gtsys.com.hk> > Reviewed-by: Guenter Roeck <linux@roeck-us.net> Applied. Thanks, Guenter > --- > v8: no change > > drivers/hwmon/shtc1.c | 25 ++++++++++++++++++++++--- > 1 file changed, 22 insertions(+), 3 deletions(-) > > diff --git a/drivers/hwmon/shtc1.c b/drivers/hwmon/shtc1.c > index a0078ccede03..7993a5ff8768 100644 > --- a/drivers/hwmon/shtc1.c > +++ b/drivers/hwmon/shtc1.c > @@ -14,6 +14,7 @@ > #include <linux/err.h> > #include <linux/delay.h> > #include <linux/platform_data/shtc1.h> > +#include <linux/of.h> > > /* commands (high precision mode) */ > static const unsigned char shtc1_cmd_measure_blocking_hpm[] = { 0x7C, 0xA2 }; > @@ -196,6 +197,7 @@ static int shtc1_probe(struct i2c_client *client, > enum shtcx_chips chip = id->driver_data; > struct i2c_adapter *adap = client->adapter; > struct device *dev = &client->dev; > + struct device_node *np = dev->of_node; > > if (!i2c_check_functionality(adap, I2C_FUNC_I2C)) { > dev_err(dev, "plain i2c transactions not supported\n"); > @@ -233,8 +235,14 @@ static int shtc1_probe(struct i2c_client *client, > data->client = client; > data->chip = chip; > > - if (client->dev.platform_data) > - data->setup = *(struct shtc1_platform_data *)dev->platform_data; > + if (np) { > + data->setup.blocking_io = of_property_read_bool(np, "sensirion,blocking-io"); > + data->setup.high_precision = !of_property_read_bool(np, "sensicon,low-precision"); > + } else { > + if (client->dev.platform_data) > + data->setup = *(struct shtc1_platform_data *)dev->platform_data; > + } > + > shtc1_select_command(data); > mutex_init(&data->update_lock); > > @@ -257,8 +265,19 @@ static const struct i2c_device_id shtc1_id[] = { > }; > MODULE_DEVICE_TABLE(i2c, shtc1_id); > > +static const struct of_device_id shtc1_of_match[] = { > + { .compatible = "sensirion,shtc1" }, > + { .compatible = "sensirion,shtw1" }, > + { .compatible = "sensirion,shtc3" }, > + { } > +}; > +MODULE_DEVICE_TABLE(of, shtc1_of_match); > + > static struct i2c_driver shtc1_i2c_driver = { > - .driver.name = "shtc1", > + .driver = { > + .name = "shtc1", > + .of_match_table = shtc1_of_match, > + }, > .probe = shtc1_probe, > .id_table = shtc1_id, > };
diff --git a/drivers/hwmon/shtc1.c b/drivers/hwmon/shtc1.c index a0078ccede03..7993a5ff8768 100644 --- a/drivers/hwmon/shtc1.c +++ b/drivers/hwmon/shtc1.c @@ -14,6 +14,7 @@ #include <linux/err.h> #include <linux/delay.h> #include <linux/platform_data/shtc1.h> +#include <linux/of.h> /* commands (high precision mode) */ static const unsigned char shtc1_cmd_measure_blocking_hpm[] = { 0x7C, 0xA2 }; @@ -196,6 +197,7 @@ static int shtc1_probe(struct i2c_client *client, enum shtcx_chips chip = id->driver_data; struct i2c_adapter *adap = client->adapter; struct device *dev = &client->dev; + struct device_node *np = dev->of_node; if (!i2c_check_functionality(adap, I2C_FUNC_I2C)) { dev_err(dev, "plain i2c transactions not supported\n"); @@ -233,8 +235,14 @@ static int shtc1_probe(struct i2c_client *client, data->client = client; data->chip = chip; - if (client->dev.platform_data) - data->setup = *(struct shtc1_platform_data *)dev->platform_data; + if (np) { + data->setup.blocking_io = of_property_read_bool(np, "sensirion,blocking-io"); + data->setup.high_precision = !of_property_read_bool(np, "sensicon,low-precision"); + } else { + if (client->dev.platform_data) + data->setup = *(struct shtc1_platform_data *)dev->platform_data; + } + shtc1_select_command(data); mutex_init(&data->update_lock); @@ -257,8 +265,19 @@ static const struct i2c_device_id shtc1_id[] = { }; MODULE_DEVICE_TABLE(i2c, shtc1_id); +static const struct of_device_id shtc1_of_match[] = { + { .compatible = "sensirion,shtc1" }, + { .compatible = "sensirion,shtw1" }, + { .compatible = "sensirion,shtc3" }, + { } +}; +MODULE_DEVICE_TABLE(of, shtc1_of_match); + static struct i2c_driver shtc1_i2c_driver = { - .driver.name = "shtc1", + .driver = { + .name = "shtc1", + .of_match_table = shtc1_of_match, + }, .probe = shtc1_probe, .id_table = shtc1_id, };