gemini fix for 2.6.33-rc8
Hi Russell,
Please pull these changes for rc. I am sending patches also for comments if any.
The following changes since commit 83c5aac175e182c30729650f2edee3294c3b8bb0:
Linus Torvalds (1):
Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input
are available in the git repository at:
git://gitorious.org/linux-gemini/mainline.git for-rmk
Paulius Zaleckas (1):
MAINTAINERS: fix my e-mail and status for Gemini and FA526
Roel Kluin (1):
Gemini: wrong registers used to set reg_level in gpio_set_irq_type()
MAINTAINERS | 8 ++++---- arch/arm/mach-gemini/gpio.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
PATCH 1/2 Gemini: wrong registers used to set reg_level in gpio_set_irq_type()
From: Roel Kluin <[email protected]>
It appears the wrong GPIO registers were used
---
arch/arm/mach-gemini/gpio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-gemini/gpio.c +2 -2
@@ -86,7 +86,7 @@ static int gpio_set_irq_type(unsigned int irq, unsigned int type)unsigned int reg_both, reg_level, reg_type; reg_type =__raw_readl (base +GPIO_INT_TYPE ); - reg_level =__raw_readl (base +GPIO_INT_BOTH_EDGE ); + reg_level =__raw_readl (base +GPIO_INT_LEVEL ); reg_both =__raw_readl (base +GPIO_INT_BOTH_EDGE );switch (type) {
@@ -117,7 +117,7 @@ static int gpio_set_irq_type(unsigned int irq, unsigned int type) }__raw_writel (reg_type, base +GPIO_INT_TYPE ); -__raw_writel (reg_level, base +GPIO_INT_BOTH_EDGE ); +__raw_writel (reg_level, base +GPIO_INT_LEVEL );__raw_writel (reg_both, base +GPIO_INT_BOTH_EDGE );gpio_ack_irq (irq);
PATCH 2/2 MAINTAINERS: fix my e-mail and status for Gemini and FA526
In reply to Paulius Zaleckas---
MAINTAINERS | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
MAINTAINERS +4 -4
@@ -616,10 +616,10 @@ M: Richard Purdie <[email protected]> S: Maintained ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE -M: Paulius Zaleckas <[email protected]> +M: Paulius Zaleckas <[email protected]> L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers) T: git git://gitorious.org/linux-gemini/mainline.git -S: Maintained +S: Odd Fixes F: arch/arm/mach-gemini/ ARM/EBSA110 MACHINE SUPPORT
@@ -641,9 +641,9 @@ T: topgit git://git.openezx.org/openezx.git F: arch/arm/mach-pxa/ezx.c ARM/FARADAY FA526 PORT -M: Paulius Zaleckas <[email protected]> +M: Paulius Zaleckas <[email protected]> L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers) -S: Maintained +S: Odd Fixes F: arch/arm/mm/*-fa* ARM/FOOTBRIDGE ARCHITECTURE