* Re: [PATCH v2 1/2] hwmon: shtc1: add support for device tree bindings
@ 2020-07-05 14:25 Guenter Roeck
2020-07-06 1:26 ` Chris Ruehl
0 siblings, 1 reply; 4+ messages in thread
From: Guenter Roeck @ 2020-07-05 14:25 UTC (permalink / raw)
To: Chris Ruehl; +Cc: Jack Lo, devicetree, Jean Delvare, linux-hwmon, linux-kernel
On Sun, Jul 05, 2020 at 11:47:25AM +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>
> ---
> drivers/hwmon/shtc1.c | 22 ++++++++++++++++++++--
> 1 file changed, 20 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hwmon/shtc1.c b/drivers/hwmon/shtc1.c
> index a0078ccede03..61e9275eb666 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,13 @@ static int shtc1_probe(struct i2c_client *client,
> data->client = client;
> data->chip = chip;
>
> - if (client->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;
CHECK: braces {} should be used on all arms of this statement
#46: FILE: drivers/hwmon/shtc1.c:238:
+ if (np) {
[...]
+ else if (client->dev.platform_data)
[...]
ERROR: else should follow close brace '}'
#50: FILE: drivers/hwmon/shtc1.c:242:
+ }
+ else if (client->dev.platform_data)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/2] hwmon: shtc1: add support for device tree bindings
2020-07-05 14:25 [PATCH v2 1/2] hwmon: shtc1: add support for device tree bindings Guenter Roeck
@ 2020-07-06 1:26 ` Chris Ruehl
0 siblings, 0 replies; 4+ messages in thread
From: Chris Ruehl @ 2020-07-06 1:26 UTC (permalink / raw)
To: Guenter Roeck
Cc: Jack Lo, devicetree, Jean Delvare, linux-hwmon, linux-kernel
Hi
On 5/7/2020 10:25 pm, Guenter Roeck wrote:
> On Sun, Jul 05, 2020 at 11:47:25AM +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>
>> ---
>> drivers/hwmon/shtc1.c | 22 ++++++++++++++++++++--
>> 1 file changed, 20 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/hwmon/shtc1.c b/drivers/hwmon/shtc1.c
>> index a0078ccede03..61e9275eb666 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,13 @@ static int shtc1_probe(struct i2c_client *client,
>> data->client = client;
>> data->chip = chip;
>>
>> - if (client->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;
>
> CHECK: braces {} should be used on all arms of this statement
> #46: FILE: drivers/hwmon/shtc1.c:238:
> + if (np) {
> [...]
> + else if (client->dev.platform_data)
> [...]
>
> ERROR: else should follow close brace '}'
> #50: FILE: drivers/hwmon/shtc1.c:242:
> + }
> + else if (client->dev.platform_data)
>
it bites back not using the check-patch script! I _should_ know better! :-(
v3 then.
But i will wait a moment to see if someone else lift a finger.
Chris
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 0/2] shtc1: add support for device tree bindings
@ 2020-07-05 3:47 Chris Ruehl
2020-07-05 3:47 ` [PATCH v2 1/2] hwmon: " Chris Ruehl
0 siblings, 1 reply; 4+ messages in thread
From: Chris Ruehl @ 2020-07-05 3:47 UTC (permalink / raw)
To: Chris Ruehl
Cc: Jack Lo, devicetree, Jean Delvare, Guenter Roeck, linux-hwmon,
linux-kernel
Add support for DTS bindings to the shtc driver
The patches add the compatible table and of_property_read_bool to the
shtc1.c. Newly created Yaml document has been released to the
Documentation/devicetree/hwmon/sensirion,shtc1.yaml
Signed-off-by: Chris Ruehl <chris.ruehl@gtsys.com.hk>
---
Version 2
remove the #ifdef CONFIG_OF
ignore platform data if dev->of_node is valid
use boolean only therefor use sensirion,low_precise to fit the logic
add missing driver.of_match_table entry
Version 1
initial version
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 1/2] hwmon: shtc1: add support for device tree bindings
2020-07-05 3:47 [PATCH v2 0/2] " Chris Ruehl
@ 2020-07-05 3:47 ` Chris Ruehl
2020-07-07 3:53 ` Guenter Roeck
0 siblings, 1 reply; 4+ messages in thread
From: Chris Ruehl @ 2020-07-05 3:47 UTC (permalink / raw)
To: Chris Ruehl
Cc: Jack Lo, devicetree, Jean Delvare, Guenter Roeck, linux-hwmon,
linux-kernel
Add support for DTS bindings for the sensirion shtc1,shtw1 and shtc3.
Signed-off-by: Chris Ruehl <chris.ruehl@gtsys.com.hk>
---
drivers/hwmon/shtc1.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/drivers/hwmon/shtc1.c b/drivers/hwmon/shtc1.c
index a0078ccede03..61e9275eb666 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,13 @@ static int shtc1_probe(struct i2c_client *client,
data->client = client;
data->chip = chip;
- if (client->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 +264,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,
};
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/2] hwmon: shtc1: add support for device tree bindings
2020-07-05 3:47 ` [PATCH v2 1/2] hwmon: " Chris Ruehl
@ 2020-07-07 3:53 ` Guenter Roeck
0 siblings, 0 replies; 4+ messages in thread
From: Guenter Roeck @ 2020-07-07 3:53 UTC (permalink / raw)
To: Chris Ruehl; +Cc: Jack Lo, devicetree, Jean Delvare, linux-hwmon, linux-kernel
On Sun, Jul 05, 2020 at 11:47:25AM +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>
> ---
> drivers/hwmon/shtc1.c | 22 ++++++++++++++++++++--
> 1 file changed, 20 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hwmon/shtc1.c b/drivers/hwmon/shtc1.c
> index a0078ccede03..61e9275eb666 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,13 @@ static int shtc1_probe(struct i2c_client *client,
> data->client = client;
> data->chip = chip;
>
> - if (client->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");
Just noticed. Presumably that would have to be:
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 +264,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,
> };
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-07 3:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-05 14:25 [PATCH v2 1/2] hwmon: shtc1: add support for device tree bindings Guenter Roeck
2020-07-06 1:26 ` Chris Ruehl
-- strict thread matches above, loose matches on Subject: below --
2020-07-05 3:47 [PATCH v2 0/2] " Chris Ruehl
2020-07-05 3:47 ` [PATCH v2 1/2] hwmon: " Chris Ruehl
2020-07-07 3:53 ` Guenter Roeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).