* [PATCH v4 1/2] leds/tca6507: Add support for devicetree.
@ 2012-11-30 22:00 Marek Belisko
2012-11-30 22:00 ` [PATCH v4 2/2] Add documentation for tca6507 devicetree bindings Marek Belisko
2012-12-04 1:19 ` [PATCH v4 1/2] leds/tca6507: Add support for devicetree Bryan Wu
0 siblings, 2 replies; 6+ messages in thread
From: Marek Belisko @ 2012-11-30 22:00 UTC (permalink / raw)
To: cooloney, rpurdie
Cc: linux-leds, linux-kernel, devicetree-discuss, Marek Belisko
Support added only for leds (not for gpio's).
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
Changes from v3:
- fix code according Bryan suggestions
- use common leds binding description instead copy'n'paste
- use "-" instead "_" in bindings example for leds names
Changes from v2:
- change compatible property to "ti,tca6507"
- add documentation for linux,default-trigger
Changes from v1:
- return proper error value not NULL from tca6507_led_dt_init()
- remove empty lines
- remove kfree()
drivers/leds/leds-tca6507.c | 74 +++++++++++++++++++++++++++++++++++++++++--
1 file changed, 71 insertions(+), 3 deletions(-)
diff --git a/drivers/leds/leds-tca6507.c b/drivers/leds/leds-tca6507.c
index b26a63b..3ad46fb 100644
--- a/drivers/leds/leds-tca6507.c
+++ b/drivers/leds/leds-tca6507.c
@@ -667,6 +667,70 @@ static void tca6507_remove_gpio(struct tca6507_chip *tca)
}
#endif /* CONFIG_GPIOLIB */
+#ifdef CONFIG_OF
+static struct tca6507_platform_data *
+tca6507_led_dt_init(struct i2c_client *client)
+{
+ struct device_node *np = client->dev.of_node, *child;
+ struct tca6507_platform_data *pdata;
+ struct led_info *tca_leds;
+ int count = 0;
+
+ for_each_child_of_node(np, child)
+ count++;
+ if (!count)
+ return ERR_PTR(-ENODEV);
+
+ if (count > NUM_LEDS)
+ return ERR_PTR(-ENODEV);
+
+ tca_leds = devm_kzalloc(&client->dev,
+ sizeof(struct led_info) * count, GFP_KERNEL);
+ if (!tca_leds)
+ return ERR_PTR(-ENOMEM);
+
+ for_each_child_of_node(np, child) {
+ struct led_info led;
+ u32 reg;
+ int ret;
+
+ led.name =
+ of_get_property(child, "label", NULL) ? : child->name;
+ led.default_trigger =
+ of_get_property(child, "linux,default-trigger", NULL);
+
+ ret = of_property_read_u32(child, "reg", ®);
+ if (ret != 0)
+ continue;
+
+ tca_leds[reg] = led;
+ }
+ pdata = devm_kzalloc(&client->dev,
+ sizeof(struct tca6507_platform_data), GFP_KERNEL);
+ if (!pdata)
+ return ERR_PTR(-ENOMEM);
+
+ pdata->leds.leds = tca_leds;
+ pdata->leds.num_leds = count;
+
+ return pdata;
+}
+
+static const struct of_device_id of_tca6507_leds_match[] = {
+ { .compatible = "ti,tca6507", },
+ {},
+};
+
+#else
+static tca6507_platform_data *
+tca6507_led_dt_init(struct i2c_client *client)
+{
+ return ERR_PRT(-ENODEV);
+}
+
+#define of_tca6507_leds_match NULL
+#endif
+
static int tca6507_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
@@ -683,9 +747,12 @@ static int tca6507_probe(struct i2c_client *client,
return -EIO;
if (!pdata || pdata->leds.num_leds != NUM_LEDS) {
- dev_err(&client->dev, "Need %d entries in platform-data list\n",
- NUM_LEDS);
- return -ENODEV;
+ pdata = tca6507_led_dt_init(client);
+ if (IS_ERR(pdata)) {
+ dev_err(&client->dev, "Need %d entries in platform-data list\n",
+ NUM_LEDS);
+ return PTR_ERR(pdata);
+ }
}
tca = devm_kzalloc(&client->dev, sizeof(*tca), GFP_KERNEL);
if (!tca)
@@ -750,6 +817,7 @@ static struct i2c_driver tca6507_driver = {
.driver = {
.name = "leds-tca6507",
.owner = THIS_MODULE,
+ .of_match_table = of_tca6507_leds_match,
},
.probe = tca6507_probe,
.remove = tca6507_remove,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v4 2/2] Add documentation for tca6507 devicetree bindings.
2012-11-30 22:00 [PATCH v4 1/2] leds/tca6507: Add support for devicetree Marek Belisko
@ 2012-11-30 22:00 ` Marek Belisko
2012-12-03 19:29 ` Bryan Wu
2012-12-04 1:19 ` [PATCH v4 1/2] leds/tca6507: Add support for devicetree Bryan Wu
1 sibling, 1 reply; 6+ messages in thread
From: Marek Belisko @ 2012-11-30 22:00 UTC (permalink / raw)
To: cooloney, rpurdie
Cc: linux-leds, linux-kernel, devicetree-discuss, Marek Belisko
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
Documentation/devicetree/bindings/leds/tca6507.txt | 33 ++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 Documentation/devicetree/bindings/leds/tca6507.txt
diff --git a/Documentation/devicetree/bindings/leds/tca6507.txt b/Documentation/devicetree/bindings/leds/tca6507.txt
new file mode 100644
index 0000000..2b6693b
--- /dev/null
+++ b/Documentation/devicetree/bindings/leds/tca6507.txt
@@ -0,0 +1,33 @@
+LEDs conected to tca6507
+
+Required properties:
+- compatible : should be : "ti,tca6507".
+
+Each led is represented as a sub-node of the ti,tca6507 device.
+
+LED sub-node properties:
+- label : (optional) see Documentation/devicetree/bindings/leds/common.txt
+- reg : number of LED line (could be from 0 to 6)
+- linux,default-trigger : (optional)
+ see Documentation/devicetree/bindings/leds/common.txt
+
+Examples:
+
+tca6507@45 {
+ compatible = "ti,tca6507";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0x45>;
+
+ led0: red-aux@0 {
+ label = "red:aux";
+ reg = <0x0>;
+ };
+
+ led1: green-aux@1 {
+ label = "green:aux";
+ reg = <0x5>;
+ linux,default-trigger = "default-on";
+ };
+};
+
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v4 2/2] Add documentation for tca6507 devicetree bindings.
2012-11-30 22:00 ` [PATCH v4 2/2] Add documentation for tca6507 devicetree bindings Marek Belisko
@ 2012-12-03 19:29 ` Bryan Wu
2012-12-03 23:21 ` Belisko Marek
0 siblings, 1 reply; 6+ messages in thread
From: Bryan Wu @ 2012-12-03 19:29 UTC (permalink / raw)
To: Marek Belisko; +Cc: rpurdie, linux-leds, linux-kernel, devicetree-discuss
On Fri, Nov 30, 2012 at 2:00 PM, Marek Belisko
<marek.belisko@open-nandra.com> wrote:
> Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
> ---
> Documentation/devicetree/bindings/leds/tca6507.txt | 33 ++++++++++++++++++++
> 1 file changed, 33 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/leds/tca6507.txt
>
> diff --git a/Documentation/devicetree/bindings/leds/tca6507.txt b/Documentation/devicetree/bindings/leds/tca6507.txt
> new file mode 100644
> index 0000000..2b6693b
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/leds/tca6507.txt
> @@ -0,0 +1,33 @@
> +LEDs conected to tca6507
> +
> +Required properties:
> +- compatible : should be : "ti,tca6507".
> +
> +Each led is represented as a sub-node of the ti,tca6507 device.
> +
> +LED sub-node properties:
> +- label : (optional) see Documentation/devicetree/bindings/leds/common.txt
> +- reg : number of LED line (could be from 0 to 6)
> +- linux,default-trigger : (optional)
> + see Documentation/devicetree/bindings/leds/common.txt
Did you post patch to add this file? I failed to find it and overall
this patchset looks fine with me.
-Bryan
> +
> +Examples:
> +
> +tca6507@45 {
> + compatible = "ti,tca6507";
> + #address-cells = <1>;
> + #size-cells = <0>;
> + reg = <0x45>;
> +
> + led0: red-aux@0 {
> + label = "red:aux";
> + reg = <0x0>;
> + };
> +
> + led1: green-aux@1 {
> + label = "green:aux";
> + reg = <0x5>;
> + linux,default-trigger = "default-on";
> + };
> +};
> +
> --
> 1.7.10.4
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v4 2/2] Add documentation for tca6507 devicetree bindings.
2012-12-03 19:29 ` Bryan Wu
@ 2012-12-03 23:21 ` Belisko Marek
2012-12-04 0:29 ` Bryan Wu
0 siblings, 1 reply; 6+ messages in thread
From: Belisko Marek @ 2012-12-03 23:21 UTC (permalink / raw)
To: Bryan Wu; +Cc: rpurdie, linux-leds, linux-kernel, devicetree-discuss
On Mon, Dec 3, 2012 at 8:29 PM, Bryan Wu <cooloney@gmail.com> wrote:
> On Fri, Nov 30, 2012 at 2:00 PM, Marek Belisko
> <marek.belisko@open-nandra.com> wrote:
>> Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
>> ---
>> Documentation/devicetree/bindings/leds/tca6507.txt | 33 ++++++++++++++++++++
>> 1 file changed, 33 insertions(+)
>> create mode 100644 Documentation/devicetree/bindings/leds/tca6507.txt
>>
>> diff --git a/Documentation/devicetree/bindings/leds/tca6507.txt b/Documentation/devicetree/bindings/leds/tca6507.txt
>> new file mode 100644
>> index 0000000..2b6693b
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/leds/tca6507.txt
>> @@ -0,0 +1,33 @@
>> +LEDs conected to tca6507
>> +
>> +Required properties:
>> +- compatible : should be : "ti,tca6507".
>> +
>> +Each led is represented as a sub-node of the ti,tca6507 device.
>> +
>> +LED sub-node properties:
>> +- label : (optional) see Documentation/devicetree/bindings/leds/common.txt
>> +- reg : number of LED line (could be from 0 to 6)
>> +- linux,default-trigger : (optional)
>> + see Documentation/devicetree/bindings/leds/common.txt
>
> Did you post patch to add this file? I failed to find it and overall
> this patchset looks fine with me.
Yes. I'ts in current next.
https://lkml.org/lkml/2012/11/21/394
>
> -Bryan
>
>> +
>> +Examples:
>> +
>> +tca6507@45 {
>> + compatible = "ti,tca6507";
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + reg = <0x45>;
>> +
>> + led0: red-aux@0 {
>> + label = "red:aux";
>> + reg = <0x0>;
>> + };
>> +
>> + led1: green-aux@1 {
>> + label = "green:aux";
>> + reg = <0x5>;
>> + linux,default-trigger = "default-on";
>> + };
>> +};
>> +
>> --
>> 1.7.10.4
>>
Marek
--
as simple and primitive as possible
-------------------------------------------------
Marek Belisko - OPEN-NANDRA
Freelance Developer
Ruska Nova Ves 219 | Presov, 08005 Slovak Republic
Tel: +421 915 052 184
skype: marekwhite
twitter: #opennandra
web: http://open-nandra.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v4 2/2] Add documentation for tca6507 devicetree bindings.
2012-12-03 23:21 ` Belisko Marek
@ 2012-12-04 0:29 ` Bryan Wu
0 siblings, 0 replies; 6+ messages in thread
From: Bryan Wu @ 2012-12-04 0:29 UTC (permalink / raw)
To: Belisko Marek; +Cc: rpurdie, linux-leds, linux-kernel, devicetree-discuss
On Mon, Dec 3, 2012 at 3:21 PM, Belisko Marek <marek.belisko@gmail.com> wrote:
> On Mon, Dec 3, 2012 at 8:29 PM, Bryan Wu <cooloney@gmail.com> wrote:
>> On Fri, Nov 30, 2012 at 2:00 PM, Marek Belisko
>> <marek.belisko@open-nandra.com> wrote:
>>> Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
>>> ---
>>> Documentation/devicetree/bindings/leds/tca6507.txt | 33 ++++++++++++++++++++
>>> 1 file changed, 33 insertions(+)
>>> create mode 100644 Documentation/devicetree/bindings/leds/tca6507.txt
>>>
>>> diff --git a/Documentation/devicetree/bindings/leds/tca6507.txt b/Documentation/devicetree/bindings/leds/tca6507.txt
>>> new file mode 100644
>>> index 0000000..2b6693b
>>> --- /dev/null
>>> +++ b/Documentation/devicetree/bindings/leds/tca6507.txt
>>> @@ -0,0 +1,33 @@
>>> +LEDs conected to tca6507
>>> +
>>> +Required properties:
>>> +- compatible : should be : "ti,tca6507".
>>> +
>>> +Each led is represented as a sub-node of the ti,tca6507 device.
>>> +
>>> +LED sub-node properties:
>>> +- label : (optional) see Documentation/devicetree/bindings/leds/common.txt
>>> +- reg : number of LED line (could be from 0 to 6)
>>> +- linux,default-trigger : (optional)
>>> + see Documentation/devicetree/bindings/leds/common.txt
>>
>> Did you post patch to add this file? I failed to find it and overall
>> this patchset looks fine with me.
> Yes. I'ts in current next.
> https://lkml.org/lkml/2012/11/21/394
>>
OK, I will put this on my devel branch for 3.9 merge window.
Thanks,
-Bryan
>> -Bryan
>>
>>> +
>>> +Examples:
>>> +
>>> +tca6507@45 {
>>> + compatible = "ti,tca6507";
>>> + #address-cells = <1>;
>>> + #size-cells = <0>;
>>> + reg = <0x45>;
>>> +
>>> + led0: red-aux@0 {
>>> + label = "red:aux";
>>> + reg = <0x0>;
>>> + };
>>> +
>>> + led1: green-aux@1 {
>>> + label = "green:aux";
>>> + reg = <0x5>;
>>> + linux,default-trigger = "default-on";
>>> + };
>>> +};
>>> +
>>> --
>>> 1.7.10.4
>>>
>
> Marek
>
> --
> as simple and primitive as possible
> -------------------------------------------------
> Marek Belisko - OPEN-NANDRA
> Freelance Developer
>
> Ruska Nova Ves 219 | Presov, 08005 Slovak Republic
> Tel: +421 915 052 184
> skype: marekwhite
> twitter: #opennandra
> web: http://open-nandra.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v4 1/2] leds/tca6507: Add support for devicetree.
2012-11-30 22:00 [PATCH v4 1/2] leds/tca6507: Add support for devicetree Marek Belisko
2012-11-30 22:00 ` [PATCH v4 2/2] Add documentation for tca6507 devicetree bindings Marek Belisko
@ 2012-12-04 1:19 ` Bryan Wu
1 sibling, 0 replies; 6+ messages in thread
From: Bryan Wu @ 2012-12-04 1:19 UTC (permalink / raw)
To: Marek Belisko; +Cc: rpurdie, linux-leds, linux-kernel, devicetree-discuss
Looks like this patch is based on linux-next tree, I fixed this. And I
will solve the conflict when we do actually merge in next cycle.
-Bryan
On Fri, Nov 30, 2012 at 2:00 PM, Marek Belisko
<marek.belisko@open-nandra.com> wrote:
> Support added only for leds (not for gpio's).
>
> Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
> ---
> Changes from v3:
> - fix code according Bryan suggestions
> - use common leds binding description instead copy'n'paste
> - use "-" instead "_" in bindings example for leds names
>
> Changes from v2:
> - change compatible property to "ti,tca6507"
> - add documentation for linux,default-trigger
>
> Changes from v1:
> - return proper error value not NULL from tca6507_led_dt_init()
> - remove empty lines
> - remove kfree()
> drivers/leds/leds-tca6507.c | 74 +++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 71 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/leds/leds-tca6507.c b/drivers/leds/leds-tca6507.c
> index b26a63b..3ad46fb 100644
> --- a/drivers/leds/leds-tca6507.c
> +++ b/drivers/leds/leds-tca6507.c
> @@ -667,6 +667,70 @@ static void tca6507_remove_gpio(struct tca6507_chip *tca)
> }
> #endif /* CONFIG_GPIOLIB */
>
> +#ifdef CONFIG_OF
> +static struct tca6507_platform_data *
> +tca6507_led_dt_init(struct i2c_client *client)
> +{
> + struct device_node *np = client->dev.of_node, *child;
> + struct tca6507_platform_data *pdata;
> + struct led_info *tca_leds;
> + int count = 0;
> +
> + for_each_child_of_node(np, child)
> + count++;
> + if (!count)
> + return ERR_PTR(-ENODEV);
> +
> + if (count > NUM_LEDS)
> + return ERR_PTR(-ENODEV);
> +
> + tca_leds = devm_kzalloc(&client->dev,
> + sizeof(struct led_info) * count, GFP_KERNEL);
> + if (!tca_leds)
> + return ERR_PTR(-ENOMEM);
> +
> + for_each_child_of_node(np, child) {
> + struct led_info led;
> + u32 reg;
> + int ret;
> +
> + led.name =
> + of_get_property(child, "label", NULL) ? : child->name;
> + led.default_trigger =
> + of_get_property(child, "linux,default-trigger", NULL);
> +
> + ret = of_property_read_u32(child, "reg", ®);
> + if (ret != 0)
> + continue;
> +
> + tca_leds[reg] = led;
> + }
> + pdata = devm_kzalloc(&client->dev,
> + sizeof(struct tca6507_platform_data), GFP_KERNEL);
> + if (!pdata)
> + return ERR_PTR(-ENOMEM);
> +
> + pdata->leds.leds = tca_leds;
> + pdata->leds.num_leds = count;
> +
> + return pdata;
> +}
> +
> +static const struct of_device_id of_tca6507_leds_match[] = {
> + { .compatible = "ti,tca6507", },
> + {},
> +};
> +
> +#else
> +static tca6507_platform_data *
> +tca6507_led_dt_init(struct i2c_client *client)
> +{
> + return ERR_PRT(-ENODEV);
> +}
> +
> +#define of_tca6507_leds_match NULL
> +#endif
> +
> static int tca6507_probe(struct i2c_client *client,
> const struct i2c_device_id *id)
> {
> @@ -683,9 +747,12 @@ static int tca6507_probe(struct i2c_client *client,
> return -EIO;
>
> if (!pdata || pdata->leds.num_leds != NUM_LEDS) {
> - dev_err(&client->dev, "Need %d entries in platform-data list\n",
> - NUM_LEDS);
> - return -ENODEV;
> + pdata = tca6507_led_dt_init(client);
> + if (IS_ERR(pdata)) {
> + dev_err(&client->dev, "Need %d entries in platform-data list\n",
> + NUM_LEDS);
> + return PTR_ERR(pdata);
> + }
> }
> tca = devm_kzalloc(&client->dev, sizeof(*tca), GFP_KERNEL);
> if (!tca)
> @@ -750,6 +817,7 @@ static struct i2c_driver tca6507_driver = {
> .driver = {
> .name = "leds-tca6507",
> .owner = THIS_MODULE,
> + .of_match_table = of_tca6507_leds_match,
> },
> .probe = tca6507_probe,
> .remove = tca6507_remove,
> --
> 1.7.10.4
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-12-04 1:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-30 22:00 [PATCH v4 1/2] leds/tca6507: Add support for devicetree Marek Belisko
2012-11-30 22:00 ` [PATCH v4 2/2] Add documentation for tca6507 devicetree bindings Marek Belisko
2012-12-03 19:29 ` Bryan Wu
2012-12-03 23:21 ` Belisko Marek
2012-12-04 0:29 ` Bryan Wu
2012-12-04 1:19 ` [PATCH v4 1/2] leds/tca6507: Add support for devicetree Bryan Wu
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).