Merge tag 'davinci-fixes-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes

DaVinci: fix GPIO breakage after v4.19

This set of changes is needed to fix the broken GPIO support
for DaVinci boards in legacy mode after certain changes made to the
GPIO driver in 4.19, namely: commits 587f7a694f01 ("gpio: davinci: Use
dev name for label and automatic base selection") and eb3744a2dd01
("gpio: davinci: Do not assume continuous IRQ numbering").

* tag 'davinci-fixes-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: dm644x: set the GPIO base to 0
  ARM: davinci: da830: set the GPIO base to 0
  ARM: davinci: dm355: set the GPIO base to 0
  ARM: davinci: dm646x: set the GPIO base to 0
  ARM: davinci: dm365: set the GPIO base to 0
  ARM: davinci: da850: set the GPIO base to 0
  gpio: davinci: restore a way to manually specify the GPIO base
  ARM: davinci: dm644x: define gpio interrupts as separate resources
  ARM: davinci: dm355: define gpio interrupts as separate resources
  ARM: davinci: dm646x: define gpio interrupts as separate resources
  ARM: davinci: dm365: define gpio interrupts as separate resources
  ARM: davinci: da8xx: define gpio interrupts as separate resources

Signed-off-by: Olof Johansson <olof@lixom.net>

9 files changed, 152 insertions, 3 deletions

diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index 0bc5bd2665df..2cc9fe4c3a91 100644
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -759,7 +759,9 @@ static struct davinci_id da830_ids[] = {
 };
 
 static struct davinci_gpio_platform_data da830_gpio_platform_data = {
-        .ngpio = 128,
+        .no_auto_base   = true,
+        .base           = 0,
+        .ngpio          = 128,
 };
 
 int __init da830_register_gpio(void)
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 4528bbf0c861..e7b78df2bfef 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -719,7 +719,9 @@ int __init da850_register_vpif_capture(struct vpif_capture_config
 }
 
 static struct davinci_gpio_platform_data da850_gpio_platform_data = {
-        .ngpio = 144,
+        .no_auto_base   = true,
+        .base           = 0,
+        .ngpio          = 144,
 };
 
 int __init da850_register_gpio(void)
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index 1fd3619f6a09..cf78da5ab054 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -701,6 +701,46 @@ static struct resource da8xx_gpio_resources[] = {
         },
         { /* interrupt */
                 .start  = IRQ_DA8XX_GPIO0,
+                .end    = IRQ_DA8XX_GPIO0,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DA8XX_GPIO1,
+                .end    = IRQ_DA8XX_GPIO1,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DA8XX_GPIO2,
+                .end    = IRQ_DA8XX_GPIO2,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DA8XX_GPIO3,
+                .end    = IRQ_DA8XX_GPIO3,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DA8XX_GPIO4,
+                .end    = IRQ_DA8XX_GPIO4,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DA8XX_GPIO5,
+                .end    = IRQ_DA8XX_GPIO5,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DA8XX_GPIO6,
+                .end    = IRQ_DA8XX_GPIO6,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DA8XX_GPIO7,
+                .end    = IRQ_DA8XX_GPIO7,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DA8XX_GPIO8,
                 .end    = IRQ_DA8XX_GPIO8,
                 .flags  = IORESOURCE_IRQ,
         },
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 9f7d38d12c88..4c6e0bef4509 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -548,12 +548,44 @@ static struct resource dm355_gpio_resources[] = {
         },
         {       /* interrupt */
                 .start  = IRQ_DM355_GPIOBNK0,
+                .end    = IRQ_DM355_GPIOBNK0,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM355_GPIOBNK1,
+                .end    = IRQ_DM355_GPIOBNK1,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM355_GPIOBNK2,
+                .end    = IRQ_DM355_GPIOBNK2,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM355_GPIOBNK3,
+                .end    = IRQ_DM355_GPIOBNK3,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM355_GPIOBNK4,
+                .end    = IRQ_DM355_GPIOBNK4,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM355_GPIOBNK5,
+                .end    = IRQ_DM355_GPIOBNK5,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM355_GPIOBNK6,
                 .end    = IRQ_DM355_GPIOBNK6,
                 .flags  = IORESOURCE_IRQ,
         },
 };
 
 static struct davinci_gpio_platform_data dm355_gpio_platform_data = {
+        .no_auto_base   = true,
+        .base           = 0,
         .ngpio          = 104,
 };
 
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index abcf2a5ed89b..01fb2b0c82de 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -267,12 +267,49 @@ static struct resource dm365_gpio_resources[] = {
         },
         {       /* interrupt */
                 .start  = IRQ_DM365_GPIO0,
+                .end    = IRQ_DM365_GPIO0,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM365_GPIO1,
+                .end    = IRQ_DM365_GPIO1,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM365_GPIO2,
+                .end    = IRQ_DM365_GPIO2,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM365_GPIO3,
+                .end    = IRQ_DM365_GPIO3,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM365_GPIO4,
+                .end    = IRQ_DM365_GPIO4,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM365_GPIO5,
+                .end    = IRQ_DM365_GPIO5,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM365_GPIO6,
+                .end    = IRQ_DM365_GPIO6,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM365_GPIO7,
                 .end    = IRQ_DM365_GPIO7,
                 .flags  = IORESOURCE_IRQ,
         },
 };
 
 static struct davinci_gpio_platform_data dm365_gpio_platform_data = {
+        .no_auto_base   = true,
+        .base           = 0,
         .ngpio          = 104,
         .gpio_unbanked  = 8,
 };
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 0720da7809a6..38f92b7d413e 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -492,12 +492,34 @@ static struct resource dm644_gpio_resources[] = {
         },
         {       /* interrupt */
                 .start  = IRQ_GPIOBNK0,
+                .end    = IRQ_GPIOBNK0,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_GPIOBNK1,
+                .end    = IRQ_GPIOBNK1,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_GPIOBNK2,
+                .end    = IRQ_GPIOBNK2,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_GPIOBNK3,
+                .end    = IRQ_GPIOBNK3,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_GPIOBNK4,
                 .end    = IRQ_GPIOBNK4,
                 .flags  = IORESOURCE_IRQ,
         },
 };
 
 static struct davinci_gpio_platform_data dm644_gpio_platform_data = {
+        .no_auto_base   = true,
+        .base           = 0,
         .ngpio          = 71,
 };
 
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 6bd2ed069d0d..7dc54b2a610f 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -442,12 +442,24 @@ static struct resource dm646x_gpio_resources[] = {
         },
         {       /* interrupt */
                 .start  = IRQ_DM646X_GPIOBNK0,
+                .end    = IRQ_DM646X_GPIOBNK0,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM646X_GPIOBNK1,
+                .end    = IRQ_DM646X_GPIOBNK1,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .start  = IRQ_DM646X_GPIOBNK2,
                 .end    = IRQ_DM646X_GPIOBNK2,
                 .flags  = IORESOURCE_IRQ,
         },
 };
 
 static struct davinci_gpio_platform_data dm646x_gpio_platform_data = {
+        .no_auto_base   = true,
+        .base           = 0,
         .ngpio          = 43,
 };
 
diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c
index 5c1564fcc24e..bdb29e51b417 100644
--- a/drivers/gpio/gpio-davinci.c
+++ b/drivers/gpio/gpio-davinci.c
@@ -258,7 +258,7 @@ static int davinci_gpio_probe(struct platform_device *pdev)
         chips->chip.set = davinci_gpio_set;
 
         chips->chip.ngpio = ngpio;
-        chips->chip.base = -1;
+        chips->chip.base = pdata->no_auto_base ? pdata->base : -1;
 
 #ifdef CONFIG_OF_GPIO
         chips->chip.of_gpio_n_cells = 2;
diff --git a/include/linux/platform_data/gpio-davinci.h b/include/linux/platform_data/gpio-davinci.h
index f92a47e18034..a93841bfb9f7 100644
--- a/include/linux/platform_data/gpio-davinci.h
+++ b/include/linux/platform_data/gpio-davinci.h
@@ -17,6 +17,8 @@
 #define __DAVINCI_GPIO_PLATFORM_H
 
 struct davinci_gpio_platform_data {
+        bool    no_auto_base;
+        u32     base;
         u32     ngpio;
         u32     gpio_unbanked;
 };