summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Murphy <dmurphy@ti.com>2018-07-02 13:12:14 -0500
committerJacek Anaszewski <jacek.anaszewski@gmail.com>2018-07-03 22:26:51 +0200
commit9a5c1c64ac0a4d01c78328283dac7a9dc33ff0f9 (patch)
treea5fac50ff77240d335c9cb598fdde11bd11d0848
parent43d20ff3633112322de38c18b4b35bbbf04438d7 (diff)
downloadlinux-stable-9a5c1c64ac0a4d01c78328283dac7a9dc33ff0f9.tar.gz
linux-stable-9a5c1c64ac0a4d01c78328283dac7a9dc33ff0f9.tar.bz2
linux-stable-9a5c1c64ac0a4d01c78328283dac7a9dc33ff0f9.zip
leds: lm3692x: Change DT calls to fwnode calls
Update the code to use the fwnode calls as opposed to ARM DT node api's. This allows the device to be used with either DT configurations or ACPI definitions. Signed-off-by: Dan Murphy <dmurphy@ti.com> Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
-rw-r--r--drivers/leds/leds-lm3692x.c38
1 files changed, 21 insertions, 17 deletions
diff --git a/drivers/leds/leds-lm3692x.c b/drivers/leds/leds-lm3692x.c
index e518ae36f410..9e6432b6a3b5 100644
--- a/drivers/leds/leds-lm3692x.c
+++ b/drivers/leds/leds-lm3692x.c
@@ -267,30 +267,15 @@ out:
static int lm3692x_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
- int ret;
+ struct fwnode_handle *child = NULL;
struct lm3692x_led *led;
- struct device_node *np = client->dev.of_node;
- struct device_node *child_node;
const char *name;
+ int ret;
led = devm_kzalloc(&client->dev, sizeof(*led), GFP_KERNEL);
if (!led)
return -ENOMEM;
- for_each_available_child_of_node(np, child_node) {
- led->led_dev.default_trigger = of_get_property(child_node,
- "linux,default-trigger",
- NULL);
-
- ret = of_property_read_string(child_node, "label", &name);
- if (!ret)
- snprintf(led->label, sizeof(led->label),
- "%s:%s", id->name, name);
- else
- snprintf(led->label, sizeof(led->label),
- "%s::backlight_cluster", id->name);
- };
-
led->enable_gpio = devm_gpiod_get_optional(&client->dev,
"enable", GPIOD_OUT_LOW);
if (IS_ERR(led->enable_gpio)) {
@@ -323,6 +308,25 @@ static int lm3692x_probe(struct i2c_client *client,
if (ret)
return ret;
+ child = device_get_next_child_node(&led->client->dev, child);
+ if (!child) {
+ dev_err(&led->client->dev, "No LED Child node\n");
+ return ret;
+ }
+
+ fwnode_property_read_string(child, "linux,default-trigger",
+ &led->led_dev.default_trigger);
+
+ ret = fwnode_property_read_string(child, "label", &name);
+ if (ret)
+ snprintf(led->label, sizeof(led->label),
+ "%s::", led->client->name);
+ else
+ snprintf(led->label, sizeof(led->label),
+ "%s:%s", led->client->name, name);
+
+ led->led_dev.dev->of_node = to_of_node(child);
+
ret = devm_led_classdev_register(&client->dev, &led->led_dev);
if (ret) {
dev_err(&client->dev, "led register err: %d\n", ret);