Hi, Shawn Guo writes: > On Thu, Sep 19, 2013 at 08:59:50AM +0200, Lothar Waßmann wrote: > > Update the Ka-Ro TX28 DTS file. > > > > - add Copyright header > > - use label references for better readability > > - sort the entries alphabetically > > - add some aliases used by U-Boot to modify the DT data > > > > This patch requires the patch "ARM: dts: mxs: add pinctrl header files" > > to be applied. > > The dependency of applying should generally go below '---', so that it > does not appear in the final commit log. > OK. > > > > Signed-off-by: Lothar Waßmann <LW@xxxxxxxxxxxxxxxxxxx> > > --- > > arch/arm/boot/dts/imx28-tx28.dts | 720 +++++++++++++++++++++++++++++++++----- > > 1 files changed, 637 insertions(+), 83 deletions(-) > > > > diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts > > index 37be532..b7c79fb 100644 > > --- a/arch/arm/boot/dts/imx28-tx28.dts > > +++ b/arch/arm/boot/dts/imx28-tx28.dts > > @@ -1,106 +1,139 @@ > > +/* > > + * Copyright 2012 Shawn Guo <shawn.guo@xxxxxxxxxx> > > + * Copyright 2013 Lothar Waßmann <LW@xxxxxxxxxxxxxxxxxxx> > > + * > > + * The code contained herein is licensed under the GNU General Public > > + * License. You may obtain a copy of the GNU General Public License > > + * Version 2 at the following locations: > > + * > > + * http://www.opensource.org/licenses/gpl-license.html > > + * http://www.gnu.org/copyleft/gpl.html > > + */ > > + > > /dts-v1/; > > -/include/ "imx28.dtsi" > > +#include "imx28.dtsi" > > The change should belong to patch "ARM: dts: mxs: modify mx23/mx28 dts > files to use pinctrl headers". Otherwise, build of imx28-tx28.dtb will > break right there. > > I have fixed it when apply that patch. You may want to rebase this > patch on my imx/dt branch with this change dropped. > Thanks, I'll resend the patch soon. > > + /* sample keymap */ > > + linux,keymap = < > > + 0x00000074 /* row 0, col 0, KEY_POWER */ > > + 0x00010052 /* row 0, col 1, KEY_KP0 */ > > + 0x0002004f /* row 0, col 2, KEY_KP1 */ > > + 0x00030050 /* row 0, col 3, KEY_KP2 */ > > + 0x01000051 /* row 1, col 0, KEY_KP3 */ > > + 0x0101004b /* row 1, col 1, KEY_KP4 */ > > + 0x0102004c /* row 1, col 2, KEY_KP5 */ > > + 0x0103004d /* row 1, col 3, KEY_KP6 */ > > + 0x02000047 /* row 2, col 0, KEY_KP7 */ > > + 0x02010048 /* row 2, col 1, KEY_KP8 */ > > + 0x02020049 /* row 2, col 2, KEY_KP9 */ > > + >; > > Can the macros in include/dt-bindings/input/input.h help here? > Not really. They only specify keycodes while I need the keycode OR'ed with the row/col numbers here. All other DTS files using linux,keymap also specify the hex codes directly. Lothar Waßmann -- ___________________________________________________________ Ka-Ro electronics GmbH | Pascalstraße 22 | D - 52076 Aachen Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10 Geschäftsführer: Matthias Kaussen Handelsregistereintrag: Amtsgericht Aachen, HRB 4996 www.karo-electronics.de | info@xxxxxxxxxxxxxxxxxxx ___________________________________________________________ -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
