From ee85a4152516daf57ce1f05b16e5f06ab4f3cf91 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Sat, 27 Feb 2016 19:19:14 +0100 Subject: [PATCH] kc1: Power off when the power on reason is not a valid one Some power on reasons are not desirable (e.g. too short press on the power button), battery plug. Thus, power off the device when one of those occurs. Signed-off-by: Paul Kocialkowski --- board/amazon/kc1/kc1.c | 16 ++++++++++++++++ include/configs/kc1.h | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/board/amazon/kc1/kc1.c b/board/amazon/kc1/kc1.c index 9367b50da3..54e3fa31a7 100644 --- a/board/amazon/kc1/kc1.c +++ b/board/amazon/kc1/kc1.c @@ -86,6 +86,7 @@ int board_init(void) int misc_init_r(void) { char reboot_mode[2] = { 0 }; + u32 data = 0; u32 value; /* Reboot mode */ @@ -101,10 +102,25 @@ int misc_init_r(void) reboot_mode[0] = 'b'; if (reboot_mode[0] > 0 && isascii(reboot_mode[0])) { + if (reboot_mode[0] == 'o') + twl6030_power_off(); + if (!getenv("reboot-mode")) setenv("reboot-mode", (char *)reboot_mode); omap_reboot_mode_clear(); + } else { + /* + * When not rebooting, valid power on reasons are either the + * power button, charger plug or USB plug. + */ + + data |= twl6030_input_power_button(); + data |= twl6030_input_charger(); + data |= twl6030_input_usb(); + + if (!data) + twl6030_power_off(); } /* Serial number */ diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 04cb320b3e..c2ac148f03 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -104,6 +104,12 @@ #define CONFIG_TWL6030_POWER +/* + * Input + */ + +#define CONFIG_TWL6030_INPUT + /* * Partitions */ -- 2.39.5