diff options
| author | Tom Rini <[email protected]> | 2022-03-18 16:37:39 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-03-18 16:37:39 -0400 |
| commit | 9776c4e9d00ac49d6388ffe9e084ff03b37ae479 (patch) | |
| tree | 1caed0c41ab5ba2c4a1772f4a5534d20ca7af579 /include | |
| parent | e7fb67df319cec410c20906bbf33936a6f7479b2 (diff) | |
| parent | 861682b596b81f988d522edd4c1c76341de112a2 (diff) | |
Merge tag 'u-boot-rockchip-20220318' of https://source.denx.de/u-boot/custodians/u-boot-rockchip
- Fix for chromebook gru and bob board;
- some fix on driver like dram and saradc;
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/gru.h | 3 | ||||
| -rw-r--r-- | include/dt-bindings/input/linux-event-codes.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/configs/gru.h b/include/configs/gru.h index be2dc79968c..b1084bb21d4 100644 --- a/include/configs/gru.h +++ b/include/configs/gru.h @@ -13,4 +13,7 @@ #include <configs/rk3399_common.h> +#define CONFIG_USB_OHCI_NEW +#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 + #endif diff --git a/include/dt-bindings/input/linux-event-codes.h b/include/dt-bindings/input/linux-event-codes.h index 87cf351bab0..331458c0e71 100644 --- a/include/dt-bindings/input/linux-event-codes.h +++ b/include/dt-bindings/input/linux-event-codes.h @@ -749,7 +749,8 @@ #define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */ #define SW_LINEIN_INSERT 0x0d /* set = inserted */ #define SW_MUTE_DEVICE 0x0e /* set = device disabled */ -#define SW_MAX 0x0f +#define SW_PEN_INSERTED 0x0f /* set = pen inserted */ +#define SW_MAX 0x10 #define SW_CNT (SW_MAX+1) /* |