LinuxLists.cc - [PATCH] gpio: davinci: Use unique labels for each gpio chip

2016-11-03 11:34:16

Subject: [PATCH] gpio: davinci: Use unique labels for each gpio chip

The gpiod framework uses the chip label to match a specific chip.
The davinci gpio driver, creates several chips using always the same
label, which is not compatible with gpiod.

To allow platform data to declare gpio lookup tables, and for drivers
to use the gpiod framework, allocate unique label per registered chip.

Signed-off-by: Axel Haslam <[email protected]>
---
drivers/gpio/gpio-davinci.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c
index dd262f0..9191056 100644
--- a/drivers/gpio/gpio-davinci.c
+++ b/drivers/gpio/gpio-davinci.c
@@ -40,6 +40,7 @@ struct davinci_gpio_regs {
typedef struct irq_chip *(*gpio_get_irq_chip_cb_t)(unsigned int irq);

#define BINTEN 0x8 /* GPIO Interrupt Per-Bank Enable Register */
+#define MAX_LABEL_SIZE 20

static void __iomem *gpio_base;

@@ -201,6 +202,7 @@ static int davinci_gpio_probe(struct platform_device *pdev)
struct davinci_gpio_regs __iomem *regs;
struct device *dev = &pdev->dev;
struct resource *res;
+ char label[MAX_LABEL_SIZE];

pdata = davinci_gpio_get_pdata(pdev);
if (!pdata) {
@@ -237,7 +239,10 @@ static int davinci_gpio_probe(struct platform_device *pdev)
return PTR_ERR(gpio_base);

for (i = 0, base = 0; base < ngpio; i++, base += 32) {
- chips[i].chip.label = "DaVinci";
+ snprintf(label, MAX_LABEL_SIZE, "davinci_gpio.%d", i);
+ chips[i].chip.label = devm_kstrdup(dev, label, GFP_KERNEL);
+ if (!chips[i].chip.label)
+ return -ENOMEM;

chips[i].chip.direction_input = davinci_direction_in;
chips[i].chip.get = davinci_gpio_get;
--
2.10.1

2016-11-08 13:31:25

by Linus Walleij

[permalink] [raw]

Subject: Re: [PATCH] gpio: davinci: Use unique labels for each gpio chip

On Thu, Nov 3, 2016 at 12:34 PM, Axel Haslam <[email protected]> wrote:

> The gpiod framework uses the chip label to match a specific chip.
> The davinci gpio driver, creates several chips using always the same
> label, which is not compatible with gpiod.
>
> To allow platform data to declare gpio lookup tables, and for drivers
> to use the gpiod framework, allocate unique label per registered chip.
>
> Signed-off-by: Axel Haslam <[email protected]>

Sekhar/Kevin: can either of you review this patch?

Yours,
Linus Walleij

2016-11-08 14:47:05

by Sekhar Nori

[permalink] [raw]

Subject: Re: [PATCH] gpio: davinci: Use unique labels for each gpio chip

On Tuesday 08 November 2016 07:01 PM, Linus Walleij wrote:
> On Thu, Nov 3, 2016 at 12:34 PM, Axel Haslam <[email protected]> wrote:
>
>> The gpiod framework uses the chip label to match a specific chip.
>> The davinci gpio driver, creates several chips using always the same
>> label, which is not compatible with gpiod.
>>
>> To allow platform data to declare gpio lookup tables, and for drivers
>> to use the gpiod framework, allocate unique label per registered chip.
>>
>> Signed-off-by: Axel Haslam <[email protected]>
>
> Sekhar/Kevin: can either of you review this patch?

The patch looks good to me.

Reviewed-by: Sekhar Nori <[email protected]>

I am traveling and did not really test the patch.

Thanks,
Sekhar

2016-11-08 18:16:17

by Kevin Hilman

[permalink] [raw]

Subject: Re: [PATCH] gpio: davinci: Use unique labels for each gpio chip

Axel Haslam <[email protected]> writes:

> The gpiod framework uses the chip label to match a specific chip.
> The davinci gpio driver, creates several chips using always the same
> label, which is not compatible with gpiod.
>
> To allow platform data to declare gpio lookup tables, and for drivers
> to use the gpiod framework, allocate unique label per registered chip.
>
> Signed-off-by: Axel Haslam <[email protected]>

Acked-by: Kevin Hilman <[email protected]>

2016-11-09 08:14:31

by Linus Walleij

[permalink] [raw]