summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-06-05 14:39:34 -0600
committerTom Warren <twarren@nvidia.com>2015-06-09 09:56:13 -0700
commitb3b9d7ca324429319df1d1f246643d2ae928beb6 (patch)
tree09984252d1ef8d5a26507fe3a7a201e189dc7443
parent635c2515c398241f59c5936213308ce9709fc475 (diff)
dm: tegra: cros_ec: Enable Chrome OS EC on Nyan-big
Enable the EC and keyboard, using the SPI bus. The EC driver requires a particular format and a deactivation delay. Also U-Boot does not support interrupts. For now, adjust the device tree to comply. At some point we should tidy this up to support interrupts and make tegra and exynos use the same setup. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
-rw-r--r--arch/arm/dts/tegra124-nyan-big.dts3
-rw-r--r--configs/nyan-big_defconfig5
-rw-r--r--include/configs/nyan-big.h2
3 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/dts/tegra124-nyan-big.dts b/arch/arm/dts/tegra124-nyan-big.dts
index 5a39e93c68c..8be6adbf07c 100644
--- a/arch/arm/dts/tegra124-nyan-big.dts
+++ b/arch/arm/dts/tegra124-nyan-big.dts
@@ -163,12 +163,15 @@
spi@7000d400 {
status = "okay";
+ spi-deactivate-delay = <200>;
+ spi-max-frequency = <3000000>;
cros_ec: cros-ec@0 {
compatible = "google,cros-ec-spi";
spi-max-frequency = <3000000>;
interrupt-parent = <&gpio>;
interrupts = <TEGRA_GPIO(C, 7) IRQ_TYPE_LEVEL_LOW>;
+ ec-interrupt = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;
reg = <0>;
google,cros-ec-spi-msg-delay = <2000>;
diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index 92acab293bb..81949e89508 100644
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -6,3 +6,8 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big"
CONFIG_CMD_NET=y
CONFIG_DISPLAY_PORT=y
CONFIG_VIDEO_TEGRA124=y
+CONFIG_DM_CROS_EC=y
+CONFIG_CROS_EC=y
+CONFIG_CROS_EC_SPI=y
+CONFIG_CROS_EC_KEYB=y
+CONFIG_CMD_CROS_EC=y
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index a92112f8704..515704f2ed8 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -79,6 +79,8 @@
#define CONFIG_FIT
#define CONFIG_OF_LIBFDT
+#define CONFIG_KEYBOARD
+
#include "tegra-common-usb-gadget.h"
#include "tegra-common-post.h"