| Message ID | 1367019745-31826-1-git-send-email-olof@lixom.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Olof, On Fri, Apr 26, 2013 at 4:42 PM, Olof Johansson <olof@lixom.net> wrote: > Add basic EC information to device tree, currently only describing the > keyboard and keymap. > > Signed-off-by: Olof Johansson <olof@lixom.net> > Cc: Doug Anderson <dianders@chromium.org> > --- > > Kukjin, I'll apply this too directly if you don't mind. > > > -Olof > > arch/arm/boot/dts/cros5250-common.dtsi | 99 +++++++++++++++++++++++++++++++++- > 1 file changed, 98 insertions(+), 1 deletion(-) I'm not a huge fan of this change as I'd rather see my arbitration changes land first and see this based atop those. The arbitration driver has landed so all that's left are the device tree bits. That would be: https://patchwork.kernel.org/patch/2449961/ https://patchwork.kernel.org/patch/2449941/ ...but other than that this looks good. -Doug
On Fri, Apr 26, 2013 at 04:56:51PM -0700, Doug Anderson wrote: > Olof, > > On Fri, Apr 26, 2013 at 4:42 PM, Olof Johansson <olof@lixom.net> wrote: > > Add basic EC information to device tree, currently only describing the > > keyboard and keymap. > > > > Signed-off-by: Olof Johansson <olof@lixom.net> > > Cc: Doug Anderson <dianders@chromium.org> > > --- > > > > Kukjin, I'll apply this too directly if you don't mind. > > > > > > -Olof > > > > arch/arm/boot/dts/cros5250-common.dtsi | 99 +++++++++++++++++++++++++++++++++- > > 1 file changed, 98 insertions(+), 1 deletion(-) > > I'm not a huge fan of this change as I'd rather see my arbitration > changes land first and see this based atop those. The arbitration > driver has landed so all that's left are the device tree bits. > > That would be: > > https://patchwork.kernel.org/patch/2449961/ > https://patchwork.kernel.org/patch/2449941/ > > ...but other than that this looks good. Ah, yes, of course. As discussed off-mail, I was mislead by some contents in our local tree. :) Kukjin, I'd really like to pick up these patches for 3.10, since they're isolated to just dts changes and gets keyboard working on the Chromebook. Can you ack them and I'll just collect them this time? I'll repost a version that goes on top of Doug's patches. -Olof
Olof, On Fri, Apr 26, 2013 at 6:04 PM, Olof Johansson <olof@lixom.net> wrote: > Ah, yes, of course. As discussed off-mail, I was mislead by some contents in > our local tree. :) Sorry about that--that was my fault. Things have landed in a different order in one of our local trees. > Kukjin, I'd really like to pick up these patches for 3.10, since they're > isolated to just dts changes and gets keyboard working on the Chromebook. Can > you ack them and I'll just collect them this time? I'm pretty sure that Kukjin is OK with them. Kukjin responded earlier and said: > I'm fine on 2nd and 3rd patches. Shall I take only two patches without 1st > one in samsung tree? At the time we were waiting for Wolfram to get patch 1 into his tree, which is now done. ...but waiting for his official Ack is good, too. ;) -Doug
On Fri, Apr 26, 2013 at 09:04:56PM -0700, Doug Anderson wrote: > Olof, > > On Fri, Apr 26, 2013 at 6:04 PM, Olof Johansson <olof@lixom.net> wrote: > > Ah, yes, of course. As discussed off-mail, I was mislead by some contents in > > our local tree. :) > > Sorry about that--that was my fault. Things have landed in a > different order in one of our local trees. Yeah, no worries. > > Kukjin, I'd really like to pick up these patches for 3.10, since they're > > isolated to just dts changes and gets keyboard working on the Chromebook. Can > > you ack them and I'll just collect them this time? > > I'm pretty sure that Kukjin is OK with them. Kukjin responded earlier and said: > > > I'm fine on 2nd and 3rd patches. Shall I take only two patches without 1st > > one in samsung tree? > > At the time we were waiting for Wolfram to get patch 1 into his tree, > which is now done. > > ...but waiting for his official Ack is good, too. ;) Ah, yes, sounds good. I'll apply these to a late/* branch on arm-soc. It's only touching cros5250 and snow device trees anyway. v2 of the patch posted as separate comment. -Olof
On 04/27/13 13:04, Doug Anderson wrote: > Olof, > > On Fri, Apr 26, 2013 at 6:04 PM, Olof Johansson<olof@lixom.net> wrote: >> Ah, yes, of course. As discussed off-mail, I was mislead by some contents in >> our local tree. :) > > Sorry about that--that was my fault. Things have landed in a > different order in one of our local trees. > > >> Kukjin, I'd really like to pick up these patches for 3.10, since they're >> isolated to just dts changes and gets keyboard working on the Chromebook. Can >> you ack them and I'll just collect them this time? > > I'm pretty sure that Kukjin is OK with them. Kukjin responded earlier and said: > Yes, right. Olof, sorry for late, please go ahead with my ack if you want. Acked-by: Kukjin Kim <kgene.kim@samsung.com> - Kukjin >> I'm fine on 2nd and 3rd patches. Shall I take only two patches without 1st >> one in samsung tree? > > At the time we were waiting for Wolfram to get patch 1 into his tree, > which is now done. > > ...but waiting for his official Ack is good, too. ;)
diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi index 8a5b3a6..ebfa805 100644 --- a/arch/arm/boot/dts/cros5250-common.dtsi +++ b/arch/arm/boot/dts/cros5250-common.dtsi @@ -193,7 +193,104 @@ }; i2c@12CA0000 { - status = "disabled"; + samsung,i2c-sda-delay = <100>; + samsung,i2c-max-bus-freq = <66000>; + + ec: embedded-controller { + compatible = "google,cros-ec-i2c"; + reg = <0x1e>; + interrupts = <6 0>; + interrupt-parent = <&gpx1>; + wakeup-source; + + cros-ec-keyb { + compatible = "google,cros-ec-keyb"; + keypad,num-rows = <8>; + keypad,num-columns = <13>; + google,needs-ghost-filter; + linux,keymap = <0x0001003a /* CAPSLK */ + 0x0002003b /* F1 */ + 0x00030030 /* B */ + 0x00040044 /* F10 */ + 0x00060031 /* N */ + 0x0008000d /* = */ + 0x000a0064 /* R_ALT */ + + 0x01010001 /* ESC */ + 0x0102003e /* F4 */ + 0x01030022 /* G */ + 0x01040041 /* F7 */ + 0x01060023 /* H */ + 0x01080028 /* ' */ + 0x01090043 /* F9 */ + 0x010b000e /* BKSPACE */ + + 0x0200001d /* L_CTRL */ + 0x0201000f /* TAB */ + 0x0202003d /* F3 */ + 0x02030014 /* T */ + 0x02040040 /* F6 */ + 0x0205001b /* ] */ + 0x02060015 /* Y */ + 0x02070056 /* 102ND */ + 0x0208001a /* [ */ + 0x02090042 /* F8 */ + + 0x03010029 /* GRAVE */ + 0x0302003c /* F2 */ + 0x03030006 /* 5 */ + 0x0304003f /* F5 */ + 0x03060007 /* 6 */ + 0x0308000c /* - */ + 0x030b002b /* \ */ + + 0x04000061 /* R_CTRL */ + 0x0401001e /* A */ + 0x04020020 /* D */ + 0x04030021 /* F */ + 0x0404001f /* S */ + 0x04050025 /* K */ + 0x04060024 /* J */ + 0x04080027 /* ; */ + 0x04090026 /* L */ + 0x040b001c /* ENTER */ + + 0x0501002c /* Z */ + 0x0502002e /* C */ + 0x0503002f /* V */ + 0x0504002d /* X */ + 0x05050033 /* , */ + 0x05060032 /* M */ + 0x0507002a /* L_SHIFT */ + 0x05080035 /* / */ + 0x05090034 /* . */ + 0x050B0039 /* SPACE */ + + 0x06010002 /* 1 */ + 0x06020004 /* 3 */ + 0x06030005 /* 4 */ + 0x06040003 /* 2 */ + 0x06050009 /* 8 */ + 0x06060008 /* 7 */ + 0x0608000b /* 0 */ + 0x0609000a /* 9 */ + 0x060a0038 /* L_ALT */ + 0x060b006c /* DOWN */ + 0x060c006a /* RIGHT */ + + 0x07010010 /* Q */ + 0x07020012 /* E */ + 0x07030013 /* R */ + 0x07040011 /* W */ + 0x07050017 /* I */ + 0x07060016 /* U */ + 0x07070036 /* R_SHIFT */ + 0x07080019 /* P */ + 0x07090018 /* O */ + 0x070b0067 /* UP */ + 0x070c0069>; /* LEFT */ + }; + }; }; i2c@12CB0000 {
Add basic EC information to device tree, currently only describing the keyboard and keymap. Signed-off-by: Olof Johansson <olof@lixom.net> Cc: Doug Anderson <dianders@chromium.org> --- Kukjin, I'll apply this too directly if you don't mind. -Olof arch/arm/boot/dts/cros5250-common.dtsi | 99 +++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-)