summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2015-07-20 15:17:18 +0200
committerTom Rini <trini@konsulko.com>2015-08-12 20:47:40 -0400
commit5c2cff85fc960f78546a6af2d9315849fab5e963 (patch)
tree3dc17aedda6226e4829832884f7fa97b9fc8bf07 /board
parent0e14f88957459aec113b75032ff9364c81dab864 (diff)
downloadblackbird-obmc-uboot-5c2cff85fc960f78546a6af2d9315849fab5e963.tar.gz
blackbird-obmc-uboot-5c2cff85fc960f78546a6af2d9315849fab5e963.zip
sniper: Keypad support, with recovery and fastboot key combinations
Using the twl4030 keypad allows booting directly into some special boot modes, such as recovery or fastboot. the VOL+ key will trigger a boot to recovery while the VOL- key will trigger a boot to fastboot. The G (gesture) key remains unused at this point. Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board')
-rw-r--r--board/lge/sniper/sniper.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/board/lge/sniper/sniper.c b/board/lge/sniper/sniper.c
index c94a3fa427..a43f640ecf 100644
--- a/board/lge/sniper/sniper.c
+++ b/board/lge/sniper/sniper.c
@@ -91,18 +91,34 @@ int board_init(void)
int misc_init_r(void)
{
+ unsigned char keypad_matrix[64] = { 0 };
char serial_string[17] = { 0 };
char reboot_mode[2] = { 0 };
u32 dieid[4] = { 0 };
+ unsigned char keys[3];
unsigned char data = 0;
/* Power button reset init */
twl4030_power_reset_init();
+ /* Keypad */
+
+ twl4030_keypad_scan((unsigned char *)&keypad_matrix);
+
+ keys[0] = twl4030_keypad_key((unsigned char *)&keypad_matrix, 0, 0);
+ keys[1] = twl4030_keypad_key((unsigned char *)&keypad_matrix, 0, 1);
+ keys[2] = twl4030_keypad_key((unsigned char *)&keypad_matrix, 0, 2);
+
/* Reboot mode */
reboot_mode[0] = omap_reboot_mode();
+
+ if (keys[0])
+ reboot_mode[0] = 'r';
+ else if (keys[1])
+ reboot_mode[0] = 'b';
+
if (reboot_mode[0] > 0 && isascii(reboot_mode[0])) {
if (!getenv("reboot-mode"))
setenv("reboot-mode", (char *)reboot_mode);
OpenPOWER on IntegriCloud