All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] hwmon: (lm87) Add channel data from the dts file.
@ 2016-09-05  5:36 Mahoda Ratnayaka
  2016-09-06 17:20 ` Guenter Roeck
  0 siblings, 1 reply; 5+ messages in thread
From: Mahoda Ratnayaka @ 2016-09-05  5:36 UTC (permalink / raw)
  To: Jean Delvare, Guenter Roeck, linux-hwmon; +Cc: Mahoda Ratnayaka, Chris Packham

Currently there is no method for setting the channel
value from the DTS file. When, the driver uses a dts
file to initialize the driver platform_data is not set.
As a the result channel variable may not be set correctly.

Without the channel variable set correctly, some of the
sensors will not be initialized correctly. For example
temp3 sensor sysfs entries.

This adds the required functionality to set the channel
variable from the DTS file. This is done via reading the
reading a property named "channel" from the lm87 driver.

Signed-off-by: Mahoda Ratnayaka <mahoda.ratnayaka@alliedtelesis.co.nz>
---
 drivers/hwmon/lm87.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index a5e2958..ac0018b 100644
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -858,14 +858,25 @@ static void lm87_remove_files(struct i2c_client *client)
 static void lm87_init_client(struct i2c_client *client)
 {
 	struct lm87_data *data = i2c_get_clientdata(client);
+	struct device_node *np = NULL;
+	const char *channel = NULL;
+	u8 val;
 
-	if (dev_get_platdata(&client->dev)) {
+	np = client->dev.of_node;
+
+	/* Use value read from the dts file to setup channel value. */
+	if (np && of_property_read_u8(np, "channels", &val) == 0) {
+		data->channel = val;
+		lm87_write_value(client,
+				 LM87_REG_CHANNEL_MODE, data->channel);
+	} else if (dev_get_platdata(&client->dev)) {
 		data->channel = *(u8 *)dev_get_platdata(&client->dev);
 		lm87_write_value(client,
 				 LM87_REG_CHANNEL_MODE, data->channel);
 	} else {
 		data->channel = lm87_read_value(client, LM87_REG_CHANNEL_MODE);
 	}
+
 	data->config = lm87_read_value(client, LM87_REG_CONFIG) & 0x6F;
 
 	if (!(data->config & 0x01)) {
-- 
2.9.3


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2016-09-07  1:35 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-05  5:36 [PATCH] hwmon: (lm87) Add channel data from the dts file Mahoda Ratnayaka
2016-09-06 17:20 ` Guenter Roeck
2016-09-07  0:17   ` Mahoda Ratnayaka
2016-09-07  0:17     ` Mahoda Ratnayaka
2016-09-07  1:35     ` Guenter Roeck

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.