[GIT PULL] gpio fixes for v3.6-rc1

[GIT PULL] gpio fixes for v3.6-rc1

[Linus Walleij]

Hi Linus,

these are some accumulated GPIO fixes I've collected for the -rc1.
Description of fixes are in the tag below. All tested in linux-next.

Please pull them in!

The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee:

  Linux 3.6-rc1 (2012-08-02 16:38:10 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
tags/gpio-fixes-v3.6-rc1

for you to fetch changes up to d6a2b7ba67334a7e72cd153c142c449831557cb9:

  drivers/gpio/gpio-langwell.c: fix error return code (2012-08-07
08:55:52 +0200)

----------------------------------------------------------------
gpio fixes for v3.6-rc1
- Fix a resource leak in the SCH driver
- Fix the register address calculation in the MSIC driver
- Fix the PXA driver's devicetree functions
- Delete redundant shadow variable leftovers in the MXC driver
- Specify the GPIO base for the device tree probe in the MXC driver
- Add a modalias for the i.MX driver
- Fix off-by-one bug in the Samsung driver
- Fix erroneous errorpath in the Langwell driver

----------------------------------------------------------------
Alan Cox (1):
      gpio-sch: Fix leak of resource

Axel Lin (1):
      gpio: msic: Fix calculating register address in msic_gpio_to_oreg()

Daniel Mack (1):
      GPIO: gpio-pxa: fix devicetree functions

Julia Lawall (1):
      drivers/gpio/gpio-langwell.c: fix error return code

Sean Paul (1):
      gpio: samsung: Fix off-by-one bug in gpio addresses

Shawn Guo (3):
      gpio/mxc: remove redundant shadow variables initialization
      gpio/mxc: specify gpio base for device tree probe
      ARM: dts: imx: add alias for gpio

 arch/arm/boot/dts/imx27.dtsi |  6 ++++++
 arch/arm/boot/dts/imx51.dtsi |  4 ++++
 arch/arm/boot/dts/imx53.dtsi |  7 +++++++
 arch/arm/boot/dts/imx6q.dtsi |  7 +++++++
 drivers/gpio/gpio-langwell.c |  7 +++++--
 drivers/gpio/gpio-msic.c     |  2 +-
 drivers/gpio/gpio-mxc.c      |  5 ++---
 drivers/gpio/gpio-pxa.c      | 26 ++++++++++++++++++++++++++
 drivers/gpio/gpio-samsung.c  | 14 +++++++-------
 drivers/gpio/gpio-sch.c      |  3 ++-
 10 files changed, 67 insertions(+), 14 deletions(-)

Yours,
Linus Walleij

Re: [GIT PULL] gpio fixes for v3.6-rc1

[Arnd Bergmann]

On Friday 10 August 2012, Linus Walleij wrote:
> Daniel Mack (1):
>       GPIO: gpio-pxa: fix devicetree functions
> 

Unfortunately, this one caused a build regression, see the fix below.
I also wonder why pxa_irq_domain_ops isn't static.

	Arnd

8<----
GPIO: gpio-pxa: fix building without CONFIG_OF

Patch 7212157267 "GPIO: gpio-pxa: fix devicetree functions" added an
"xlate" function pointer to the irq_domain_ops, but this function
is nor declared or defined anywhere when CONFIG_OF is disabled, causing
the build error:

drivers/gpio/gpio-pxa.c:532:11: error: 'irq_domain_xlate_twocell' undeclared here (not in a function)

Extending the DT-only code section to cover the irq_domain_ops
and the pxa_gpio_dt_ids solves this problem and makes it clearer
which code is actually used without DT.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index 793767b0..9cac88a 100644
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -512,6 +512,7 @@ static int pxa_gpio_nums(void)
 	return count;
 }
 
+#ifdef CONFIG_OF
 static struct of_device_id pxa_gpio_dt_ids[] = {
 	{ .compatible = "mrvl,pxa-gpio" },
 	{ .compatible = "mrvl,mmp-gpio", .data = (void *)MMP_GPIO },
@@ -532,7 +533,6 @@ const struct irq_domain_ops pxa_irq_domain_ops = {
 	.xlate	= irq_domain_xlate_twocell,
 };
 
-#ifdef CONFIG_OF
 static int __devinit pxa_gpio_probe_dt(struct platform_device *pdev)
 {
 	int ret, nr_banks, nr_gpios, irq_base;
@@ -679,7 +679,7 @@ static struct platform_driver pxa_gpio_driver = {
 	.probe		= pxa_gpio_probe,
 	.driver		= {
 		.name	= "pxa-gpio",
-		.of_match_table = pxa_gpio_dt_ids,
+		.of_match_table = of_match_ptr(pxa_gpio_dt_ids),
 	},
 };
 

Re: [GIT PULL] gpio fixes for v3.6-rc1

[Linus Walleij]

On Mon, Aug 13, 2012 at 4:36 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Friday 10 August 2012, Linus Walleij wrote:
>> Daniel Mack (1):
>>       GPIO: gpio-pxa: fix devicetree functions
>>
>
> Unfortunately, this one caused a build regression, see the fix below.
> I also wonder why pxa_irq_domain_ops isn't static.
>
>         Arnd
>
> 8<----
> GPIO: gpio-pxa: fix building without CONFIG_OF
>
> Patch 7212157267 "GPIO: gpio-pxa: fix devicetree functions" added an
> "xlate" function pointer to the irq_domain_ops, but this function
> is nor declared or defined anywhere when CONFIG_OF is disabled, causing
> the build error:
>
> drivers/gpio/gpio-pxa.c:532:11: error: 'irq_domain_xlate_twocell' undeclared here (not in a function)
>
> Extending the DT-only code section to cover the irq_domain_ops
> and the pxa_gpio_dt_ids solves this problem and makes it clearer
> which code is actually used without DT.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Thanks, applied this to my fixes branch.

Yours,
Linus Walleij