[PATCH 1/3] ARM: tegra: Add SPI controller nodes for Tegra124

[PATCH 1/3] ARM: tegra: Add SPI controller nodes for Tegra124

[Thierry Reding]

The SPI controllers on Tegra124 are compatible with those found on the
Tegra114 SoC.

Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/tegra124.dtsi | 90 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index 2014aa4ed659..0a4e5271b5f9 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -314,6 +314,96 @@
 		status = "disabled";
 	};
 
+	spi@7000d400 {
+		compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi";
+		reg = <0x7000d400 0x200>;
+		interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		clocks = <&tegra_car TEGRA124_CLK_SBC1>;
+		clock-names = "spi";
+		resets = <&tegra_car 41>;
+		reset-names = "spi";
+		dmas = <&apbdma 15>, <&apbdma 15>;
+		dma-names = "rx", "tx";
+		status = "disabled";
+	};
+
+	spi@7000d600 {
+		compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi";
+		reg = <0x7000d600 0x200>;
+		interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		clocks = <&tegra_car TEGRA124_CLK_SBC2>;
+		clock-names = "spi";
+		resets = <&tegra_car 44>;
+		reset-names = "spi";
+		dmas = <&apbdma 16>, <&apbdma 16>;
+		dma-names = "rx", "tx";
+		status = "disabled";
+	};
+
+	spi@7000d800 {
+		compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi";
+		reg = <0x7000d800 0x200>;
+		interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		clocks = <&tegra_car TEGRA124_CLK_SBC3>;
+		clock-names = "spi";
+		resets = <&tegra_car 46>;
+		reset-names = "spi";
+		dmas = <&apbdma 17>, <&apbdma 17>;
+		dma-names = "rx", "tx";
+		status = "disabled";
+	};
+
+	spi@7000da00 {
+		compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi";
+		reg = <0x7000da00 0x200>;
+		interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		clocks = <&tegra_car TEGRA124_CLK_SBC4>;
+		clock-names = "spi";
+		resets = <&tegra_car 68>;
+		reset-names = "spi";
+		dmas = <&apbdma 18>, <&apbdma 18>;
+		dma-names = "rx", "tx";
+		status = "disabled";
+	};
+
+	spi@7000dc00 {
+		compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi";
+		reg = <0x7000dc00 0x200>;
+		interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		clocks = <&tegra_car TEGRA124_CLK_SBC5>;
+		clock-names = "spi";
+		resets = <&tegra_car 104>;
+		reset-names = "spi";
+		dmas = <&apbdma 27>, <&apbdma 27>;
+		dma-names = "rx", "tx";
+		status = "disabled";
+	};
+
+	spi@7000de00 {
+		compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi";
+		reg = <0x7000de00 0x200>;
+		interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		clocks = <&tegra_car TEGRA124_CLK_SBC6>;
+		clock-names = "spi";
+		resets = <&tegra_car 105>;
+		reset-names = "spi";
+		dmas = <&apbdma 28>, <&apbdma 28>;
+		dma-names = "rx", "tx";
+		status = "disabled";
+	};
+
 	rtc@7000e000 {
 		compatible = "nvidia,tegra124-rtc", "nvidia,tegra20-rtc";
 		reg = <0x7000e000 0x100>;
-- 
1.8.4.2

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

[Thierry Reding]

Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/tegra124-venice2.dts | 104 +++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)

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>;
-- 
1.8.4.2

[PATCH 3/3] ARM: tegra: Enable ChromeOS embedded controller

[Thierry Reding]

Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/configs/tegra_defconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index f9edd629d402..c1e219eb29e5 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -112,6 +112,7 @@ CONFIG_RT2800USB=m
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_TEGRA=y
+CONFIG_KEYBOARD_CROS_EC=y
 CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ATMEL_MXT=y
@@ -145,6 +146,8 @@ CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_SENSORS_LM90=y
 CONFIG_MFD_AS3722=y
+CONFIG_MFD_CROS_EC=y
+CONFIG_MFD_CROS_EC_SPI=y
 CONFIG_MFD_MAX8907=y
 CONFIG_MFD_PALMAS=y
 CONFIG_MFD_TPS65090=y
-- 
1.8.4.2

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

[Stephen Warren]

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?

Re: [PATCH 1/3] ARM: tegra: Add SPI controller nodes for Tegra124

[Stephen Warren]

On 12/13/2013 09:24 AM, Thierry Reding wrote:
> The SPI controllers on Tegra124 are compatible with those found on the
> Tegra114 SoC.

I have applied patch 1/3 to Tegra's for-3.14/dt branch, and squashed
patch 3/3 into Tegra's for-3.14/defconfig branch.

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

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 545 bytes --]

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]