From ce6becde2e570847b8a68aca301d40a3f40f9960 Mon Sep 17 00:00:00 2001 From: Shunqian Zheng Date: Wed, 25 Jul 2018 16:58:47 +0800 Subject: [PATCH] config/dts: px3se: Rockusb mode by Vol+ and reset Enalbe ADC keys to enter Rockusb mode by holding Vol Up key and reset. Change-Id: I2f17fccf890424049aff5946f439016ad76ea52d Signed-off-by: Shunqian Zheng --- arch/arm/dts/px3se-evb.dts | 25 +++++++++++++++++++++++++ configs/evb-px3se_defconfig | 8 +++++--- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/px3se-evb.dts b/arch/arm/dts/px3se-evb.dts index b434b922f7..4371b34cd8 100644 --- a/arch/arm/dts/px3se-evb.dts +++ b/arch/arm/dts/px3se-evb.dts @@ -6,6 +6,7 @@ /dts-v1/; +#include #include "rk3128.dtsi" #include "rk3128-u-boot.dtsi" @@ -13,6 +14,26 @@ model = "Rockchip PX3SE Evaluation board"; compatible = "rockchip,px3se-evb", "rockchip,px3se"; + adc-keys { + compatible = "adc-keys"; + io-channels = <&saradc 1>; + io-channel-names = "buttons"; + poll-interval = <100>; + keyup-threshold-microvolt = <1800000>; + + vol-up { + label = "Volume Up"; + linux,code = ; + press-threshold-microvolt = <18000>; + }; + + vol-down { + label = "Volume Down"; + linux,code = ; + press-threshold-microvolt = <300000>; + }; + }; + chosen { stdout-path = &uart1; }; @@ -33,6 +54,10 @@ status = "okay"; }; +&saradc { + status = "okay"; +}; + &u2phy { status = "okay"; }; diff --git a/configs/evb-px3se_defconfig b/configs/evb-px3se_defconfig index a36e775541..c2e524e939 100644 --- a/configs/evb-px3se_defconfig +++ b/configs/evb-px3se_defconfig @@ -2,18 +2,18 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_ROCKCHIP_RK3128=y CONFIG_RKIMG_BOOTLOADER=y -CONFIG_ANDROID_BOOTLOADER=y -CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_DEFAULT_DEVICE_TREE="px3se-evb" CONFIG_DEBUG_UART=y +CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_FIT=y # CONFIG_DISPLAY_CPUINFO is not set +CONFIG_ANDROID_BOOTLOADER=y # CONFIG_FASTBOOT is not set # CONFIG_CMD_IMLS is not set CONFIG_CMD_GPT=y CONFIG_CMD_LOAD_ANDROID=y -CONFIG_CMD_BOOT_ROCKCHIP=y CONFIG_CMD_BOOT_ANDROID=y +CONFIG_CMD_BOOT_ROCKCHIP=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y @@ -25,6 +25,8 @@ CONFIG_SYSCON=y CONFIG_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_DM_KEY=y +CONFIG_ADC_KEY=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PHY=y