From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 42CBFC433EF for ; Sun, 8 May 2022 15:10:50 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8227B83F60; Sun, 8 May 2022 17:09:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (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=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qCQFG3XX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B2E9483F52; Sun, 8 May 2022 17:08:51 +0200 (CEST) Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) (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 95AF883F06 for ; Sun, 8 May 2022 17:08:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jbx6244@gmail.com Received: by mail-ej1-x635.google.com with SMTP id i19so22473159eja.11 for ; Sun, 08 May 2022 08:08:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CXQvwHghNvCMEex6wJyQ+7IQp9ricpqADRCtrfyBUf4=; b=qCQFG3XX5y3EbvlDhoRLM1DTHxGrEl4o16aIosXkyRsOW6jSUtnjuH+G1LBrgrv5qH +BGGmmmVuUibUek1DKeONawDwLELozEPp/yBsHSZYU+jHoWMdy/SGf7iPMy3M1I/i4Ks Sc+Strqv9vLZdrfrGtz+mREuklhhk1wntXRJ2veNYzJ5BXQEcDLRPDbeB2KtcD5AF43Z scoU8WTcvxr0/L2dhy6p5h/mQdS6GNU6jOUE5JuK6NsoEv+/HpeNJU8WjydA5Zs5rI0k 1Eh78G3vUkw7b3exGK+IVC1x0M17djTVSnRfRDIgkjy1y/jZqqwTYQNT7wl9EsmgURcu RO3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CXQvwHghNvCMEex6wJyQ+7IQp9ricpqADRCtrfyBUf4=; b=0QdsBUfQkbOh3yOEp5SEQHV3xJZ4SLo6Lzo5Os1C6TJRZOCC7SCJIaabQQ+rAwebdC 96ATRpNQEBjvgtiZWjZl9KGgfTASkUlUQxEnXovsa8wekm8akHgxGHi0L6zBSSL3K0/D 8kosBpraD1n9SF1y/vuVKLwdFnkVbs11uyRsMFQ2u+SCvo/vBEFcy+37piscFJdHh76W 0KuqtsiJ8u3RTCyknBsdBV+o9NJOjBRefiXrUb7otFoxQB8jPflnRLxdE2NcNLoxLnDd 3sxfIWK+DV+8zx/oNr35j+62UlHm+vEtxyU0at4+81CvpEONW5jO4s4bDjVsmQ8zDygQ a95Q== X-Gm-Message-State: AOAM533dTlq7U8vCISQeIsyCtv6hu2ykoPlw4JcmrOz8EFvtZD9unlBv MPB33TrM8OoTG/LzJmLjbyU= X-Google-Smtp-Source: ABdhPJyunMSOI/DaGHG5VktPD714ZnFV43SMADsI1/P/PKDSg+bvVNrSjRNFaSs58NyuKHqQzGFGTg== X-Received: by 2002:a17:907:3f26:b0:6f4:dc59:3cfe with SMTP id hq38-20020a1709073f2600b006f4dc593cfemr11154449ejc.528.1652022518157; Sun, 08 May 2022 08:08:38 -0700 (PDT) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id yl26-20020a17090693fa00b006f3ef214dc2sm4102721ejb.40.2022.05.08.08.08.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 May 2022 08:08:37 -0700 (PDT) From: Johan Jonker To: kever.yang@rock-chips.com Cc: sjg@chromium.org, philipp.tomsich@vrull.eu, lukma@denx.de, marex@denx.de, u-boot@lists.denx.de Subject: [PATCH v1 08/17] rockchip: adc: enable spl compile class driver Date: Sun, 8 May 2022 17:08:16 +0200 Message-Id: <20220508150825.21711-9-jbx6244@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220508150825.21711-1-jbx6244@gmail.com> References: <20220508150825.21711-1-jbx6244@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.5 at phobos.denx.de X-Virus-Status: Clean Enable spl compile of the class driver for other compile modes then OF_REAL, so that at least it doesn't break the process. Use #if because code review shows that IS_ENABLED() and device_get_supply_regulator() results in probe failure. Signed-off-by: Johan Jonker --- drivers/adc/adc-uclass.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c index 67137ffb..e8ce638d 100644 --- a/drivers/adc/adc-uclass.c +++ b/drivers/adc/adc-uclass.c @@ -199,7 +199,11 @@ int adc_channel_single_shot(const char *name, int channel, unsigned int *data) struct udevice *dev; int ret; +#if IS_ENABLED(CONFIG_SPL_BUILD) + ret = uclass_get_device(UCLASS_ADC, 0, &dev); +#else ret = uclass_get_device_by_name(UCLASS_ADC, name, &dev); +#endif if (ret) return ret; @@ -248,7 +252,11 @@ int adc_channels_single_shot(const char *name, unsigned int channel_mask, struct udevice *dev; int ret; +#if IS_ENABLED(CONFIG_SPL_BUILD) + ret = uclass_get_device(UCLASS_ADC, 0, &dev); +#else ret = uclass_get_device_by_name(UCLASS_ADC, name, &dev); +#endif if (ret) return ret; @@ -372,20 +380,26 @@ int adc_raw_to_uV(struct udevice *dev, unsigned int raw, int *uV) static int adc_vdd_plat_set(struct udevice *dev) { struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); - int ret; char *prop; + uc_pdata->vdd_microvolts = -ENODATA; + + if (CONFIG_IS_ENABLED(OF_PLATDATA)) + return 0; + prop = "vdd-polarity-negative"; uc_pdata->vdd_polarity_negative = dev_read_bool(dev, prop); /* Optionally get regulators */ - ret = device_get_supply_regulator(dev, "vdd-supply", - &uc_pdata->vdd_supply); +#if !IS_ENABLED(CONFIG_SPL_BUILD) + int ret = device_get_supply_regulator(dev, "vdd-supply", + &uc_pdata->vdd_supply); if (!ret) return adc_vdd_plat_update(dev); if (ret != -ENOENT) return ret; +#endif /* No vdd-supply phandle. */ prop = "vdd-microvolts"; @@ -397,19 +411,26 @@ static int adc_vdd_plat_set(struct udevice *dev) static int adc_vss_plat_set(struct udevice *dev) { struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); - int ret; char *prop; + uc_pdata->vss_microvolts = -ENODATA; + + if (CONFIG_IS_ENABLED(OF_PLATDATA)) + return 0; + prop = "vss-polarity-negative"; uc_pdata->vss_polarity_negative = dev_read_bool(dev, prop); - ret = device_get_supply_regulator(dev, "vss-supply", - &uc_pdata->vss_supply); + /* Optionally get regulators */ +#if !IS_ENABLED(CONFIG_SPL_BUILD) + int ret = device_get_supply_regulator(dev, "vss-supply", + &uc_pdata->vss_supply); if (!ret) return adc_vss_plat_update(dev); if (ret != -ENOENT) return ret; +#endif /* No vss-supply phandle. */ prop = "vss-microvolts"; -- 2.20.1