* [GIT PULL] GPIO: KZM-A9-GT for 3.7
@ 2012-09-11 5:26 Simon Horman
2012-09-11 5:26 ` [PATCH] ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled Simon Horman
2012-09-11 17:25 ` [GIT PULL] GPIO: KZM-A9-GT for 3.7 Linus Walleij
0 siblings, 2 replies; 7+ messages in thread
From: Simon Horman @ 2012-09-11 5:26 UTC (permalink / raw)
To: linux-arm-kernel
Hi Linus,
please consider the following GPIO enhancement for the kzm9g board
for 3.7. As discussed previously it depends on changes in devel tree
and thus seems to be appropriate to merge there.
----------------------------------------------------------------
The following changes since commit a3b930815d07e2a8a25e85496839f80facb3654d:
gpio: sx150x: Use irq_data_get_irq_chip_data() at appropriate places (2012-09-06 09:19:04 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git gpio
for you to fetch changes up to b7a3ce41bb1ca65954029fb002373524bafb3161:
ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled (2012-09-11 13:54:57 +0900)
----------------------------------------------------------------
Kuninori Morimoto (1):
ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled
arch/arm/configs/kzm9g_defconfig | 2 +-
arch/arm/mach-shmobile/board-kzm9g.c | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH] ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled
2012-09-11 5:26 [GIT PULL] GPIO: KZM-A9-GT for 3.7 Simon Horman
@ 2012-09-11 5:26 ` Simon Horman
2012-09-11 17:27 ` Linus Walleij
2012-09-12 15:47 ` Linus Walleij
2012-09-11 17:25 ` [GIT PULL] GPIO: KZM-A9-GT for 3.7 Linus Walleij
1 sibling, 2 replies; 7+ messages in thread
From: Simon Horman @ 2012-09-11 5:26 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
6e20a0a429bd4dc07d6de16d9c247270e04e4aa0
(gpio: pcf857x: enable gpio_to_irq() support) supports
gpio_to_irq() on pcf857x driver.
Now, we can use gpio-keys driver instead of gpio-keys-polled.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/configs/kzm9g_defconfig | 2 +-
arch/arm/mach-shmobile/board-kzm9g.c | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig
index 2388c86..175804e 100644
--- a/arch/arm/configs/kzm9g_defconfig
+++ b/arch/arm/configs/kzm9g_defconfig
@@ -22,7 +22,6 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_SHMOBILE=y
-CONFIG_KEYBOARD_GPIO_POLLED=y
CONFIG_ARCH_SH73A0=y
CONFIG_MACH_KZM9G=y
CONFIG_MEMORY_START=0x41000000
@@ -70,6 +69,7 @@ CONFIG_INPUT_SPARSEKMAP=y
# CONFIG_INPUT_MOUSEDEV is not set
CONFIG_INPUT_EVDEV=y
# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_ST1232=y
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 53b7ea9..4d1348e 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -482,12 +482,10 @@ static struct gpio_keys_button gpio_buttons[] = {
static struct gpio_keys_platform_data gpio_key_info = {
.buttons = gpio_buttons,
.nbuttons = ARRAY_SIZE(gpio_buttons),
- .poll_interval = 250, /* poling at this point */
};
static struct platform_device gpio_keys_device = {
- /* gpio-pcf857x.c driver doesn't support gpio_to_irq() */
- .name = "gpio-keys-polled",
+ .name = "gpio-keys",
.dev = {
.platform_data = &gpio_key_info,
},
@@ -550,6 +548,7 @@ static struct platform_device fsi_ak4648_device = {
/* I2C */
static struct pcf857x_platform_data pcf8575_pdata = {
.gpio_base = GPIO_PCF8575_BASE,
+ .irq = intcs_evt2irq(0x3260), /* IRQ19 */
};
static struct i2c_board_info i2c0_devices[] = {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH] ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled
2012-09-11 5:26 ` [PATCH] ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled Simon Horman
@ 2012-09-11 17:27 ` Linus Walleij
2012-09-12 5:49 ` Paul Mundt
2012-09-12 15:47 ` Linus Walleij
1 sibling, 1 reply; 7+ messages in thread
From: Linus Walleij @ 2012-09-11 17:27 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 11, 2012 at 7:26 AM, Simon Horman <horms@verge.net.au> wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>
> 6e20a0a429bd4dc07d6de16d9c247270e04e4aa0
> (gpio: pcf857x: enable gpio_to_irq() support) supports
> gpio_to_irq() on pcf857x driver.
> Now, we can use gpio-keys driver instead of gpio-keys-polled.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Signed-off-by: Simon Horman <horms@verge.net.au>
Paul, Magnus - Simon wants me to merge this through the
GPIO tree, can I have and ACK from one of the shmobile
maintainers on that?
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled
2012-09-11 17:27 ` Linus Walleij
@ 2012-09-12 5:49 ` Paul Mundt
0 siblings, 0 replies; 7+ messages in thread
From: Paul Mundt @ 2012-09-12 5:49 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 11, 2012 at 07:27:54PM +0200, Linus Walleij wrote:
> On Tue, Sep 11, 2012 at 7:26 AM, Simon Horman <horms@verge.net.au> wrote:
>
> > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >
> > 6e20a0a429bd4dc07d6de16d9c247270e04e4aa0
> > (gpio: pcf857x: enable gpio_to_irq() support) supports
> > gpio_to_irq() on pcf857x driver.
> > Now, we can use gpio-keys driver instead of gpio-keys-polled.
> >
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > Signed-off-by: Simon Horman <horms@verge.net.au>
>
> Paul, Magnus - Simon wants me to merge this through the
> GPIO tree, can I have and ACK from one of the shmobile
> maintainers on that?
>
Looks fine to me.
Acked-by: Paul Mundt <lethal@linux-sh.org>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled
2012-09-11 5:26 ` [PATCH] ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled Simon Horman
2012-09-11 17:27 ` Linus Walleij
@ 2012-09-12 15:47 ` Linus Walleij
1 sibling, 0 replies; 7+ messages in thread
From: Linus Walleij @ 2012-09-12 15:47 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 11, 2012 at 7:26 AM, Simon Horman <horms@verge.net.au> wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>
> 6e20a0a429bd4dc07d6de16d9c247270e04e4aa0
> (gpio: pcf857x: enable gpio_to_irq() support) supports
> gpio_to_irq() on pcf857x driver.
> Now, we can use gpio-keys driver instead of gpio-keys-polled.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Signed-off-by: Simon Horman <horms@verge.net.au>
Applied, thanks!
Linus Walleij
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] GPIO: KZM-A9-GT for 3.7
2012-09-11 5:26 [GIT PULL] GPIO: KZM-A9-GT for 3.7 Simon Horman
2012-09-11 5:26 ` [PATCH] ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled Simon Horman
@ 2012-09-11 17:25 ` Linus Walleij
1 sibling, 0 replies; 7+ messages in thread
From: Linus Walleij @ 2012-09-11 17:25 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 11, 2012 at 7:26 AM, Simon Horman <horms@verge.net.au> wrote:
> please consider the following GPIO enhancement for the kzm9g board
> for 3.7. As discussed previously it depends on changes in devel tree
> and thus seems to be appropriate to merge there.
I'll rather apply the raw patch, I'll comment on that one...
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] Renesas ARM-based SoC: KZM-A9-GT for 3.7 #2
@ 2012-08-30 5:47 Simon Horman
2012-08-30 5:47 ` [PATCH] ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled Simon Horman
0 siblings, 1 reply; 7+ messages in thread
From: Simon Horman @ 2012-08-30 5:47 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Arnd,
please consider the following enhancement to the KZM-A9-GT board by
from Morimoto-san for inclusion in 3.7.
* This pull request is based on the devel branch of
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
which is based on v3.6-rc2.
This is to satisfy compile-time dependencies.
Please let me know if you would like this handled a different way.
* This and a previous pull request,
"Renesas ARM-based SoC: KZM-9A-GT for 3.7", both touch board-kzm9g.c
but I do not believe there is a conflict.
Please let me know if you would like this handled a different way.
----------------------------------------------------------------
The following changes since commit f24a9172233cfc205ef7a999370412ab577783b1:
gpio/mxs: adopt irq_domain support for mxs gpio driver (2012-08-23 23:49:17 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git kzm9g-gpio
for you to fetch changes up to af26b952cca1a87f31b09015fb3f7c77232036e1:
ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled (2012-08-30 13:59:31 +0900)
----------------------------------------------------------------
Kuninori Morimoto (1):
ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled
arch/arm/configs/kzm9g_defconfig | 2 +-
arch/arm/mach-shmobile/board-kzm9g.c | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH] ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled
2012-08-30 5:47 [GIT PULL] Renesas ARM-based SoC: KZM-A9-GT for 3.7 #2 Simon Horman
@ 2012-08-30 5:47 ` Simon Horman
0 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2012-08-30 5:47 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
6e20a0a429bd4dc07d6de16d9c247270e04e4aa0
(gpio: pcf857x: enable gpio_to_irq() support) supports
gpio_to_irq() on pcf857x driver.
Now, we can use gpio-keys driver instead of gpio-keys-polled.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/configs/kzm9g_defconfig | 2 +-
arch/arm/mach-shmobile/board-kzm9g.c | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig
index 2388c86..175804e 100644
--- a/arch/arm/configs/kzm9g_defconfig
+++ b/arch/arm/configs/kzm9g_defconfig
@@ -22,7 +22,6 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_SHMOBILE=y
-CONFIG_KEYBOARD_GPIO_POLLED=y
CONFIG_ARCH_SH73A0=y
CONFIG_MACH_KZM9G=y
CONFIG_MEMORY_START=0x41000000
@@ -70,6 +69,7 @@ CONFIG_INPUT_SPARSEKMAP=y
# CONFIG_INPUT_MOUSEDEV is not set
CONFIG_INPUT_EVDEV=y
# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_ST1232=y
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 53b7ea9..4d1348e 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -482,12 +482,10 @@ static struct gpio_keys_button gpio_buttons[] = {
static struct gpio_keys_platform_data gpio_key_info = {
.buttons = gpio_buttons,
.nbuttons = ARRAY_SIZE(gpio_buttons),
- .poll_interval = 250, /* poling at this point */
};
static struct platform_device gpio_keys_device = {
- /* gpio-pcf857x.c driver doesn't support gpio_to_irq() */
- .name = "gpio-keys-polled",
+ .name = "gpio-keys",
.dev = {
.platform_data = &gpio_key_info,
},
@@ -550,6 +548,7 @@ static struct platform_device fsi_ak4648_device = {
/* I2C */
static struct pcf857x_platform_data pcf8575_pdata = {
.gpio_base = GPIO_PCF8575_BASE,
+ .irq = intcs_evt2irq(0x3260), /* IRQ19 */
};
static struct i2c_board_info i2c0_devices[] = {
--
1.7.10.2.484.gcd07cc5
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-09-12 15:47 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-11 5:26 [GIT PULL] GPIO: KZM-A9-GT for 3.7 Simon Horman
2012-09-11 5:26 ` [PATCH] ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled Simon Horman
2012-09-11 17:27 ` Linus Walleij
2012-09-12 5:49 ` Paul Mundt
2012-09-12 15:47 ` Linus Walleij
2012-09-11 17:25 ` [GIT PULL] GPIO: KZM-A9-GT for 3.7 Linus Walleij
-- strict thread matches above, loose matches on Subject: below --
2012-08-30 5:47 [GIT PULL] Renesas ARM-based SoC: KZM-A9-GT for 3.7 #2 Simon Horman
2012-08-30 5:47 ` [PATCH] ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).