Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa22f66b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'davinci-fixes-for-v3.13-rc1' of... 

Merge tag 'davinci-fixes-for-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes

From Sekhar Nori:
This pull request contains a fixe for broken unbanked
GPIO IRQ support and a fix for some random memory
corruption. The bugs were introduced during v3.13
merge window.

* tag 'davinci-fixes-for-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: fix number of resources passed to davinci_gpio_register()
  gpio: davinci: fix check for unbanked gpio
parents 38431148 e462f1f5

arch/arm/mach-davinci/dm355.c

+1 −1
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ static struct davinci_gpio_platform_data dm355_gpio_platform_data = { 
int __init dm355_gpio_register(void)

{

	return davinci_gpio_register(dm355_gpio_resources,

				     sizeof(dm355_gpio_resources),

				     ARRAY_SIZE(dm355_gpio_resources),

				     &dm355_gpio_platform_data);

}

/*----------------------------------------------------------------------*/

arch/arm/mach-davinci/dm365.c

+1 −1
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ static struct davinci_gpio_platform_data dm365_gpio_platform_data = { 
int __init dm365_gpio_register(void)

{

	return davinci_gpio_register(dm365_gpio_resources,

				     sizeof(dm365_gpio_resources),

				     ARRAY_SIZE(dm365_gpio_resources),

				     &dm365_gpio_platform_data);

}

arch/arm/mach-davinci/dm644x.c

+1 −1
Original line number Diff line number Diff line
@@ -792,7 +792,7 @@ static struct davinci_gpio_platform_data dm644_gpio_platform_data = { 
int __init dm644x_gpio_register(void)

{

	return davinci_gpio_register(dm644_gpio_resources,

				     sizeof(dm644_gpio_resources),

				     ARRAY_SIZE(dm644_gpio_resources),

				     &dm644_gpio_platform_data);

}

/*----------------------------------------------------------------------*/

arch/arm/mach-davinci/dm646x.c

+1 −1
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ static struct davinci_gpio_platform_data dm646x_gpio_platform_data = { 
int __init dm646x_gpio_register(void)

{

	return davinci_gpio_register(dm646x_gpio_resources,

				     sizeof(dm646x_gpio_resources),

				     ARRAY_SIZE(dm646x_gpio_resources),

				     &dm646x_gpio_platform_data);

}

/*----------------------------------------------------------------------*/

drivers/gpio/gpio-davinci.c

+3 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static int gpio_to_irq_unbanked(struct gpio_chip *chip, unsigned offset) 
	 * NOTE:  we assume for now that only irqs in the first gpio_chip

	 * can provide direct-mapped IRQs to AINTC (up to 32 GPIOs).

	 */

	if (offset < d->irq_base)

	if (offset < d->gpio_unbanked)

		return d->gpio_irq + offset;

	else

		return -ENODEV;
@@ -419,6 +419,8 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev) 


		/* pass "bank 0" GPIO IRQs to AINTC */

		chips[0].chip.to_irq = gpio_to_irq_unbanked;

		chips[0].gpio_irq = bank_irq;

		chips[0].gpio_unbanked = pdata->gpio_unbanked;

		binten = BIT(0);



		/* AINTC handles mask/unmask; GPIO handles triggering */