[PATCH] Change keyboard input from CrOS EC keyboard to a USB keyboard

[Michael Nazzareno Trimarchi]

Hi

On Mon, Mar 2, 2020 at 8:58 AM Peter Robinson <pbrobinson at gmail.com> wrote:
>
> These boards aren't ChromeOS devices so won't have a cros-ec-keyb
> input as it's the keyboard available via the ChromeOS Embedded
> Controller. Update them to use a USB keyboard which would actually
> be available. Also enable the usb keyboard option for those devices
> that don't have it enabled already.
>
> Signed-off-by: Peter Robinson <pbrobinson at gmail.com>
> ---
>  configs/miqi-rk3288_defconfig     | 1 +
>  configs/roc-pc-rk3399_defconfig   | 1 +
>  configs/rock2_defconfig           | 1 +
>  configs/tinker-rk3288_defconfig   | 1 +
>  configs/tinker-s-rk3288_defconfig | 1 +
>  include/configs/miqi_rk3288.h     | 2 +-
>  include/configs/roc-pc-rk3399.h   | 2 +-
>  include/configs/rock2.h           | 2 +-
>  include/configs/tinker_rk3288.h   | 2 +-
>  include/configs/vyasa-rk3288.h    | 2 +-
>  10 files changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig
> index edba9da31b..e3e205fd54 100644
> --- a/configs/miqi-rk3288_defconfig
> +++ b/configs/miqi-rk3288_defconfig
> @@ -75,6 +75,7 @@ CONFIG_USB_GADGET_DWC2_OTG=y
>  CONFIG_USB_HOST_ETHER=y
>  CONFIG_USB_ETHER_ASIX=y
>  CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
>  CONFIG_DM_VIDEO=y
>  # CONFIG_VIDEO_BPP8 is not set
>  CONFIG_DISPLAY=y
> diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig
> index 9ae9b35aae..c28089eaa5 100644
> --- a/configs/roc-pc-rk3399_defconfig
> +++ b/configs/roc-pc-rk3399_defconfig
> @@ -55,6 +55,7 @@ CONFIG_USB_ETHER_ASIX88179=y
>  CONFIG_USB_ETHER_MCS7830=y
>  CONFIG_USB_ETHER_RTL8152=y
>  CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
>  CONFIG_SPL_TINY_MEMSET=y
>  CONFIG_ERRNO_STR=y
>  CONFIG_TPL_GPIO_SUPPORT=y
> diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
> index bb12b32a21..cf71c85927 100644
> --- a/configs/rock2_defconfig
> +++ b/configs/rock2_defconfig
> @@ -74,6 +74,7 @@ CONFIG_USB_DWC2=y
>  CONFIG_ROCKCHIP_USB2_PHY=y
>  CONFIG_USB_GADGET=y
>  CONFIG_USB_GADGET_DWC2_OTG=y
> +CONFIG_USB_KEYBOARD=y
>  CONFIG_DM_VIDEO=y
>  # CONFIG_VIDEO_BPP8 is not set
>  CONFIG_DISPLAY=y
> diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
> index be636c05ea..d00f8b87cc 100644
> --- a/configs/tinker-rk3288_defconfig
> +++ b/configs/tinker-rk3288_defconfig
> @@ -83,6 +83,7 @@ CONFIG_USB_ETHER_ASIX=y
>  CONFIG_USB_ETHER_SMSC95XX=y
>  CONFIG_CMD_DHRYSTONE=y
>  CONFIG_ERRNO_STR=y
> +CONFIG_USB_KEYBOARD=y
>  CONFIG_DM_VIDEO=y
>  CONFIG_VIDEO_BPP16=y
>  CONFIG_VIDEO_BPP32=y

Reviewed-by: Michael Trimarchi <michael at amarulasolutions.com>

Michael

> diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig
> index ab192cf4e4..06c5d9b507 100644
> --- a/configs/tinker-s-rk3288_defconfig
> +++ b/configs/tinker-s-rk3288_defconfig
> @@ -80,6 +80,7 @@ CONFIG_USB_GADGET_DWC2_OTG=y
>  CONFIG_USB_HOST_ETHER=y
>  CONFIG_USB_ETHER_ASIX=y
>  CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_KEYBOARD=y
>  CONFIG_DM_VIDEO=y
>  # CONFIG_VIDEO_BPP8 is not set
>  CONFIG_DISPLAY=y
> diff --git a/include/configs/miqi_rk3288.h b/include/configs/miqi_rk3288.h
> index c9691a0392..e19fa90212 100644
> --- a/include/configs/miqi_rk3288.h
> +++ b/include/configs/miqi_rk3288.h
> @@ -7,7 +7,7 @@
>  #define __CONFIG_H
>
>  #define ROCKCHIP_DEVICE_SETTINGS \
> -               "stdin=serial,cros-ec-keyb\0" \
> +               "stdin=serial,usbkbd\0" \
>                 "stdout=serial,vidconsole\0" \
>                 "stderr=serial,vidconsole\0"
>
> diff --git a/include/configs/roc-pc-rk3399.h b/include/configs/roc-pc-rk3399.h
> index 3fd1062542..d4cbc3532e 100644
> --- a/include/configs/roc-pc-rk3399.h
> +++ b/include/configs/roc-pc-rk3399.h
> @@ -7,7 +7,7 @@
>  #define __ROC_PC_RK3399_H
>
>  #define ROCKCHIP_DEVICE_SETTINGS \
> -               "stdin=serial,cros-ec-keyb\0" \
> +               "stdin=serial,usbkbd\0" \
>                 "stdout=serial,vidconsole\0" \
>                 "stderr=serial,vidconsole\0"
>
> diff --git a/include/configs/rock2.h b/include/configs/rock2.h
> index 917caf4d53..9e4a66902b 100644
> --- a/include/configs/rock2.h
> +++ b/include/configs/rock2.h
> @@ -7,7 +7,7 @@
>  #define __CONFIG_H
>
>  #define ROCKCHIP_DEVICE_SETTINGS \
> -               "stdin=serial,cros-ec-keyb\0" \
> +               "stdin=serial,usbkbd\0" \
>                 "stdout=serial,vidconsole\0" \
>                 "stderr=serial,vidconsole\0"
>
> diff --git a/include/configs/tinker_rk3288.h b/include/configs/tinker_rk3288.h
> index f1095ccd0e..d239e3beb1 100644
> --- a/include/configs/tinker_rk3288.h
> +++ b/include/configs/tinker_rk3288.h
> @@ -7,7 +7,7 @@
>  #define __CONFIG_H
>
>  #define ROCKCHIP_DEVICE_SETTINGS \
> -               "stdin=serial,cros-ec-keyb\0" \
> +               "stdin=serial,usbkbd\0" \
>                 "stdout=serial,vidconsole\0" \
>                 "stderr=serial,vidconsole\0"
>
> diff --git a/include/configs/vyasa-rk3288.h b/include/configs/vyasa-rk3288.h
> index e31dc77720..c3521cac41 100644
> --- a/include/configs/vyasa-rk3288.h
> +++ b/include/configs/vyasa-rk3288.h
> @@ -9,7 +9,7 @@
>  #define __CONFIG_H
>
>  #define ROCKCHIP_DEVICE_SETTINGS \
> -               "stdin=serial,cros-ec-keyb\0" \
> +               "stdin=serial,usbkbd\0" \
>                 "stdout=serial,vidconsole\0" \
>                 "stderr=serial,vidconsole\0"
>
> --
> 2.24.1
>


-- 
| Michael Nazzareno Trimarchi                     Amarula Solutions BV |
| COO  -  Founder                                      Cruquiuskade 47 |
| +31(0)851119172                                 Amsterdam 1018 AM NL |
|                  [`as] http://www.amarulasolutions.com               |