rockchip: boot_mode: find the saradc device name
Subsystems (3)
RFC PATCH 1/1 rockchip: boot_mode: find the saradc device name
adc_channel_single_shot() requires the full device name e.g. "saradc at ff100000", which differs between Rockchip SoC's, but they all share the prefix "saradc"; find the ADC device with this name prefix and use its full name.
Signed-off-by Hugh Cole-Baker <[email protected]>
---
I'd noticed a "rockchip_dnl_key_pressed: adc_channel_single_shot fail!" message every time I booted up my RockPro64 board and wrote this to fix it; I could think of a few different ways to indicate the correct device to use, e.g. an alias in the u-boot dts for each SoC pointing to the saradc device. But this seemed like a straightforward approach that matches the original intention of this code.
arch/arm/mach-rockchip/boot_mode.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
arch/arm/mach-rockchip/boot_mode.c +21 -1
@@ -7,6 +7,8 @@#include <adc.h> #include <asm/io.h> #include <asm/arch-rockchip/boot_mode.h> +#include <dm/device.h> +#include <dm/uclass.h> #if (CONFIG_ROCKCHIP_BOOT_MODE_REG ==0 )
@@ -35,8 +37,26 @@ void set_back_to_bootrom_dnl_flag(void)__weak int rockchip_dnl_key_pressed (void ) {unsigned int val; +struct udevice *dev; +struct uclass *uc; +int ret; -if (adc_channel_single_shot ("saradc" ,1 , &val)) { + ret =uclass_get (UCLASS_ADC , &uc); +if (ret) +return false; + + ret = -ENODEV ; + uclass_foreach_dev(dev, uc) { +if (!strncmp (dev->name,"saradc" ,6 )) { + ret =adc_channel_single_shot (dev->name,1 , &val); +break ; + } + } + +if (ret == -ENODEV ) { +pr_warn ("%s: no saradc device found\n" , __func__); +return false; + }else if (ret) {pr_err ("%s: adc_channel_single_shot fail!\n" , __func__);return false; }
Signature · 1 line
2.17.2 (Apple Git-113)