Skip to contentSkip to conversation

gpio: davinci: reuse for keystone soc

PATCH Superseded Grygorii Strashko 4 participants 10 messages Feb 5, 2014 – Mar 4, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 gpio: davinci: reuse for keystone soc

The similar GPIO HW block is used by keystone SoCs as in Davinci SoCs.
Hence, reuse Davinci GPIO driver for Keystone taking into account that Keystone contains ARM GIC IRQ controller which is implemented using IRQ Chip.

Documentation:

	http://www.ti.com/lit/ug/sprugv1/sprugv1.pdf

---
Changes in v4:
- rebased on top of v3.14 +
[patch] gpio: davinci: signedness bug in davinci_gpio_irq_setup()

 .../devicetree/bindings/gpio/gpio-davinci.txt      |    4 +-
 drivers/gpio/gpio-davinci.c                        |   48 ++++++++++++++++----
 2 files changed, 42 insertions(+), 10 deletions(-)
Documentation/devicetree/bindings/gpio/gpio-davinci.txt +2 -2
index a2e839d..4ce9862 100644
@@ -1,7 +1,7 @@
-Davinci GPIO controller bindings
+Davinci/Keystone GPIO controller bindings
 
 Required Properties:
-- compatible: should be "ti,dm6441-gpio"
+- compatible: should be "ti,dm6441-gpio", "ti,keystone-gpio"
 
 - reg: Physical base address of the controller and the size of memory mapped
        registers.
drivers/gpio/gpio-davinci.c +40 -8

90 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v4 1/1 gpio: davinci: reuse for keystone soc

Quoted 9 lines · Grygorii Strashko

The similar GPIO HW block is used by keystone SoCs as in Davinci SoCs.
Hence, reuse Davinci GPIO driver for Keystone taking into account that Keystone contains ARM GIC IRQ controller which is implemented using IRQ Chip.

Documentation:

        http://www.ti.com/lit/ug/sprugv1/sprugv1.pdf
Quoted 7 lines

---
Changes in v4:
- rebased on top of v3.14 +
[patch] gpio: davinci: signedness bug in davinci_gpio_irq_setup()

Are you taking this through ARM SoC or is this something I should be merging?

Yours,
Linus Walleij

#2 lore raw

PATCH v4 1/1 gpio: davinci: reuse for keystone soc

Hi Linus,

Quoted 20 lines · Linus Walleij
Quoted 9 lines · Grygorii Strashko

The similar GPIO HW block is used by keystone SoCs as in Davinci SoCs.
Hence, reuse Davinci GPIO driver for Keystone taking into account that Keystone contains ARM GIC IRQ controller which is implemented using IRQ Chip.

Documentation:

        http://www.ti.com/lit/ug/sprugv1/sprugv1.pdf
Quoted 7 lines

---
Changes in v4:
- rebased on top of v3.14 +
[patch] gpio: davinci: signedness bug in davinci_gpio_irq_setup()

Quoted 2 lines

Are you taking this through ARM SoC or is this something I should be merging?

Can you please merge this through your tree as there aren't any dependencies with mach-davinci anymore.

Thanks,
Sekhar

#3 lore raw

PATCH v4 1/1 gpio: davinci: reuse for keystone soc

In reply to Grygorii Strashko
Quoted 9 lines · Grygorii Strashko

The similar GPIO HW block is used by keystone SoCs as in Davinci SoCs.
Hence, reuse Davinci GPIO driver for Keystone taking into account that Keystone contains ARM GIC IRQ controller which is implemented using IRQ Chip.

Documentation:

        http://www.ti.com/lit/ug/sprugv1/sprugv1.pdf
Quoted 7 lines

---
Changes in v4:
- rebased on top of v3.14 +
[patch] gpio: davinci: signedness bug in davinci_gpio_irq_setup()

I tried applying this and it does not apply on the "devel" branch in the GPIO tree. Since I haven't touched one line of code in the DaVinci driver since v3.14-rc1 I seriously doubt that this is rebased on v3.14[-rc].

Can you please rebase the patch onto v3.14-rc1 for real and resend it?

Yours,
Linus Walleij

#4 lore raw

PATCH v4 1/1 gpio: davinci: reuse for keystone soc

Hi Linus,

Quoted 20 lines · Linus Walleij
Quoted 9 lines · Grygorii Strashko

The similar GPIO HW block is used by keystone SoCs as in Davinci SoCs.
Hence, reuse Davinci GPIO driver for Keystone taking into account that Keystone contains ARM GIC IRQ controller which is implemented using IRQ Chip.

Documentation:

         http://www.ti.com/lit/ug/sprugv1/sprugv1.pdf
Quoted 7 lines

---
Changes in v4:
- rebased on top of v3.14 +
[patch] gpio: davinci: signedness bug in davinci_gpio_irq_setup()

Quoted 7 lines

I tried applying this and it does not apply on the "devel" branch in the GPIO tree. Since I haven't touched one line of code in the DaVinci driver since v3.14-rc1 I seriously doubt that this is rebased on v3.14[-rc].

Can you please rebase the patch onto v3.14-rc1 for real and resend it?

Sorry, But I've to clarify that this patch is based on:
http://www.spinics.net/lists/linux-kernel-janitors/msg18017.html
[patch] gpio: davinci: signedness bug in davinci_gpio_irq_setup()

And I did it to avoid merge conflicts between these two patches.

Is it possible to apply above one first? It's not in any of your branches.

Of Course, I can re-base this patch on clean v3.14-rc1, but then merge conflict will happen with "gpio: davinci: signedness.." patch.

Regards,
- grygorii

#5 lore raw

PATCH RESEND v4 1/1 gpio: davinci: reuse for keystone soc

The similar GPIO HW block is used by keystone SoCs as in Davinci SoCs.
Hence, reuse Davinci GPIO driver for Keystone taking into account that Keystone contains ARM GIC IRQ controller which is implemented using IRQ Chip.

Documentation:

	http://www.ti.com/lit/ug/sprugv1/sprugv1.pdf

---
- rebased on top of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
branch: devel
top commit: ef70bbe gpio: make gpiod_direction_output take a logical value

 .../devicetree/bindings/gpio/gpio-davinci.txt      |    4 +-
 drivers/gpio/gpio-davinci.c                        |   48 ++++++++++++++++----
 2 files changed, 42 insertions(+), 10 deletions(-)
Documentation/devicetree/bindings/gpio/gpio-davinci.txt +2 -2
index a2e839d..4ce9862 100644
@@ -1,7 +1,7 @@
-Davinci GPIO controller bindings
+Davinci/Keystone GPIO controller bindings
 
 Required Properties:
-- compatible: should be "ti,dm6441-gpio"
+- compatible: should be "ti,dm6441-gpio", "ti,keystone-gpio"
 
 - reg: Physical base address of the controller and the size of memory mapped
        registers.
drivers/gpio/gpio-davinci.c +40 -8

90 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#6 lore raw

PATCH RESEND v4 1/1 gpio: davinci: reuse for keystone soc

Linus,

Quoted 9 lines · Grygorii Strashko

The similar GPIO HW block is used by keystone SoCs as in Davinci SoCs.
Hence, reuse Davinci GPIO driver for Keystone taking into account that Keystone contains ARM GIC IRQ controller which is implemented using IRQ Chip.

Documentation:

	http://www.ti.com/lit/ug/sprugv1/sprugv1.pdf
Quoted 8 lines

---
- rebased on top of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
branch: devel
top commit: ef70bbe gpio: make gpiod_direction_output take a logical value

Can you please pick this one ? Its rebased as per your suggestion.

Quoted 120 lines
 .../devicetree/bindings/gpio/gpio-davinci.txt      |    4 +-
 drivers/gpio/gpio-davinci.c                        |   48 ++++++++++++++++----
 2 files changed, 42 insertions(+), 10 deletions(-)
Documentation/devicetree/bindings/gpio/gpio-davinci.txt +2 -2
index a2e839d..4ce9862 100644
@@ -1,7 +1,7 @@
-Davinci GPIO controller bindings
+Davinci/Keystone GPIO controller bindings
 
 Required Properties:
-- compatible: should be "ti,dm6441-gpio"
+- compatible: should be "ti,dm6441-gpio", "ti,keystone-gpio"
 
 - reg: Physical base address of the controller and the size of memory mapped
        registers.
drivers/gpio/gpio-davinci.c +40 -8
index 7629b4f..d0f135d 100644
@@ -37,6 +37,8 @@ struct davinci_gpio_regs {
 	u32	intstat;
 };
 
+typedef struct irq_chip *(*gpio_get_irq_chip_cb_t)(unsigned int irq);
+
 #define BINTEN	0x8 /* GPIO Interrupt Per-Bank Enable Register */
 
 #define chip2controller(chip)	\
@@ -413,6 +415,26 @@ static const struct irq_domain_ops davinci_gpio_irq_ops = {
 	.xlate = irq_domain_xlate_onetwocell,
 };
 
+static struct irq_chip *davinci_gpio_get_irq_chip(unsigned int irq)
+{
+	static struct irq_chip_type gpio_unbanked;
+
+	gpio_unbanked = *container_of(irq_get_chip(irq),
+				      struct irq_chip_type, chip);
+
+	return &gpio_unbanked.chip;
+};
+
+static struct irq_chip *keystone_gpio_get_irq_chip(unsigned int irq)
+{
+	static struct irq_chip gpio_unbanked;
+
+	gpio_unbanked = *irq_get_chip(irq);
+	return &gpio_unbanked;
+};
+
+static const struct of_device_id davinci_gpio_ids[];
+
 /*
  * NOTE:  for suspend/resume, probably best to make a platform_device with
  * suspend_late/resume_resume calls hooking into results of the set_wake()
@@ -433,6 +455,18 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev)
 	struct davinci_gpio_platform_data *pdata = dev->platform_data;
 	struct davinci_gpio_regs __iomem *g;
 	struct irq_domain	*irq_domain = NULL;
+	const struct of_device_id *match;
+	struct irq_chip *irq_chip;
+	gpio_get_irq_chip_cb_t gpio_get_irq_chip;
+
+	/*
+	 * Use davinci_gpio_get_irq_chip by default to handle non DT cases
+	 */
+	gpio_get_irq_chip = davinci_gpio_get_irq_chip;
+	match = of_match_device(of_match_ptr(davinci_gpio_ids),
+				dev);
+	if (match)
+		gpio_get_irq_chip = (gpio_get_irq_chip_cb_t)match->data;
 
 	ngpio = pdata->ngpio;
 	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
@@ -489,8 +523,6 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev)
 	 * IRQ mux conflicts; gpio_irq_type_unbanked() is only for GPIOs.
 	 */
 	if (pdata->gpio_unbanked) {
-		static struct irq_chip_type gpio_unbanked;
-
 		/* pass "bank 0" GPIO IRQs to AINTC */
 		chips[0].chip.to_irq = gpio_to_irq_unbanked;
 		chips[0].gpio_irq = bank_irq;
@@ -499,10 +531,9 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev)
 
 		/* AINTC handles mask/unmask; GPIO handles triggering */
 		irq = bank_irq;
-		gpio_unbanked = *container_of(irq_get_chip(irq),
-					      struct irq_chip_type, chip);
-		gpio_unbanked.chip.name = "GPIO-AINTC";
-		gpio_unbanked.chip.irq_set_type = gpio_irq_type_unbanked;
+		irq_chip = gpio_get_irq_chip(irq);
+		irq_chip->name = "GPIO-AINTC";
+		irq_chip->irq_set_type = gpio_irq_type_unbanked;
 
 		/* default trigger: both edges */
 		g = gpio2regs(0);
@@ -511,7 +542,7 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev)
 
 		/* set the direct IRQs up to use that irqchip */
 		for (gpio = 0; gpio < pdata->gpio_unbanked; gpio++, irq++) {
-			irq_set_chip(irq, &gpio_unbanked.chip);
+			irq_set_chip(irq, irq_chip);
 			irq_set_handler_data(irq, &chips[gpio / 32]);
 			irq_set_status_flags(irq, IRQ_TYPE_EDGE_BOTH);
 		}
@@ -554,7 +585,8 @@ done:
 
 #if IS_ENABLED(CONFIG_OF)
 static const struct of_device_id davinci_gpio_ids[] = {
-	{ .compatible = "ti,dm6441-gpio", },
+	{ .compatible = "ti,keystone-gpio", keystone_gpio_get_irq_chip},
+	{ .compatible = "ti,dm6441-gpio", davinci_gpio_get_irq_chip},
 	{ /* sentinel */ },
 };
 MODULE_DEVICE_TABLE(of, davinci_gpio_ids);
#7 lore raw

PATCH RESEND v4 1/1 gpio: davinci: reuse for keystone soc

Hi Linus,

Quoted 18 lines · Santosh Shilimkar
Quoted 9 lines · Grygorii Strashko

The similar GPIO HW block is used by keystone SoCs as in Davinci SoCs.
Hence, reuse Davinci GPIO driver for Keystone taking into account that Keystone contains ARM GIC IRQ controller which is implemented using IRQ Chip.

Documentation:

	http://www.ti.com/lit/ug/sprugv1/sprugv1.pdf
Quoted 8 lines

---
- rebased on top of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
branch: devel
top commit: ef70bbe gpio: make gpiod_direction_output take a logical value

Quoted 1 line

Can you please pick this one ? Its rebased as per your suggestion.

I've just rechecked this patch and it's applied without conflicts on top of your "devel" branch.

Pls, inform me if I need to do anything else for you in order to have this patch applied.

[...]

Quoted 12 lines

drivers/gpio/gpio-davinci.c done: · line 592

Quoted 11 lines
drivers/gpio/gpio-davinci.c +2 -1
@@ -554,7 +585,8 @@ done:
 
  #if IS_ENABLED(CONFIG_OF)
  static const struct of_device_id davinci_gpio_ids[] = {
-	{ .compatible = "ti,dm6441-gpio", },
+	{ .compatible = "ti,keystone-gpio", keystone_gpio_get_irq_chip},
+	{ .compatible = "ti,dm6441-gpio", davinci_gpio_get_irq_chip},
  	{ /* sentinel */ },
  };
  MODULE_DEVICE_TABLE(of, davinci_gpio_ids);

Regards,
-grygorii

#8 lore raw

PATCH RESEND v4 1/1 gpio: davinci: reuse for keystone soc

In reply to Grygorii Strashko
Quoted 6 lines · Grygorii Strashko

The similar GPIO HW block is used by keystone SoCs as in Davinci SoCs.
Hence, reuse Davinci GPIO driver for Keystone taking into account that Keystone contains ARM GIC IRQ controller which is implemented using IRQ Chip.

Quoted 6 lines

Documentation:

        http://www.ti.com/lit/ug/sprugv1/sprugv1.pdf

Applied! Santosh hunted me down in person so it really happened this time...

Yours,
Linus Walleij

#9 lore raw

PATCH RESEND v4 1/1 gpio: davinci: reuse for keystone soc

Quoted 12 lines · Linus Walleij
Quoted 9 lines · Grygorii Strashko

The similar GPIO HW block is used by keystone SoCs as in Davinci SoCs.
Hence, reuse Davinci GPIO driver for Keystone taking into account that Keystone contains ARM GIC IRQ controller which is implemented using IRQ Chip.

Documentation:

         http://www.ti.com/lit/ug/sprugv1/sprugv1.pdf
Quoted 6 lines
Quoted 3 lines

Applied! Santosh hunted me down in person so it really happened this time...

Thanks a lot :)

Quoted 4 lines

Yours,
Linus Walleij