Skip to content

Commit

Permalink
leds: syscon: handle multiple syscon instances
Browse files Browse the repository at this point in the history
Currently the syscon LED driver will only handle LEDs on the
first syscon found in the system. But there can be several of
them, so augment the driver to traverse all syscon nodes and
check for syscon LEDs on them.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
  • Loading branch information
Linus Walleij authored and Bryan Wu committed Nov 14, 2014
1 parent 37fa70f commit 3f6e42c
Showing 1 changed file with 36 additions and 31 deletions.
67 changes: 36 additions & 31 deletions drivers/leds/leds-syscon.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,39 +66,13 @@ static void syscon_led_set(struct led_classdev *led_cdev,
dev_err(sled->cdev.dev, "error updating LED status\n");
}

static const struct of_device_id syscon_match[] = {
{ .compatible = "syscon", },
{},
};

static int __init syscon_leds_init(void)
static int __init syscon_leds_spawn(struct device_node *np,
struct device *dev,
struct regmap *map)
{
const struct of_device_id *devid;
struct device_node *np;
struct device_node *child;
struct regmap *map;
struct platform_device *pdev;
struct device *dev;
int ret;

np = of_find_matching_node_and_match(NULL, syscon_match,
&devid);
if (!np)
return -ENODEV;

map = syscon_node_to_regmap(np);
if (IS_ERR(map))
return PTR_ERR(map);

/*
* If the map is there, the device should be there, we allocate
* memory on the syscon device's behalf here.
*/
pdev = of_find_device_by_node(np);
if (!pdev)
return -ENODEV;
dev = &pdev->dev;

for_each_available_child_of_node(np, child) {
struct syscon_led *sled;
const char *state;
Expand Down Expand Up @@ -146,7 +120,6 @@ static int __init syscon_leds_init(void)
if (ret < 0)
return ret;
}

}
sled->cdev.brightness_set = syscon_led_set;

Expand All @@ -156,7 +129,39 @@ static int __init syscon_leds_init(void)

dev_info(dev, "registered LED %s\n", sled->cdev.name);
}
return 0;
}

static int __init syscon_leds_init(void)
{
struct device_node *np;

for_each_of_allnodes(np) {
struct platform_device *pdev;
struct regmap *map;
int ret;

if (!of_device_is_compatible(np, "syscon"))
continue;

map = syscon_node_to_regmap(np);
if (IS_ERR(map)) {
pr_err("error getting regmap for syscon LEDs\n");
continue;
}

/*
* If the map is there, the device should be there, we allocate
* memory on the syscon device's behalf here.
*/
pdev = of_find_device_by_node(np);
if (!pdev)
return -ENODEV;
ret = syscon_leds_spawn(np, &pdev->dev, map);
if (ret)
dev_err(&pdev->dev, "could not spawn syscon LEDs\n");
}

return 0;
return 0;
}
device_initcall(syscon_leds_init);

0 comments on commit 3f6e42c

Please sign in to comment.