From b173f38e43d5dda64beffddb1cd0c1bc6c01a252 Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Fri, 21 Feb 2020 16:32:26 +0800 Subject: [PATCH] rockchip: hotkey: add fdt dump Signed-off-by: Joseph Chen Change-Id: I9bb158f13b723decae01069f4324289c599e0e5f --- arch/arm/include/asm/arch-rockchip/hotkey.h | 1 + arch/arm/mach-rockchip/board.c | 2 ++ arch/arm/mach-rockchip/hotkey.c | 5 +++++ 3 files changed, 8 insertions(+) diff --git a/arch/arm/include/asm/arch-rockchip/hotkey.h b/arch/arm/include/asm/arch-rockchip/hotkey.h index 04b405675f..743d093e04 100644 --- a/arch/arm/include/asm/arch-rockchip/hotkey.h +++ b/arch/arm/include/asm/arch-rockchip/hotkey.h @@ -13,6 +13,7 @@ enum hotkey_t { HK_CLI_OS_GO, HK_CMDLINE, HK_FASTBOOT, + HK_FDT, HK_INITCALL, HK_REGULATOR, HK_ROCKUSB_DNL, diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index af9f1ac1b6..6cae92c94c 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -450,6 +450,8 @@ int init_kernel_dtb(void) ufdt_blob = (void *)gd->fdt_blob; gd->fdt_blob = (void *)fdt_addr; + hotkey_run(HK_FDT); + /* * There is a phandle miss match between U-Boot and kernel dtb node, * we fixup it in U-Boot live dt nodes. diff --git a/arch/arm/mach-rockchip/hotkey.c b/arch/arm/mach-rockchip/hotkey.c index fda741e70a..2bed1cc188 100644 --- a/arch/arm/mach-rockchip/hotkey.c +++ b/arch/arm/mach-rockchip/hotkey.c @@ -21,6 +21,7 @@ DECLARE_GLOBAL_DATA_PTR; #define CTRL_P 0x10 /* parameter(cmdline) dump */ #define CTRL_R 0x12 /* regulator initial state dump */ #define CTRL_S 0x13 /* shell(cli) on BOOTM_STATE_OS_GO */ +#define CTRL_T 0x14 /* print fdt */ bool is_hotkey(enum hotkey_t id) { @@ -66,6 +67,10 @@ void hotkey_run(enum hotkey_t id) if (gd->console_evt == CTRL_I) env_update("bootargs", "initcall_debug debug"); break; + case HK_FDT: + if (gd->console_evt == CTRL_T) + run_command("fdt print", 0); + break; #if defined(CONFIG_CONSOLE_DISABLE_CTRLC) && \ defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY <= 0) case HK_CLI_OS_PRE: