From patchwork Sat Jan 25 16:19:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugh Cole-Baker X-Patchwork-Id: 1229246 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=bCLkJxAE; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 484h7646z4z9sPn for ; Sun, 26 Jan 2020 03:19:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BB92E8019A; Sat, 25 Jan 2020 17:19:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bCLkJxAE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D1EDE801E4; Sat, 25 Jan 2020 17:19:49 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 271E580199 for ; Sat, 25 Jan 2020 17:19:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sigmaris@gmail.com Received: by mail-wr1-x444.google.com with SMTP id j42so5683214wrj.12 for ; Sat, 25 Jan 2020 08:19:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=u/oOrc1HVCTGD9brYvJKZCWdsbf/9xHP64rF7DyuZ94=; b=bCLkJxAEQA5FNtaDnkh7DLOf77fhC63UxirOOWs7Z0XVtrRUTR1ZnmkiXtuIvY8gAR LaqoDpOQLaD/GALmf3m0MLuNbT08Ri+PiPcP2BAxBWXMMQ+4i/WAULs6rvrRavmaXK8u y6Ajc/kDh84BAEdemqrXF12y2NstmCjr52JMgfw7E5bu7jzk9GA8vVVnF6ouXbkbGoWY iamHWIkWVVle31nc/8NMBOq0LAO7z2hnyzIylNdO/zrpvZV1Mj8XvdWE4E4GAarXMJB5 leq0qF119mFzXZtPgGQOXFvw7pF97IDKba2OACTPNzZbJ0HisNTT+sO5WlQK1MxhdXvf 4ZqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=u/oOrc1HVCTGD9brYvJKZCWdsbf/9xHP64rF7DyuZ94=; b=dmKMzMdNGZbrXcCkDLSJZ2g8bWSJVv2zXDNl2jotB3wLtgX/IqGuPytnpn2uycrMoD asDZ5t1KFma6Znr5aFIgG2yqL841OMdrRGe5HH16PEeCof7taroxq2YMz08DgfjxkmQL eIxZ2T0k/vA6LYl/wR9Cw5WxHBLn94LPESzDfYjxfnK2gmILdDCT7XMKFqNeqtaCzfHp X0XboSkgbHm8iPPh6URmkTDuhnLp0HgpT1K6o11AezEsAz017WOwxKt3iEpoWqw6mA8D RS90DC9tF9QwzIC534bVKsffVIGgThhJrvKsLu/u4xLinSp9B3qyLc31UWZZxUvoPJs1 IUZQ== X-Gm-Message-State: APjAAAWcF3nzHXq7Ebjvqs1TSpmh/7OG5XKZfkDNUfsEjuQqS/hfvUSw B67Q/py+4+SiunGKO7VNuxg= X-Google-Smtp-Source: APXvYqwK0swz0QY7ZFRTjB2Fb7cKniqxs5cLYAnCUc6ESlj85t9Kl3BhN9kTL+mgGLV0MQIwQPM+LA== X-Received: by 2002:adf:f1c6:: with SMTP id z6mr10489172wro.279.1579969186347; Sat, 25 Jan 2020 08:19:46 -0800 (PST) Received: from apple.sigmaris.info (ebrouter.sigmaris.info. [82.69.107.165]) by smtp.gmail.com with ESMTPSA id t12sm11702058wrs.96.2020.01.25.08.19.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 25 Jan 2020 08:19:45 -0800 (PST) From: Hugh Cole-Baker To: Simon Glass , Philipp Tomsich , Kever Yang , u-boot@lists.denx.de Subject: [PATCH] rockchip: boot_mode: find the saradc device name Date: Sat, 25 Jan 2020 16:19:36 +0000 Message-Id: <20200125161936.53550-1-sigmaris@gmail.com> X-Mailer: git-send-email 2.17.2 (Apple Git-113) X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean 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 Reviewed-by: Kever Yang --- I previously sent this on Jan. 11 as an RFC patch, since there were no comments on it previously I guess it can just be submitted as a patch as-is. arch/arm/mach-rockchip/boot_mode.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c index 08f80bd91a..7598fe4c43 100644 --- a/arch/arm/mach-rockchip/boot_mode.c +++ b/arch/arm/mach-rockchip/boot_mode.c @@ -7,6 +7,8 @@ #include #include #include +#include +#include #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; }