diff mbox

[2/3] ARM: tegra: Enable Venice2 keyboard

Message ID 1386951847-6490-2-git-send-email-treding@nvidia.com
State Superseded, archived
Headers show

Commit Message

Thierry Reding Dec. 13, 2013, 4:24 p.m. UTC 
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 arch/arm/boot/dts/tegra124-venice2.dts | 104 +++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)

Comments

Stephen Warren Dec. 13, 2013, 5:03 p.m. UTC | #1 
On 12/13/2013 09:24 AM, Thierry Reding wrote:

> diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts

> +				linux,keymap = <0x0001007d	/* L_META */
> +						0x0002003b	/* F1 */

I don't suppose you could rework these using the MATRIX_KEY() macro, and
associated header file that provides named keycode constants?
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Thierry Reding Dec. 13, 2013, 7:57 p.m. UTC | #2 
On Fri, Dec 13, 2013 at 10:03:39AM -0700, Stephen Warren wrote:
> On 12/13/2013 09:24 AM, Thierry Reding wrote:
> 
> > diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
> 
> > +				linux,keymap = <0x0001007d	/* L_META */
> > +						0x0002003b	/* F1 */
> 
> I don't suppose you could rework these using the MATRIX_KEY() macro, and
> associated header file that provides named keycode constants?

Yes of course. I totally forgot that we have a header with symbolic
constants now.

Thierry
diff mbox

Patch

diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index 8e2bac2068bc..f6d1f95b6223 100644
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -586,6 +586,110 @@ 
 		};
 	};
 
+	spi@7000d400 {
+		status = "okay";
+
+		cros-ec@0 {
+			compatible = "google,cros-ec-spi";
+			spi-max-frequency = <4000000>;
+			interrupt-parent = <&gpio>;
+			interrupts = <TEGRA_GPIO(C, 7) IRQ_TYPE_LEVEL_LOW>;
+			reg = <0>;
+
+			google,cros-ec-spi-msg-delay = <2000>;
+
+			cros-ec-keyb {
+				compatible = "google,cros-ec-keyb";
+				keypad,num-rows = <8>;
+				keypad,num-columns = <13>;
+				google,needs-ghost-filter;
+
+				linux,keymap = <0x0001007d	/* L_META */
+						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 */
+						0x040a002b	/* \ */
+						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 */
+			};
+		};
+	};
+
 	pmc@7000e400 {
 		nvidia,invert-interrupt;
 		nvidia,suspend-mode = <1>;