[v2] hwmon: (sht3x) add devicetree support

Message ID 1538717915-22294-1-git-send-email-wojciech.slenska@gmail.com
State Changes Requested
Headers show
Series
  • [v2] hwmon: (sht3x) add devicetree support
Related show

Commit Message

Wojciech Slenska Oct. 5, 2018, 5:38 a.m.
Signed-off-by: Wojciech Slenska <wojciech.slenska@gmail.com>
---
 Documentation/devicetree/bindings/hwmon/sht3x.txt | 16 +++++++++++++
 drivers/hwmon/sht3x.c                             | 28 ++++++++++++++++++++---
 2 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/hwmon/sht3x.txt

--
2.7.4

Comments

Rob Herring Oct. 12, 2018, 8:28 p.m. | #1
On Fri, Oct 05, 2018 at 07:38:35AM +0200, Wojciech Slenska wrote:

Commit msg?

> Signed-off-by: Wojciech Slenska <wojciech.slenska@gmail.com>
> ---
>  Documentation/devicetree/bindings/hwmon/sht3x.txt | 16 +++++++++++++

Please split bindings to separate patch.

>  drivers/hwmon/sht3x.c                             | 28 ++++++++++++++++++++---
>  2 files changed, 41 insertions(+), 3 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/hwmon/sht3x.txt
> 
> diff --git a/Documentation/devicetree/bindings/hwmon/sht3x.txt b/Documentation/devicetree/bindings/hwmon/sht3x.txt
> new file mode 100644
> index 0000000..80b117e
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/hwmon/sht3x.txt
> @@ -0,0 +1,16 @@
> +Sensirion SHT3x Humidity and Temperature Sensor
> +
> +Required node properties:
> +- compatible: "sensirion,sht3x" or "sensirion,sts3x"
> +- reg: I2C bus address of the device
> +
> +Optional properties:
> +- sensirion,blocking-io: enable blocking mode on i2c

This is not a h/w parameter and shouldn't be in DT.

> +- sensirion,no-high-precision: disable high accuracy

Maybe this one is okay, but couldn't the user want to set this? If so, 
then it should be a sysfs attr.

> +
> +Example sht3x node:
> +
> +sensor {

sensor@4a

> +	compatible = "sensirion,sht3x";
> +	reg = <0x4a>;
> +}
Wojciech Slenska Oct. 15, 2018, 5:55 a.m. | #2
pt., 12 paź 2018 o 22:28 Rob Herring <robh@kernel.org> napisał(a):
>
> On Fri, Oct 05, 2018 at 07:38:35AM +0200, Wojciech Slenska wrote:
>
> Commit msg?
>
> > Signed-off-by: Wojciech Slenska <wojciech.slenska@gmail.com>
> > ---
> >  Documentation/devicetree/bindings/hwmon/sht3x.txt | 16 +++++++++++++
>
> Please split bindings to separate patch.

I will do this.

>
> >  drivers/hwmon/sht3x.c                             | 28 ++++++++++++++++++++---
> >  2 files changed, 41 insertions(+), 3 deletions(-)
> >  create mode 100644 Documentation/devicetree/bindings/hwmon/sht3x.txt
> >
> > diff --git a/Documentation/devicetree/bindings/hwmon/sht3x.txt b/Documentation/devicetree/bindings/hwmon/sht3x.txt
> > new file mode 100644
> > index 0000000..80b117e
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/hwmon/sht3x.txt
> > @@ -0,0 +1,16 @@
> > +Sensirion SHT3x Humidity and Temperature Sensor
> > +
> > +Required node properties:
> > +- compatible: "sensirion,sht3x" or "sensirion,sts3x"
> > +- reg: I2C bus address of the device
> > +
> > +Optional properties:
> > +- sensirion,blocking-io: enable blocking mode on i2c
>
> This is not a h/w parameter and shouldn't be in DT.
>
> > +- sensirion,no-high-precision: disable high accuracy
>
> Maybe this one is okay, but couldn't the user want to set this? If so,
> then it should be a sysfs attr.

Those two parameters have been just moved from
linux/include/linux/platform_data/sht3x.h
Currently, those two parameters can be set in board file, so for me
was natural to move it to dts.
Of course, I can remove it from dts completely.

>
> > +
> > +Example sht3x node:
> > +
> > +sensor {
>
> sensor@4a
>

I will fix this.

> > +     compatible = "sensirion,sht3x";
> > +     reg = <0x4a>;
> > +}
>

BR
Wojciech Slenska

Patch

diff --git a/Documentation/devicetree/bindings/hwmon/sht3x.txt b/Documentation/devicetree/bindings/hwmon/sht3x.txt
new file mode 100644
index 0000000..80b117e
--- /dev/null
+++ b/Documentation/devicetree/bindings/hwmon/sht3x.txt
@@ -0,0 +1,16 @@ 
+Sensirion SHT3x Humidity and Temperature Sensor
+
+Required node properties:
+- compatible: "sensirion,sht3x" or "sensirion,sts3x"
+- reg: I2C bus address of the device
+
+Optional properties:
+- sensirion,blocking-io: enable blocking mode on i2c
+- sensirion,no-high-precision: disable high accuracy
+
+Example sht3x node:
+
+sensor {
+	compatible = "sensirion,sht3x";
+	reg = <0x4a>;
+}
diff --git a/drivers/hwmon/sht3x.c b/drivers/hwmon/sht3x.c
index 370b57d..1f8b7e7 100644
--- a/drivers/hwmon/sht3x.c
+++ b/drivers/hwmon/sht3x.c
@@ -31,6 +31,7 @@ 
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/platform_data/sht3x.h>
+#include <linux/of.h>

 /* commands (high precision mode) */
 static const unsigned char sht3x_cmd_measure_blocking_hpm[]    = { 0x2c, 0x06 };
@@ -699,6 +700,7 @@  static int sht3x_probe(struct i2c_client *client,
 	struct i2c_adapter *adap = client->adapter;
 	struct device *dev = &client->dev;
 	const struct attribute_group **attribute_groups;
+	struct device_node *np = client->dev.of_node;

 	/*
 	 * we require full i2c support since the sht3x uses multi-byte read and
@@ -724,8 +726,16 @@  static int sht3x_probe(struct i2c_client *client,
 	data->client = client;
 	crc8_populate_msb(sht3x_crc8_table, SHT3X_CRC8_POLYNOMIAL);

-	if (client->dev.platform_data)
-		data->setup = *(struct sht3x_platform_data *)dev->platform_data;
+	if (np) {
+		if (of_property_read_bool(np, "sensirion,blocking-io"))
+			data->setup.blocking_io = true;
+		if (of_property_read_bool(np, "sensirion,no-high-precision"))
+			data->setup.high_precision = false;
+	} else {
+		if (client->dev.platform_data)
+			data->setup = *(struct sht3x_platform_data *)
+				dev->platform_data;
+	}

 	sht3x_select_command(data);

@@ -768,8 +778,20 @@  static const struct i2c_device_id sht3x_ids[] = {

 MODULE_DEVICE_TABLE(i2c, sht3x_ids);

+#ifdef CONFIG_OF
+static const struct of_device_id sht3x_dt_match[] = {
+	{ .compatible = "sensirion,sht3x" },
+	{ .compatible = "sensirion,sts3x" },
+	{}
+};
+MODULE_DEVICE_TABLE(of, sht3x_dt_match);
+#endif
+
 static struct i2c_driver sht3x_i2c_driver = {
-	.driver.name = "sht3x",
+	.driver = {
+		.name = "sht3x",
+		.of_match_table = of_match_ptr(sht3x_dt_match),
+	},
 	.probe       = sht3x_probe,
 	.id_table    = sht3x_ids,
 };