From 6c8818cd725efe738184f87fe067d0066d116db0 Mon Sep 17 00:00:00 2001 From: zouxf Date: Sat, 10 Mar 2018 14:12:29 +0800 Subject: [PATCH] add recovery button Change-Id: If4a7bb9bfdadea8d09c47b6aded2ef6a75302f1b --- arch/arm/dts/rk3328-roc-cc.dts | 5 +++++ arch/arm/mach-rockchip/Kconfig | 1 + arch/arm/mach-rockchip/boot_mode.c | 2 +- arch/arm/mach-rockchip/rk3328/Kconfig | 1 + arch/arm/mach-rockchip/rk3328/rk3328.c | 8 ++++++++ 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/rk3328-roc-cc.dts b/arch/arm/dts/rk3328-roc-cc.dts index 4f3c2cf935..eab84c7769 100644 --- a/arch/arm/dts/rk3328-roc-cc.dts +++ b/arch/arm/dts/rk3328-roc-cc.dts @@ -42,6 +42,11 @@ regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; }; + + adc-keys { + compatible = "adc-keys"; + io-channels = <&saradc 0>; + }; }; &saradc { diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c index d0dbff3bb8..7a997c0516 100644 --- a/arch/arm/mach-rockchip/boot_mode.c +++ b/arch/arm/mach-rockchip/boot_mode.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: GPL-2.0+ */ +#define DEBUG #include #include #include @@ -72,7 +73,6 @@ int setup_boot_mode(void) char env_preboot[256] = {0}; rockchip_dnl_mode_check(); - reg = (void *)CONFIG_ROCKCHIP_BOOT_MODE_REG; boot_mode = readl(reg); diff --git a/arch/arm/mach-rockchip/rk3328/Kconfig b/arch/arm/mach-rockchip/rk3328/Kconfig index 0faf50085f..3dfe6c402e 100644 --- a/arch/arm/mach-rockchip/rk3328/Kconfig +++ b/arch/arm/mach-rockchip/rk3328/Kconfig @@ -12,6 +12,7 @@ config TARGET_EVB_RK3328 config TARGET_ROC_RK3328_CC bool "ROC-RK3328-CC board, " + select BOARD_LATE_INIT help ROC-RK3328-CC is a Raspberry Pi-2 sized 4K60P HDR Media Board Computer powered by Rockchip RK3328 Quad-Core ARM Cortex A53 64-Bit Processor