[PATCH] Keymap fix for palmte and palmz71.

[PATCH] Keymap fix for palmte and palmz71.

[Eduardo Valentin]

From: Eduardo Valentin <eduardo.valentin@indt.org.br>

Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
---
 arch/arm/mach-omap1/board-palmte.c  |    2 +-
 arch/arm/mach-omap1/board-palmz71.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
index 63c3131..f4860b0 100644
--- a/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
@@ -64,7 +64,7 @@ static const int palmte_keymap[] = {
 	KEY(1, 1, KEY_DOWN),
 	KEY(1, 2, KEY_UP),
 	KEY(1, 3, KEY_RIGHT),
-	KEY(1, 4, KEY_CENTER),
+	KEY(1, 4, KEY_ENTER),
 	0,
 };
 
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index 1565107..e020c27 100644
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -65,7 +65,7 @@ static int palmz71_keymap[] = {
 	KEY(1, 1, KEY_DOWN),
 	KEY(1, 2, KEY_UP),
 	KEY(1, 3, KEY_RIGHT),
-	KEY(1, 4, KEY_CENTER),
+	KEY(1, 4, KEY_ENTER),
 	KEY(2, 0, KEY_CAMERA),
 	0,
 };
-- 
1.5.4.2

Re: [PATCH] Keymap fix for palmte and palmz71.

[andrzej zaborowski]

Hi,

On 27/03/2008, Eduardo Valentin <edubezval@gmail.com> wrote:
> From: Eduardo Valentin <eduardo.valentin@indt.org.br>
>
>  Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
>  ---
>   arch/arm/mach-omap1/board-palmte.c  |    2 +-
>   arch/arm/mach-omap1/board-palmz71.c |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
>  diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
>  index 63c3131..f4860b0 100644
>  --- a/arch/arm/mach-omap1/board-palmte.c
>  +++ b/arch/arm/mach-omap1/board-palmte.c
>  @@ -64,7 +64,7 @@ static const int palmte_keymap[] = {
>         KEY(1, 1, KEY_DOWN),
>         KEY(1, 2, KEY_UP),
>         KEY(1, 3, KEY_RIGHT),
>  -       KEY(1, 4, KEY_CENTER),
>  +       KEY(1, 4, KEY_ENTER),

I'm not sure if the disappearance of KEY_CENTER in
include/linux/input.h was intended or accidental. I can't find the
exact commitdiff that removed it, in either gitweb or gitview. It can
be seen in gitweb that the tree in this commit still has it (after a
bit merge) http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=dd1d9a62f7cd60b544013eb429d6a3137617f0b2
and the following commit:
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=5517853712f1f6daac8a7b2590f9b821e767aa13
has no KEY_CENTER. Is that a merge conflict?
-- 
Please do not print this email unless absolutely necessary. Spread
environmental awareness.

Re: [PATCH] Keymap fix for palmte and palmz71.

[Eduardo Valentin]

Hi andrzej,

It may  disappeared in a merge. However, this patch was based on:
http://linux.omap.com/pipermail/linux-omap-open-source/2007-August/011225.html

That's why I thought the remotion was intended.


Cheers,


On Thu, Mar 27, 2008 at 1:48 PM, andrzej zaborowski <balrogg@gmail.com> wrote:
> Hi,
>
>
>  On 27/03/2008, Eduardo Valentin <edubezval@gmail.com> wrote:
>  > From: Eduardo Valentin <eduardo.valentin@indt.org.br>
>  >
>  >  Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
>  >  ---
>  >   arch/arm/mach-omap1/board-palmte.c  |    2 +-
>  >   arch/arm/mach-omap1/board-palmz71.c |    2 +-
>  >   2 files changed, 2 insertions(+), 2 deletions(-)
>  >
>  >  diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
>  >  index 63c3131..f4860b0 100644
>  >  --- a/arch/arm/mach-omap1/board-palmte.c
>  >  +++ b/arch/arm/mach-omap1/board-palmte.c
>  >  @@ -64,7 +64,7 @@ static const int palmte_keymap[] = {
>  >         KEY(1, 1, KEY_DOWN),
>  >         KEY(1, 2, KEY_UP),
>  >         KEY(1, 3, KEY_RIGHT),
>  >  -       KEY(1, 4, KEY_CENTER),
>  >  +       KEY(1, 4, KEY_ENTER),
>
>  I'm not sure if the disappearance of KEY_CENTER in
>  include/linux/input.h was intended or accidental. I can't find the
>  exact commitdiff that removed it, in either gitweb or gitview. It can
>  be seen in gitweb that the tree in this commit still has it (after a
>  bit merge) http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=dd1d9a62f7cd60b544013eb429d6a3137617f0b2
>  and the following commit:
>  http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=5517853712f1f6daac8a7b2590f9b821e767aa13
>  has no KEY_CENTER. Is that a merge conflict?
>  --
>  Please do not print this email unless absolutely necessary. Spread
>  environmental awareness.
>



-- 
Eduardo Bezerra Valentin

Re: [PATCH] Keymap fix for palmte and palmz71.

[Tony Lindgren]

* Eduardo Valentin <edubezval@gmail.com> [080327 21:16]:
> Hi andrzej,
> 
> It may  disappeared in a merge. However, this patch was based on:
> http://linux.omap.com/pipermail/linux-omap-open-source/2007-August/011225.html
> 
> That's why I thought the remotion was intended.

Andrzej, can you please check this? If patching for the input.h is
needed, we should get it merged via LKML.

Tony

> 
> 
> Cheers,
> 
> 
> On Thu, Mar 27, 2008 at 1:48 PM, andrzej zaborowski <balrogg@gmail.com> wrote:
> > Hi,
> >
> >
> >  On 27/03/2008, Eduardo Valentin <edubezval@gmail.com> wrote:
> >  > From: Eduardo Valentin <eduardo.valentin@indt.org.br>
> >  >
> >  >  Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
> >  >  ---
> >  >   arch/arm/mach-omap1/board-palmte.c  |    2 +-
> >  >   arch/arm/mach-omap1/board-palmz71.c |    2 +-
> >  >   2 files changed, 2 insertions(+), 2 deletions(-)
> >  >
> >  >  diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
> >  >  index 63c3131..f4860b0 100644
> >  >  --- a/arch/arm/mach-omap1/board-palmte.c
> >  >  +++ b/arch/arm/mach-omap1/board-palmte.c
> >  >  @@ -64,7 +64,7 @@ static const int palmte_keymap[] = {
> >  >         KEY(1, 1, KEY_DOWN),
> >  >         KEY(1, 2, KEY_UP),
> >  >         KEY(1, 3, KEY_RIGHT),
> >  >  -       KEY(1, 4, KEY_CENTER),
> >  >  +       KEY(1, 4, KEY_ENTER),
> >
> >  I'm not sure if the disappearance of KEY_CENTER in
> >  include/linux/input.h was intended or accidental. I can't find the
> >  exact commitdiff that removed it, in either gitweb or gitview. It can
> >  be seen in gitweb that the tree in this commit still has it (after a
> >  bit merge) http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=dd1d9a62f7cd60b544013eb429d6a3137617f0b2
> >  and the following commit:
> >  http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=5517853712f1f6daac8a7b2590f9b821e767aa13
> >  has no KEY_CENTER. Is that a merge conflict?
> >  --
> >  Please do not print this email unless absolutely necessary. Spread
> >  environmental awareness.
> >
> 
> 
> 
> -- 
> Eduardo Bezerra Valentin
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] Keymap fix for palmte and palmz71.

[andrzej zaborowski]

On 28/03/2008, Tony Lindgren <tony@atomide.com> wrote:
> * Eduardo Valentin <edubezval@gmail.com> [080327 21:16]:
>  > It may  disappeared in a merge. However, this patch was based on:
>  > http://linux.omap.com/pipermail/linux-omap-open-source/2007-August/011225.html
>  >
>  > That's why I thought the remotion was intended.
>
>
> Andrzej, can you please check this? If patching for the input.h is
>  needed, we should get it merged via LKML.

I think Eduardo's fix is the way to go regardless of what happened
with KEY_CENTER.  I was only wondering why there was this change in
input.h and why it wouldn't appear in gitweb.  I didn't realise that
that key code was local to omap tree.

Cheers

Re: [PATCH] Keymap fix for palmte and palmz71.

[Tony Lindgren]

* andrzej zaborowski <balrogg@gmail.com> [080328 13:40]:
> On 28/03/2008, Tony Lindgren <tony@atomide.com> wrote:
> > * Eduardo Valentin <edubezval@gmail.com> [080327 21:16]:
> >  > It may  disappeared in a merge. However, this patch was based on:
> >  > http://linux.omap.com/pipermail/linux-omap-open-source/2007-August/011225.html
> >  >
> >  > That's why I thought the remotion was intended.
> >
> >
> > Andrzej, can you please check this? If patching for the input.h is
> >  needed, we should get it merged via LKML.
> 
> I think Eduardo's fix is the way to go regardless of what happened
> with KEY_CENTER.  I was only wondering why there was this change in
> input.h and why it wouldn't appear in gitweb.  I didn't realise that
> that key code was local to omap tree.

Thanks, will push Eduardo's patch today.

Tony