rockchip: boot_mode: find the saradc device name

adc_channel_single_shot() requires the full device name e.g.
"saradc@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 <sigmaris@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
index 08f80bd91aae0bb39d6588acea312bc9f3349f6a..7598fe4c43d40d8d5f70e5b0ffba58df28df0cea 100644 (file)
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@@ -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;
        }