diff options
| author | Simon Glass <sjg@chromium.org> | 2016-01-21 19:44:13 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-01-21 20:42:36 -0700 |
| commit | 27a1961d0b527b24e7f76230d94df617004b1534 (patch) | |
| tree | aa565344419fc5f81dbe78988db9628deafeaaeb | |
| parent | 90a28470fc11c86c64b8f413d23a5c8fcff45a04 (diff) | |
| download | blackbird-obmc-uboot-27a1961d0b527b24e7f76230d94df617004b1534.tar.gz blackbird-obmc-uboot-27a1961d0b527b24e7f76230d94df617004b1534.zip | |
rockchip: jerry: Enable the Chrome OS EC
Turn on the EC and enable the keyboard.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/arm/dts/rk3288-veyron-chromebook.dtsi | 4 | ||||
| -rw-r--r-- | configs/chromebook_jerry_defconfig | 8 | ||||
| -rw-r--r-- | include/configs/chromebook_jerry.h | 7 | ||||
| -rw-r--r-- | include/configs/firefly-rk3288.h | 2 | ||||
| -rw-r--r-- | include/configs/rk3288_common.h | 7 |
5 files changed, 28 insertions, 0 deletions
diff --git a/arch/arm/dts/rk3288-veyron-chromebook.dtsi b/arch/arm/dts/rk3288-veyron-chromebook.dtsi index 6d619c93bb..bbbc2f408d 100644 --- a/arch/arm/dts/rk3288-veyron-chromebook.dtsi +++ b/arch/arm/dts/rk3288-veyron-chromebook.dtsi @@ -91,12 +91,16 @@ &spi0 { status = "okay"; + spi-activate-delay = <100>; + spi-max-frequency = <3000000>; + spi-deactivate-delay = <200>; cros_ec: ec@0 { compatible = "google,cros-ec-spi"; spi-max-frequency = <3000000>; interrupt-parent = <&gpio7>; interrupts = <7 IRQ_TYPE_LEVEL_LOW>; + ec-interrupt = <&gpio7 7 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&ec_int>; reg = <0>; diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index ceec6f544b..b2672b868d 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ROCKCHIP_RK3288=y CONFIG_TARGET_CHROMEBOOK_JERRY=y CONFIG_SPL_STACK_R_ADDR=0x80000 +CONFIG_DM_KEYBOARD=y CONFIG_DEFAULT_DEVICE_TREE="rk3288-jerry" CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 @@ -21,7 +22,13 @@ CONFIG_SPL_SYSCON=y CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y +CONFIG_I2C_CROS_EC_TUNNEL=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_I2C_MUX=y +CONFIG_CROS_EC_KEYB=y +CONFIG_CMD_CROS_EC=y +CONFIG_CROS_EC=y +CONFIG_CROS_EC_SPI=y CONFIG_PWRSEQ=y CONFIG_RESET=y CONFIG_DM_MMC=y @@ -31,6 +38,7 @@ CONFIG_SPL_PINCTRL=y # CONFIG_SPL_PINCTRL_FULL is not set CONFIG_ROCKCHIP_PINCTRL=y CONFIG_DM_PMIC=y +# CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_RK808=y CONFIG_DM_REGULATOR=y CONFIG_REGULATOR_RK808=y diff --git a/include/configs/chromebook_jerry.h b/include/configs/chromebook_jerry.h index 78c06afd16..6e32f2ccad 100644 --- a/include/configs/chromebook_jerry.h +++ b/include/configs/chromebook_jerry.h @@ -7,6 +7,11 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define ROCKCHIP_DEVICE_SETTINGS \ + "stdin=serial,cros-ec-keyb\0" \ + "stdout=serial\0" \ + "stderr=serial\0" + #include <configs/rk3288_common.h> #define CONFIG_ENV_IS_NOWHERE @@ -17,4 +22,6 @@ #undef CONFIG_SPL_GPIO_SUPPORT +#define CONFIG_KEYBOARD + #endif diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h index 4c5c4ddefd..8ac6521050 100644 --- a/include/configs/firefly-rk3288.h +++ b/include/configs/firefly-rk3288.h @@ -7,6 +7,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define ROCKCHIP_DEVICE_SETTINGS + #include <configs/rk3288_common.h> #define CONFIG_SPL_MMC_SUPPORT diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index f47573b25c..ebddfb0267 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -42,6 +42,12 @@ #define CONFIG_ROCKCHIP_COMMON #define CONFIG_SPL_ROCKCHIP_COMMON +#define CONFIG_SILENT_CONSOLE +#ifndef CONFIG_SPL_BUILD +# define CONFIG_SYS_CONSOLE_IS_IN_ENV +# define CONFIG_CONSOLE_MUX +#endif + /* MMC/SD IP block */ #define CONFIG_MMC #define CONFIG_GENERIC_MMC @@ -110,6 +116,7 @@ "fdt_high=0x1fffffff\0" \ "initrd_high=0x1fffffff\0" \ ENV_MEM_LAYOUT_SETTINGS \ + ROCKCHIP_DEVICE_SETTINGS \ BOOTENV #endif |
