From patchwork Mon May 23 05:28:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 12858755 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E5669C433F5 for ; Mon, 23 May 2022 10:17:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AovgNH/DUOpA1bDRTngZze0iBXN9pCt3HdMRB/GN8pw=; b=0gZ7d104/AZEQd KTn3Qpt+KsW/yJsBEpGB2S7tmE4rXiBDRaxCIr/se1h7PnGmTtcZAH2qqEOAJQCq6RqSpcXNbQX9D N6tIghIaYoWN0EtUBZVXNOwmaRKNmxeHSzMbvj++w1j2qKPiaZbMJ/NwLoy6sNHVDTADeBO8W8fP7 bvANWlJq5P+Nz3iZyPmUlQTV6Rxw/ysHBN0gMMEujtrl5aTwMUeJEb/aWPLwhQBC1pzDFNJAi9IU7 VeYMVQlYgar9QBcxm+5LkuZLRN21SFp3s+WJkEK8e/Zw1ly6g/pQG159rT5X702wIo1eZISXsiUG6 6IRzpumIAGE14ehb9lRw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nt56g-0039zI-Ug; Mon, 23 May 2022 10:16:11 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nt2po-002AAA-Ns for linux-arm-kernel@bombadil.infradead.org; Mon, 23 May 2022 07:50:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=am8B+AfzENDAWt/qUpAzFaFRwymNfGJXzUuOXFbCk5M=; b=WGDsFKvG88u4WZvH1O7k06lEz9 FGUtrspaVmhUBzpTFAWwcvoOrESHn4P0Ao/FfqKAv9+j8Z5HK2WW0YPTwd1Lf1nQgiozJmU+ZUGVa J5qPMRgeeMKRN+0dTD9eXwDrJY+KsbKl1sdNBEwlkdjJ1PtFtpX6ra04K8jahAVJPYHkA8G05Bs+7 M+O+YwJNvTpouo5ai78mR8HSlw+zl/HDdDh9Y+5u9Dczi4O+r+k/vGkrEcX/ZSTWQCubaGS0EbJLw RaZbeRX7nmtyzRmUqwCrCj1boujOam9G71R7PXNeSm/THs5UcyZhqN3UzdxCZUbT83kWjokhYQjW8 TdCWeq7Q==; Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nt0e2-000r5I-Bh for linux-arm-kernel@lists.infradead.org; Mon, 23 May 2022 05:30:20 +0000 Received: by mail-wm1-x330.google.com with SMTP id c9-20020a7bc009000000b0039750ec5774so325368wmb.5 for ; Sun, 22 May 2022 22:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=am8B+AfzENDAWt/qUpAzFaFRwymNfGJXzUuOXFbCk5M=; b=epimhOkcWXRnlpp8as0ZW+FCbrusHfj/ITRwlU6Vhp/3I6NG2pkCv6U0JAXbECrxAi 5JgX4XrBwfOygUCyihy2r2LJEbBes9nonYi7JaEe6elkb5RyKPBNoj6DDWiL3rX/GLl1 xyLLbKsrVDmAJYjht4vIWAonOCNupzue4YniEXzr4VTxfQwYF5kqaSTlLp8sPhRngcLu dOYDtisMlBvTmVCC60hthfCVO5+6Au+C6JDq1HGzNPZwzZ5oP42aotzyjgnXulr9QUV5 abEN04R+Umu8SsgDhPFY2wzEbh+hTg683evjd6Oy4unU/bhxeSf3igPWv144MTNMYyj5 7oOQ== 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=am8B+AfzENDAWt/qUpAzFaFRwymNfGJXzUuOXFbCk5M=; b=vcltzRuRmKEN0+3gB8JjCN90z4YA4Fo6tpeGi/9CJhonEufmGV1U9T+joPeU0dm4Kk HfW6KHmQPzVCtJFEeoFXMSpYZ+lWHn2d/kMjhioRuU8LnKdXGC1eP4uVbW7/17bqW2m/ 8t3g8wI/3s6qwxOzNEd66eg0wA5s48Rx+p6VM3aVouIgOaNtpdBjjH7ISH/5HI1o9Qqw 1fuOnGZKrIBwgRV1TDC7UIOEjBjPsJHVk6SMiknL8TurDvJgakQfEARfcShvdGFPcClJ EQAxGpZccDjpz4wHsfUqQDIyzDvPMIGDMuRKIouIypRer79Ho6q8fn+oXAI2b7vsR4X5 bcjg== X-Gm-Message-State: AOAM531YwHLC+5ASl2KoUyeFhprzS0xSoM2KEOIrIolKctU9eJwufSEM J4hptVH7YcN24M712A5ZcsEUVA== X-Google-Smtp-Source: ABdhPJzm/entZ+SLPL0EhI0XgtI+1xyVC6MTxHThdpeAizznoJknLGj7DCHKY7ficjfSib+0ndrkiA== X-Received: by 2002:a05:600c:348e:b0:397:3f81:2168 with SMTP id a14-20020a05600c348e00b003973f812168mr2752873wmq.168.1653283695871; Sun, 22 May 2022 22:28:15 -0700 (PDT) Received: from localhost.localdomain (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id h2-20020a1ccc02000000b0039466988f6csm7802414wmb.31.2022.05.22.22.28.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 May 2022 22:28:15 -0700 (PDT) From: Corentin Labbe To: andrew@lunn.ch, broonie@kernel.org, calvin.johnson@oss.nxp.com, davem@davemloft.net, edumazet@google.com, hkallweit1@gmail.com, jernej.skrabec@gmail.com, krzysztof.kozlowski+dt@linaro.org, kuba@kernel.org, lgirdwood@gmail.com, linux@armlinux.org.uk, pabeni@redhat.com, robh+dt@kernel.org, samuel@sholland.org, wens@csie.org Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev, netdev@vger.kernel.org, Corentin Labbe Subject: [PATCH v3 1/3] regulator: Add regulator_bulk_get_all Date: Mon, 23 May 2022 05:28:05 +0000 Message-Id: <20220523052807.4044800-2-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220523052807.4044800-1-clabbe@baylibre.com> References: <20220523052807.4044800-1-clabbe@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220523_063018_715943_6925C49C X-CRM114-Status: GOOD ( 20.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org It work exactly like regulator_bulk_get() but instead of working on a provided list of names, it seek all consumers properties matching xxx-supply. Signed-off-by: Corentin Labbe Reported-by: kernel test robot Reported-by: kernel test robot --- drivers/regulator/core.c | 92 ++++++++++++++++++++++++++++++ include/linux/regulator/consumer.h | 2 + 2 files changed, 94 insertions(+) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 1e54a833f2cf..7286bcf3821a 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -4813,6 +4813,98 @@ static void regulator_bulk_enable_async(void *data, async_cookie_t cookie) bulk->ret = regulator_enable(bulk->consumer); } +/* + * Check if name is a supply name according to the '*-supply' pattern + * return 0 if false + * return length of supply name without the -supply + */ +static int is_supply_name(const char *name) +{ + int strs, i; + + strs = strlen(name); + /* string need to be at minimum len(x-supply) */ + if (strs < 8) + return 0; + for (i = strs - 6; i > 0; i--) { + /* find first '-' and check if right part is supply */ + if (name[i] != '-') + continue; + if (strcmp(name + i + 1, "supply") != 0) + return 0; + return i; + } + return 0; +} + +/* + * regulator_bulk_get_all - get multiple regulator consumers + * + * @dev: Device to supply + * @np: device node to search for consumers + * @consumers: Configuration of consumers; clients are stored here. + * + * @return number of regulators on success, an errno on failure. + * + * This helper function allows drivers to get several regulator + * consumers in one operation. If any of the regulators cannot be + * acquired then any regulators that were allocated will be freed + * before returning to the caller. + */ +int regulator_bulk_get_all(struct device *dev, struct device_node *np, + struct regulator_bulk_data **consumers) +{ + int num_consumers = 0; + struct regulator *tmp; + struct property *prop; + int i, n = 0, ret; + char name[64]; + + *consumers = NULL; + +/* + * first pass: get numbers of xxx-supply + * second pass: fill consumers + * */ +restart: + for_each_property_of_node(np, prop) { + i = is_supply_name(prop->name); + if (i == 0) + continue; + if (!*consumers) { + num_consumers++; + continue; + } else { + memcpy(name, prop->name, i); + name[i] = '\0'; + tmp = regulator_get(dev, name); + if (!tmp) { + ret = -EINVAL; + goto error; + } + (*consumers)[n].consumer = tmp; + n++; + continue; + } + } + if (*consumers) + return num_consumers; + if (num_consumers == 0) + return 0; + *consumers = kmalloc_array(num_consumers, + sizeof(struct regulator_bulk_data), + GFP_KERNEL); + if (!*consumers) + return -ENOMEM; + goto restart; + +error: + while (--n >= 0) + regulator_put(consumers[n]->consumer); + return ret; +} +EXPORT_SYMBOL_GPL(regulator_bulk_get_all); + /** * regulator_bulk_enable - enable multiple regulator consumers * diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h index bbf6590a6dec..b9b1d1cbdd07 100644 --- a/include/linux/regulator/consumer.h +++ b/include/linux/regulator/consumer.h @@ -238,6 +238,8 @@ int regulator_disable_deferred(struct regulator *regulator, int ms); int __must_check regulator_bulk_get(struct device *dev, int num_consumers, struct regulator_bulk_data *consumers); +int __must_check regulator_bulk_get_all(struct device *dev, struct device_node *np, + struct regulator_bulk_data **consumers); int __must_check devm_regulator_bulk_get(struct device *dev, int num_consumers, struct regulator_bulk_data *consumers); int __must_check regulator_bulk_enable(int num_consumers, From patchwork Mon May 23 05:28:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 12858660 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2BF65C433F5 for ; Mon, 23 May 2022 09:31:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nEhXBZaQ96gujF18PxPX9mx1DR1NLQyqjAYxnKVK2bs=; b=pCo5AG5dyjxVmz 3orJeaLCJFtssplx8CVB6u2j2eCE89kiWbEZiF0slnOkwySyXQJ4OdtOGYGgqq5U8Fj1IabBESmXL ncVchF/5k79o0XJoCNg4oOrRN7/vllcP6/vVlsIcEOQ52EwzQnbQ/csikuCrRbH1Rkzg+u4l+8xy0 62x0kTuX2I9626Y1y6KuKJBCHtu8+v6drneErv9zPRs21xKXAhYrcbSAcxQXjON2zUjUvYdeAdgfe XU8ow77NBIlVHgH+R369a5JC5DY9RgS2LBPgV0JCMIYwKWWvZ6XdllRqMMt3mEylHaqX+2Jx0qAt1 uxPJ2LB6wecp+XDhEe3A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nt4Nh-002qoq-U0; Mon, 23 May 2022 09:29:43 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nt2pn-002AAA-Ai for linux-arm-kernel@bombadil.infradead.org; Mon, 23 May 2022 07:50:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=hMbtP4l5NIdbJN9Ls/o3wbRNRvLgMN2alg0s8sMcV/I=; b=fnry3H5pzoj5KzbRfU1pxidcYO FjSLEqcreFq6PKDEzGhpwGnmksiZFKrnJhjCd8X4GMUooHqsifVwTfk9Vdmh1LQ6Turwb3vt5VRkg SP24EfN9jh7Tkh0AP3VvENhKyVUMg1HUsJ6AG5Y6pwWuSqYZR9H2wUM+tTckfiy2PRUqG6N3kKVHn bbT3XOyWEeTX6GAxnloHSYy1gZOx8cytW7yZ2k7fLEYGQ1uS1fHbRJrYSBs+NkpAg846rfvZaMGKp 9b7IonHLPh5pBe1Hsh3+cDC192ycrxSN1o4ttE5yzu90IpCxhA44M4QhiZQBvDnK166rlrC3mKVnU 6dzNR9Cw==; Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nt0e2-000r5L-El for linux-arm-kernel@lists.infradead.org; Mon, 23 May 2022 05:30:22 +0000 Received: by mail-wr1-x436.google.com with SMTP id s28so19504928wrb.7 for ; Sun, 22 May 2022 22:30:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hMbtP4l5NIdbJN9Ls/o3wbRNRvLgMN2alg0s8sMcV/I=; b=Rrc+F4WHPKFtZbfdPZhfGR1Bun8uOgA4F0ZgY8Iow4MAXe84LfyEgUj1wulOfOuBbT A6gowSS2SmqRoLu8mvZJFB+CSST0OEgqe1V1axQ+fvtefIxmzDb8yS3XVUZl2VuZW2np oQDnOgAuWRxjf9LkJ/qreSL/CeHxKmuBmu4Fg+wfAY5DNwP4fhM1YH2Hm6s0bwjc4Tyr EBwAlDZI3LICLlQHL3cLv4tF8uFcsWKDOZJdW2hU50jlqPL6VsY2dDIsGRUHIAn9oFFX bagJQ3t+GR6tjlYCXXQOECYOxhjUvUmVORQMCihCbgUULVOqx/vAkA/YJYPH/Xnnn/r1 94bQ== 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=hMbtP4l5NIdbJN9Ls/o3wbRNRvLgMN2alg0s8sMcV/I=; b=kat7XP55fIoOx74k+LPHEFi0h7g8U8ec+LlAWiXf2U5fsm/iY4eau9gUcro+GdkquT dTmMJJ8wl08ixUR278a+SYXpFzCAdBnX2LR8u9f9Rr+oWI0y3qa4uz4aSdFLKASiSe80 mP1RzPcIvz5xeAneaC0BiMtbebq5FMGcVFBOOq/fJx96bgXvsWzQCCje8YZU73iQCinh K2hzZimrOc4n5h038mM4pdZ0m+6pRu/PkxUmbNfVgXaATe4bdYZ8wtBB9BMBi39UcFsD OZTOOP3Ng1Uew+68q56uIN9GuTiT02uMK2H8fZqX0lcaFPWK/f2nQC3Np5+xQu7yH2iU Bn+Q== X-Gm-Message-State: AOAM531EESyDYsrlv3TFrViSX2kMWrgBH1H07iJb4Hd0KZM/3LcydL0p nCma4XVYqFzRv/eaREgsjNAoYg== X-Google-Smtp-Source: ABdhPJwPH32818/ysyCFl3DUF5kdKny0XUvYHvdybODc/cafFr8AsehjAS9sZfOvGlftg89tpe6jgg== X-Received: by 2002:a05:6000:178d:b0:20f:e960:2f2 with SMTP id e13-20020a056000178d00b0020fe96002f2mr250812wrg.569.1653283696986; Sun, 22 May 2022 22:28:16 -0700 (PDT) Received: from localhost.localdomain (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id h2-20020a1ccc02000000b0039466988f6csm7802414wmb.31.2022.05.22.22.28.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 May 2022 22:28:16 -0700 (PDT) From: Corentin Labbe To: andrew@lunn.ch, broonie@kernel.org, calvin.johnson@oss.nxp.com, davem@davemloft.net, edumazet@google.com, hkallweit1@gmail.com, jernej.skrabec@gmail.com, krzysztof.kozlowski+dt@linaro.org, kuba@kernel.org, lgirdwood@gmail.com, linux@armlinux.org.uk, pabeni@redhat.com, robh+dt@kernel.org, samuel@sholland.org, wens@csie.org Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev, netdev@vger.kernel.org, Corentin Labbe Subject: [PATCH v3 2/3] phy: handle optional regulator for PHY Date: Mon, 23 May 2022 05:28:06 +0000 Message-Id: <20220523052807.4044800-3-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220523052807.4044800-1-clabbe@baylibre.com> References: <20220523052807.4044800-1-clabbe@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220523_063018_906840_8EC55B95 X-CRM114-Status: GOOD ( 18.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add handling of optional regulators for PHY. Regulators need to be enabled before PHY scanning, so MDIO bus initiate this task. Signed-off-by: Corentin Labbe Signed-off-by: Corentin Labbe Reported-by: kernel test robot --- drivers/net/mdio/Kconfig | 1 + drivers/net/mdio/fwnode_mdio.c | 36 ++++++++++++++++++++++++++++++---- drivers/net/phy/phy_device.c | 10 ++++++++++ include/linux/phy.h | 3 +++ 4 files changed, 46 insertions(+), 4 deletions(-) diff --git a/drivers/net/mdio/Kconfig b/drivers/net/mdio/Kconfig index bfa16826a6e1..3f8098fac74b 100644 --- a/drivers/net/mdio/Kconfig +++ b/drivers/net/mdio/Kconfig @@ -22,6 +22,7 @@ config MDIO_BUS config FWNODE_MDIO def_tristate PHYLIB depends on (ACPI || OF) || COMPILE_TEST + depends on REGULATOR select FIXED_PHY help FWNODE MDIO bus (Ethernet PHY) accessors diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c index 1c1584fca632..7f0d3bc81c52 100644 --- a/drivers/net/mdio/fwnode_mdio.c +++ b/drivers/net/mdio/fwnode_mdio.c @@ -10,6 +10,7 @@ #include #include #include +#include MODULE_AUTHOR("Calvin Johnson "); MODULE_LICENSE("GPL"); @@ -94,7 +95,10 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus, struct phy_device *phy; bool is_c45 = false; u32 phy_id; - int rc; + int rc, reg_cnt = 0; + struct regulator_bulk_data *consumers; + struct device_node *nchild = NULL; + u32 reg; mii_ts = fwnode_find_mii_timestamper(child); if (IS_ERR(mii_ts)) @@ -105,15 +109,35 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus, if (rc >= 0) is_c45 = true; + for_each_child_of_node(bus->dev.of_node, nchild) { + of_property_read_u32(nchild, "reg", ®); + if (reg != addr) + continue; + reg_cnt = regulator_bulk_get_all(&bus->dev, nchild, &consumers); + if (reg_cnt > 0) { + rc = regulator_bulk_enable(reg_cnt, consumers); + if (rc) + return rc; + } + if (reg_cnt < 0) { + dev_err(&bus->dev, "Fail to regulator_bulk_get_all err=%d\n", reg_cnt); + return reg_cnt; + } + } + if (is_c45 || fwnode_get_phy_id(child, &phy_id)) phy = get_phy_device(bus, addr, is_c45); else phy = phy_device_create(bus, addr, phy_id, 0, NULL); if (IS_ERR(phy)) { unregister_mii_timestamper(mii_ts); - return PTR_ERR(phy); + rc = PTR_ERR(phy); + goto error; } + phy->regulator_cnt = reg_cnt; + phy->consumers = consumers; + if (is_acpi_node(child)) { phy->irq = bus->irq[addr]; @@ -127,14 +151,14 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus, if (rc) { phy_device_free(phy); fwnode_handle_put(phy->mdio.dev.fwnode); - return rc; + goto error; } } else if (is_of_node(child)) { rc = fwnode_mdiobus_phy_device_register(bus, phy, child, addr); if (rc) { unregister_mii_timestamper(mii_ts); phy_device_free(phy); - return rc; + goto error; } } @@ -145,5 +169,9 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus, if (mii_ts) phy->mii_ts = mii_ts; return 0; +error: + if (reg_cnt > 0) + regulator_bulk_disable(reg_cnt, consumers); + return rc; } EXPORT_SYMBOL(fwnode_mdiobus_register_phy); diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 431a8719c635..711919e40ef7 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -1785,6 +1786,9 @@ int phy_suspend(struct phy_device *phydev) if (!ret) phydev->suspended = true; + if (phydev->regulator_cnt > 0) + regulator_bulk_disable(phydev->regulator_cnt, phydev->consumers); + return ret; } EXPORT_SYMBOL(phy_suspend); @@ -1811,6 +1815,12 @@ int phy_resume(struct phy_device *phydev) { int ret; + if (phydev->regulator_cnt > 0) { + ret = regulator_bulk_enable(phydev->regulator_cnt, phydev->consumers); + if (ret) + return ret; + } + mutex_lock(&phydev->lock); ret = __phy_resume(phydev); mutex_unlock(&phydev->lock); diff --git a/include/linux/phy.h b/include/linux/phy.h index 508f1149665b..ef4e0ce67194 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -704,6 +704,9 @@ struct phy_device { void (*phy_link_change)(struct phy_device *phydev, bool up); void (*adjust_link)(struct net_device *dev); + int regulator_cnt; + struct regulator_bulk_data *consumers; + #if IS_ENABLED(CONFIG_MACSEC) /* MACsec management functions */ const struct macsec_ops *macsec_ops; From patchwork Mon May 23 05:28:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 12858597 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 778B5C433F5 for ; Mon, 23 May 2022 08:47:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=3LnwTGTO83kMoV6Hu1+ldN7kltzEG7nyxZtTb7LKGVE=; b=fTym/uq0MWygmR Zvk2JFknOGXuodg7aRWsGkbysTIKeySIuRT2kToTv5eBJrmQxFaYpQMoY//8H3ol/2jY88fh9PXUA lV92AOdoWX7YEGOQFwWK8pNMTdviy/AAtTEauCsjAoWA/KK+L2RzeuLRCh0/BzXr36YxLXNc5ZP2u kjhuNK/unPG7DvrJTqsMidrc0eN8Xo5J3Q3S0eIHvDnwtfucw0oSCLQThHva6RtZJuQbCWV5i+B4R nYcaPCEZ/lYg8pGBJ2o2YXJAaNV2BLmNSXnAh79TIZ77kLT8vDvaBasxzBadvzszTlbUXJ+9cnYG7 GMhKfBHLFhCH7km8WwoA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nt3h6-002XlI-A5; Mon, 23 May 2022 08:45:41 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nt2pm-002A7b-Po for linux-arm-kernel@bombadil.infradead.org; Mon, 23 May 2022 07:50:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:Content-Type :MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=kwRG8kJghq1J9woEQ8/8+NXh3AtgpEI2TuVWVjMfZMk=; b=fwszPGGl7dyUsWCBkg0gkXgxBZ Sku0NtnUUz9EQr2dH1wHHld8LAxYaWuzHcd5Lg8/E+5Eki9Bg1hAvI9xUl1ZpuxpxG9NvNMg6DDUW NLtMbTbJS5I1Dk8153cd/sqRtNEQfa6uy/7BcNIJSECYqFbrPxGO/3fImWzrqwW2B3/rOYo2fRDqi WvlwNltkAAREKh47R+dr2A46nsoNXvOiOY8+nDw5+6DYvh4CpfLO0Nt+qRHF1wvDcpQDPAYv05UA9 m43jhGONfyNot5FBXF2ifHNU0Guaq2y6WV1w3JfAgFkLkt6BkfADsvnA+7j3r6MQg1wvIX4WmMRpn WTYqpZYA==; Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nt0e2-000r5M-Ur for linux-arm-kernel@lists.infradead.org; Mon, 23 May 2022 05:30:23 +0000 Received: by mail-wr1-x434.google.com with SMTP id h5so18501422wrb.11 for ; Sun, 22 May 2022 22:30:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kwRG8kJghq1J9woEQ8/8+NXh3AtgpEI2TuVWVjMfZMk=; b=0HpAzyrF8+FK9s9Lv6r8HnmS4n2VHb3e9NI+PYcrMI8MijK0B5XoHtXRkv0pI5tmky DTvP09m+Llj+BF8ipr7By+iseFMo7gGLtq7vYu96ZGeSz8zR0CmdFjxa2rF61Q3PyTwY 5fEIB+1cjJNCHPS/dqw3StWXVMUIT3lUwunNjpKiEUWCJwQHOQjt+RFSK+miW6Z4zbXs MWvJvH5fNK1m37DX7lV/wbjEtMDmkUVmoLJADDbcCKXYidinq0Ke37o8BrAO6EZyFLdC sFfsslVnXtIGNMmhcoHGHRzHo5UgF4kTZ2ol6Bar+kuhYmFZ4qSF3OhS2bQXw91eRaVo C3Og== 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=kwRG8kJghq1J9woEQ8/8+NXh3AtgpEI2TuVWVjMfZMk=; b=ZGwk73jmUn8Biss2dMya6AAHnFwbReoXb5YyFCqEKF2mxSxy9NgSutt6gyx+6H8xdJ FaE2/851YiJp1rptVbFrtt4vcalBe5YuZ1s2EIZ2qgvFskh9aEIaj+se1RL1KbwV/7k6 hYx2AdUy/upsZSlfdpsVU+AJay5WuDUA75nNWNzaerOoljVvN20uyapSSIo/HHWruB/S ZAMBxtYMnuLcEDrZJXBtPwb5PqXbhFF4aDlAiaY0Nw+KFLrZ6jd71EuYSUpb0QnXsmkT GPcga18ucDmCZRMu4niibCF6zDNRBVMrpVqnskc0oabdVngdhIaXud1uutu8osZHlg+d LyfQ== X-Gm-Message-State: AOAM533161Ng1kHURfBPot548cNpieP+FqI4BNTVOW6MwzrD16IFAMKb k5iG4nCC+aQ2AuyjWDtTmZ10MQ== X-Google-Smtp-Source: ABdhPJy4dOiHRi8RxJS1vDYeuYztM8ZLIeJ4Hy3+HL2NtCowcnxhvWlaJf6kQexvMGXqL2AAqtP4hw== X-Received: by 2002:a5d:4bd2:0:b0:20f:cb39:c035 with SMTP id l18-20020a5d4bd2000000b0020fcb39c035mr6890506wrt.709.1653283698116; Sun, 22 May 2022 22:28:18 -0700 (PDT) Received: from localhost.localdomain (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id h2-20020a1ccc02000000b0039466988f6csm7802414wmb.31.2022.05.22.22.28.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 May 2022 22:28:17 -0700 (PDT) From: Corentin Labbe To: andrew@lunn.ch, broonie@kernel.org, calvin.johnson@oss.nxp.com, davem@davemloft.net, edumazet@google.com, hkallweit1@gmail.com, jernej.skrabec@gmail.com, krzysztof.kozlowski+dt@linaro.org, kuba@kernel.org, lgirdwood@gmail.com, linux@armlinux.org.uk, pabeni@redhat.com, robh+dt@kernel.org, samuel@sholland.org, wens@csie.org Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev, netdev@vger.kernel.org, =?utf-8?q?Ond=C5=99ej_Jirman?= , Corentin Labbe Subject: [PATCH v3 3/3] arm64: dts: allwinner: orange-pi-3: Enable ethernet Date: Mon, 23 May 2022 05:28:07 +0000 Message-Id: <20220523052807.4044800-4-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220523052807.4044800-1-clabbe@baylibre.com> References: <20220523052807.4044800-1-clabbe@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220523_063019_317551_CFC62FF2 X-CRM114-Status: GOOD ( 14.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: OndÅ™ej Jirman Orange Pi 3 has two regulators that power the Realtek RTL8211E PHY. According to the datasheet, both regulators need to be enabled at the same time, or that "phy-io" should be enabled slightly earlier than "phy" regulator. RTL8211E/RTL8211EG datasheet says: Note 4: 2.5V (or 1.8/1.5V) RGMII power should be risen simultaneously or slightly earlier than 3.3V power. Rising 2.5V (or 1.8/1.5V) power later than 3.3V power may lead to errors. The timing is set in DT via startup-delay-us. Signed-off-by: Ondrej Jirman Signed-off-by: Corentin Labbe --- .../dts/allwinner/sun50i-h6-orangepi-3.dts | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts index c45d7b7fb39a..2760a0bf76d5 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts @@ -13,6 +13,7 @@ / { compatible = "xunlong,orangepi-3", "allwinner,sun50i-h6"; aliases { + ethernet0 = &emac; serial0 = &uart0; serial1 = &uart1; }; @@ -55,6 +56,15 @@ led-1 { }; }; + reg_gmac_2v5: gmac-2v5 { + compatible = "regulator-fixed"; + regulator-name = "gmac-2v5"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + enable-active-high; + gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */ + }; + reg_vcc5v: vcc5v { /* board wide 5V supply directly from the DC jack */ compatible = "regulator-fixed"; @@ -113,6 +123,33 @@ &ehci3 { status = "okay"; }; +&emac { + pinctrl-names = "default"; + pinctrl-0 = <&ext_rgmii_pins>; + phy-mode = "rgmii-id"; + phy-handle = <&ext_rgmii_phy>; + status = "okay"; +}; + +&mdio { + ext_rgmii_phy: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + /* + * The board uses 2.5V RGMII signalling. Power sequence to enable + * the phy is to enable GMAC-2V5 and GMAC-3V (aldo2) power rails + * at the same time and to wait 100ms. The driver enables phy-io + * first. Delay is achieved with enable-ramp-delay on reg_aldo2. + */ + phy-io-supply = <®_gmac_2v5>; + ephy-supply = <®_aldo2>; + + reset-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */ + reset-assert-us = <15000>; + reset-deassert-us = <40000>; + }; +}; + &gpu { mali-supply = <®_dcdcc>; status = "okay"; @@ -211,6 +248,7 @@ reg_aldo2: aldo2 { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-name = "vcc33-audio-tv-ephy-mac"; + regulator-enable-ramp-delay = <100000>; }; /* ALDO3 is shorted to CLDO1 */