aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-rockchip
diff options
context:
space:
mode:
authorAndy Yan <andy.yan@rock-chips.com>2017-10-11 15:01:31 +0800
committerPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>2017-11-21 23:57:24 +0100
commitecb103bf686f78df7fa65aa21346a8b36bd2bc5e (patch)
treeea545c9dc73eeee5b6fdd5ece2920285111e4df3 /arch/arm/mach-rockchip
parentb4d23f76430768c5eef0cc7f3d7fd2e0a420a3e0 (diff)
downloadu-boot-ecb103bf686f78df7fa65aa21346a8b36bd2bc5e.zip
u-boot-ecb103bf686f78df7fa65aa21346a8b36bd2bc5e.tar.gz
u-boot-ecb103bf686f78df7fa65aa21346a8b36bd2bc5e.tar.bz2
rockchip: check download key before bootup
Enter download mode if the download key pressed. Signed-off-by: Andy Yan <andy.yan@rock-chips.com> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> [Converted printfs in boot_mode.c to debug/pr_err:] Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Diffstat (limited to 'arch/arm/mach-rockchip')
-rw-r--r--arch/arm/mach-rockchip/boot_mode.c49
1 files changed, 46 insertions, 3 deletions
diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
index 4652490..942849f 100644
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@@ -5,26 +5,69 @@
*/
#include <common.h>
+#include <adc.h>
#include <asm/io.h>
#include <asm/arch/boot_mode.h>
+void set_back_to_bootrom_dnl_flag(void)
+{
+ writel(BOOT_BROM_DOWNLOAD, CONFIG_ROCKCHIP_BOOT_MODE_REG);
+}
+
+/*
+ * detect download key status by adc, most rockchip
+ * based boards use adc sample the download key status,
+ * but there are also some use gpio. So it's better to
+ * make this a weak function that can be override by
+ * some special boards.
+ */
+#define KEY_DOWN_MIN_VAL 0
+#define KEY_DOWN_MAX_VAL 30
+
+__weak int rockchip_dnl_key_pressed(void)
+{
+ unsigned int val;
+
+ if (adc_channel_single_shot("saradc", 1, &val)) {
+ pr_err("%s: adc_channel_single_shot fail!\n", __func__);
+ return false;
+ }
+
+ if ((val >= KEY_DOWN_MIN_VAL) && (val <= KEY_DOWN_MAX_VAL))
+ return true;
+ else
+ return false;
+}
+
+void rockchip_dnl_mode_check(void)
+{
+ if (rockchip_dnl_key_pressed()) {
+ printf("download key pressed, entering download mode...");
+ set_back_to_bootrom_dnl_flag();
+ do_reset(NULL, 0, 0, NULL);
+ }
+}
+
int setup_boot_mode(void)
{
void *reg = (void *)CONFIG_ROCKCHIP_BOOT_MODE_REG;
int boot_mode = readl(reg);
- debug("boot mode %x.\n", boot_mode);
+ rockchip_dnl_mode_check();
+
+ boot_mode = readl(reg);
+ debug("%s: boot mode 0x%08x\n", __func__, boot_mode);
/* Clear boot mode */
writel(BOOT_NORMAL, reg);
switch (boot_mode) {
case BOOT_FASTBOOT:
- printf("enter fastboot!\n");
+ debug("%s: enter fastboot!\n", __func__);
env_set("preboot", "setenv preboot; fastboot usb0");
break;
case BOOT_UMS:
- printf("enter UMS!\n");
+ debug("%s: enter UMS!\n", __func__);
env_set("preboot", "setenv preboot; ums mmc 0");
break;
}