| Message ID | cf97f856-7e6d-4753-a3f0-51c410cc2db4@HUB2.rwth-ad.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Mar 05, 2015 at 12:31:10AM +0100, Stefan Brüns wrote: > Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> This should go through HID and platform trees unless I hear otherwise. > --- > drivers/hid/hid-debug.c | 2 +- > drivers/platform/x86/fujitsu-tablet.c | 6 +++--- > drivers/platform/x86/hp-wmi.c | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c > index 8bf61d2..1086800 100644 > --- a/drivers/hid/hid-debug.c > +++ b/drivers/hid/hid-debug.c > @@ -814,7 +814,7 @@ static const char *keys[KEY_MAX + 1] = { > [KEY_DELETEFILE] = "DeleteFile", [KEY_XFER] = "X-fer", > [KEY_PROG1] = "Prog1", [KEY_PROG2] = "Prog2", > [KEY_WWW] = "WWW", [KEY_MSDOS] = "MSDOS", > - [KEY_COFFEE] = "Coffee", [KEY_DIRECTION] = "Direction", > + [KEY_COFFEE] = "Coffee", [KEY_ROTATE_DISPLAY] = "RotateDisplay", > [KEY_CYCLEWINDOWS] = "CycleWindows", [KEY_MAIL] = "Mail", > [KEY_BOOKMARKS] = "Bookmarks", [KEY_COMPUTER] = "Computer", > [KEY_BACK] = "Back", [KEY_FORWARD] = "Forward", > diff --git a/drivers/platform/x86/fujitsu-tablet.c b/drivers/platform/x86/fujitsu-tablet.c > index 53bdbb0..baea077 100644 > --- a/drivers/platform/x86/fujitsu-tablet.c > +++ b/drivers/platform/x86/fujitsu-tablet.c > @@ -59,7 +59,7 @@ static unsigned short keymap_Lifebook_Tseries[KEYMAP_LEN] __initdata = { > KEY_RESERVED, > KEY_SCROLLDOWN, > KEY_SCROLLUP, > - KEY_DIRECTION, > + KEY_ROTATE_DISPLAY, > KEY_LEFTCTRL, > KEY_BRIGHTNESSUP, > KEY_BRIGHTNESSDOWN, > @@ -116,7 +116,7 @@ static unsigned short keymap_Lifebook_U810[KEYMAP_LEN] __initdata = { > KEY_RESERVED, > KEY_PROG1, > KEY_PROG2, > - KEY_DIRECTION, > + KEY_ROTATE_DISPLAY, > KEY_RESERVED, > KEY_RESERVED, > KEY_RESERVED, > @@ -153,7 +153,7 @@ static unsigned short keymap_Stylistic_ST5xxx[KEYMAP_LEN] __initdata = { > KEY_RESERVED, > KEY_RESERVED, > KEY_MAIL, > - KEY_DIRECTION, > + KEY_ROTATE_DISPLAY, > KEY_ESC, > KEY_ENTER, > KEY_BRIGHTNESSUP, > diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c > index 0ab2b37..0669731 100644 > --- a/drivers/platform/x86/hp-wmi.c > +++ b/drivers/platform/x86/hp-wmi.c > @@ -144,7 +144,7 @@ static const struct key_entry hp_wmi_keymap[] = { > { KE_KEY, 0x20e8, { KEY_MEDIA } }, > { KE_KEY, 0x2142, { KEY_MEDIA } }, > { KE_KEY, 0x213b, { KEY_INFO } }, > - { KE_KEY, 0x2169, { KEY_DIRECTION } }, > + { KE_KEY, 0x2169, { KEY_ROTATE_DISPLAY } }, > { KE_KEY, 0x216a, { KEY_SETUP } }, > { KE_KEY, 0x231b, { KEY_HELP } }, > { KE_END, 0 } > -- > 2.1.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-input" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Mar 05, 2015 at 11:56:00PM -0800, Dmitry Torokhov wrote: > On Thu, Mar 05, 2015 at 12:31:10AM +0100, Stefan Brüns wrote: > > Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> > > This should go through HID and platform trees unless I hear otherwise. I'll defer to Jiri on this. Jiri, please feel free to pull the drivers/platform/x86 changes through your tree.
On Fri, 6 Mar 2015, Darren Hart wrote: > > > Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> > > > > This should go through HID and platform trees unless I hear otherwise. > > I'll defer to Jiri on this. Jiri, please feel free to pull the > drivers/platform/x86 changes through your tree. Dmitry, as you already merged the patch which aliases KEY_ROTATE_DISPLAY to KEY_DIRECTION, please also take this one so that we avoid unnecessary cross-tree dependencies. Feel free to add Acked-by: Jiri Kosina <jkosina@suse.cz> to this one. Thanks,
On Fri, Mar 06, 2015 at 10:45:52PM +0100, Jiri Kosina wrote: > On Fri, 6 Mar 2015, Darren Hart wrote: > > > > > Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> > > > > > > This should go through HID and platform trees unless I hear otherwise. > > > > I'll defer to Jiri on this. Jiri, please feel free to pull the > > drivers/platform/x86 changes through your tree. > > Dmitry, as you already merged the patch which aliases KEY_ROTATE_DISPLAY > to KEY_DIRECTION, please also take this one so that we avoid unnecessary > cross-tree dependencies. Feel free to add > > Acked-by: Jiri Kosina <jkosina@suse.cz> Applied, thank you.
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c index 8bf61d2..1086800 100644 --- a/drivers/hid/hid-debug.c +++ b/drivers/hid/hid-debug.c @@ -814,7 +814,7 @@ static const char *keys[KEY_MAX + 1] = { [KEY_DELETEFILE] = "DeleteFile", [KEY_XFER] = "X-fer", [KEY_PROG1] = "Prog1", [KEY_PROG2] = "Prog2", [KEY_WWW] = "WWW", [KEY_MSDOS] = "MSDOS", - [KEY_COFFEE] = "Coffee", [KEY_DIRECTION] = "Direction", + [KEY_COFFEE] = "Coffee", [KEY_ROTATE_DISPLAY] = "RotateDisplay", [KEY_CYCLEWINDOWS] = "CycleWindows", [KEY_MAIL] = "Mail", [KEY_BOOKMARKS] = "Bookmarks", [KEY_COMPUTER] = "Computer", [KEY_BACK] = "Back", [KEY_FORWARD] = "Forward", diff --git a/drivers/platform/x86/fujitsu-tablet.c b/drivers/platform/x86/fujitsu-tablet.c index 53bdbb0..baea077 100644 --- a/drivers/platform/x86/fujitsu-tablet.c +++ b/drivers/platform/x86/fujitsu-tablet.c @@ -59,7 +59,7 @@ static unsigned short keymap_Lifebook_Tseries[KEYMAP_LEN] __initdata = { KEY_RESERVED, KEY_SCROLLDOWN, KEY_SCROLLUP, - KEY_DIRECTION, + KEY_ROTATE_DISPLAY, KEY_LEFTCTRL, KEY_BRIGHTNESSUP, KEY_BRIGHTNESSDOWN, @@ -116,7 +116,7 @@ static unsigned short keymap_Lifebook_U810[KEYMAP_LEN] __initdata = { KEY_RESERVED, KEY_PROG1, KEY_PROG2, - KEY_DIRECTION, + KEY_ROTATE_DISPLAY, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, @@ -153,7 +153,7 @@ static unsigned short keymap_Stylistic_ST5xxx[KEYMAP_LEN] __initdata = { KEY_RESERVED, KEY_RESERVED, KEY_MAIL, - KEY_DIRECTION, + KEY_ROTATE_DISPLAY, KEY_ESC, KEY_ENTER, KEY_BRIGHTNESSUP, diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index 0ab2b37..0669731 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -144,7 +144,7 @@ static const struct key_entry hp_wmi_keymap[] = { { KE_KEY, 0x20e8, { KEY_MEDIA } }, { KE_KEY, 0x2142, { KEY_MEDIA } }, { KE_KEY, 0x213b, { KEY_INFO } }, - { KE_KEY, 0x2169, { KEY_DIRECTION } }, + { KE_KEY, 0x2169, { KEY_ROTATE_DISPLAY } }, { KE_KEY, 0x216a, { KEY_SETUP } }, { KE_KEY, 0x231b, { KEY_HELP } }, { KE_END, 0 }
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> --- drivers/hid/hid-debug.c | 2 +- drivers/platform/x86/fujitsu-tablet.c | 6 +++--- drivers/platform/x86/hp-wmi.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)