From patchwork Wed Oct 4 12:05:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 148245 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:254a:b0:403:3b70:6f57 with SMTP id hf10csp80830vqb; Wed, 4 Oct 2023 05:08:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEbT3hxGPJMPJJK+fpfNpmeDhIMWq9uXx7qLmGARgQrbBPARrEa0566TBx1gWGJMux+89Pi X-Received: by 2002:a05:6a20:3c8c:b0:f0:50c4:4c43 with SMTP id b12-20020a056a203c8c00b000f050c44c43mr3253913pzj.5.1696421294765; Wed, 04 Oct 2023 05:08:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696421294; cv=none; d=google.com; s=arc-20160816; b=UEbMwyoqErrIOwhOdn0M3BhJKwye/byth9FpWtSakOLxH0QlGZox0+RirDfeaW3yqp 0ACVTRL88SJizpZxFumeh70LXZUMDK8RSraFd3ukluRId3Os9rVuBVrVxbxdmAbQSWug Sd5q61zM638hullzHNuCwJjYYc9C9lcPMh/vdmWsE32axtA+8Ax7JQNMvfNw/yWHt5nQ rxWqJs2ug3w2myiyLXE+tPsY54bUolOO74Q6ZvEpE6R3kHxkxfD6hIcJEa/6RnSDKNrC TxhKAnHLvz4nuI3BybJbY8e73moYWsb/6d1O4uCxuCiFaiF76axZVqgvGdGtyHvXcnI/ WB7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=PDAx+WeaAfeMTk0iyLZZaQojNWk87fXDiAYeAoWRhyA=; fh=8KXh4pBEmy+NtF/opnUgUmKV+7RocDF9urRJBwd73MA=; b=lmpy/aXhcqHyEgdNVVnqZvGYHBv/E3pREsiJyH5ao1CRpGCiIZ6ZbSjL9EQS96Btao 7fG1bWft35NrlPnWP0Bm2E2DNLXUJP47bKFVROOd1gBwqgZiAHGP2kMaU9/WH6Rj7FFo Fp2d4axa13AgtfcPDpUnEaUNEXU6q+dsJHVW8p55NZGu1++rPWam4F/uDZPq6PxF+BnY o/yg9YM2M49JKYAtjEDp5y7IZ4iB1AeNTg+pr9nPHBQ5YNwNCUDW2nNUsKJYKVhEVZiy Ams1/55Vx3yC8jsIrrIGQdrPbrvNjRksY1KI6m89q519t38PrIIRBhZWEo70kiDItyre hDZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b="GC4/UBX5"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id y22-20020a637d16000000b0057828b85ae6si3585864pgc.281.2023.10.04.05.07.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 05:08:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b="GC4/UBX5"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 3AB938341002; Wed, 4 Oct 2023 05:07:51 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242307AbjJDMHo (ORCPT + 18 others); Wed, 4 Oct 2023 08:07:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242218AbjJDMHk (ORCPT ); Wed, 4 Oct 2023 08:07:40 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C55ECE for ; Wed, 4 Oct 2023 05:07:37 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-533c8f8f91dso3587585a12.0 for ; Wed, 04 Oct 2023 05:07:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1696421255; x=1697026055; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PDAx+WeaAfeMTk0iyLZZaQojNWk87fXDiAYeAoWRhyA=; b=GC4/UBX5DfVUAypUfkP0Xbkjj7i1mKLgpupYA3AZTPN4nmUg8hnT3IFVrDUyeA5Tqh xXR6jCTtXgx2uhzrOMfRJzS46fSMnsH6H9jKp/Oy5FdonNnzrBNAs/wSMgq6CWViaibN A7mXVTqosWPmvhuqB7s/FPwq9R12HqvDrdr1T76RY1+bfzOAlTUJGWimrHIn9L/XmZq4 b4dhhww0lZl93GOQVYYgQ/IviSbL4S83e6pQeuk5VgY41yCaEY/p0Uj5Jo0OuzzGGmmC szaYbjjS/1wovYLzP3WFQ3IBUTAv5HH5rXQ71Y6fO7nBRQCO1PtmnHH/nOUG2kZIRpgt hVzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696421255; x=1697026055; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PDAx+WeaAfeMTk0iyLZZaQojNWk87fXDiAYeAoWRhyA=; b=CC/56FgwLrb2S9aBcqcy2FN20eKv+feiNrDH0meFWJkp5NS2P70BqUW5YYRHdwPBlP DS/J08Kx+T562mHNh3vOY9UNwmPQGOyiVbWXrjpxEKO+f7b8l/DLXZri5zbOSzcfxuc/ OjsjGhfcYL5Zvf1EXSuYzAHewaYcIWst0fPfWUoK5pFYWDWBL9kmuIKErhrib7PG2Hy7 MJT0StvbW05FVSNi9PE/hfh7FAGgqzx3aqR8B8fw6KH1zJzf149XNnzz7Tm/0tL9jtau tCIa8oNClmuqw9x7Mhz4FN/d2RcApyFbQvADeT7Mp7QC9USsxOmJZ2GEk7F2otVgML4l wxOg== X-Gm-Message-State: AOJu0YwI8c9kp4L1gfPIqOM9Z68/rphwb2o8rg9g8ftHhhHt7grBKc3k t1StORaUUncb+FucV+9F1zfrNQ== X-Received: by 2002:a05:6402:1843:b0:522:580f:8c75 with SMTP id v3-20020a056402184300b00522580f8c75mr1695418edy.17.1696421255040; Wed, 04 Oct 2023 05:07:35 -0700 (PDT) Received: from stroh80.sec.9e.network (ip-078-094-000-051.um19.pools.vodafone-ip.de. [78.94.0.51]) by smtp.gmail.com with ESMTPSA id e6-20020aa7d7c6000000b005362bcc089csm2324665eds.67.2023.10.04.05.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 05:07:34 -0700 (PDT) From: Naresh Solanki To: broonie@kernel.org, zev@bewilderbeest.net, Liam Girdwood Cc: Naresh Solanki , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] regulator: userspace-consumer: Retrieve supplies from DT Date: Wed, 4 Oct 2023 14:05:27 +0200 Message-ID: <20231004120529.1155700-2-naresh.solanki@9elements.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231004120529.1155700-1-naresh.solanki@9elements.com> References: <20231004120529.1155700-1-naresh.solanki@9elements.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 04 Oct 2023 05:07:51 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778826655928649331 X-GMAIL-MSGID: 1778826655928649331 From: Naresh Solanki Instead of hardcoding a single supply, retrieve supplies from DT. Signed-off-by: Naresh Solanki --- Changes in V2: - Use strlen for SUPPLY_SUFFIX_LEN, - Remove bracket for single line statements in if statement. - Remove extra space in variable declaration. - Simplify multi line statement by calculating size in seperate variable. - Add function prop_supply_name & simplify code. - Use devm_kstrdup instead to simplify code further. - Update DT binding to align with changes. --- drivers/regulator/userspace-consumer.c | 51 ++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/drivers/regulator/userspace-consumer.c b/drivers/regulator/userspace-consumer.c index 97f075ed68c9..13c0a86ab32c 100644 --- a/drivers/regulator/userspace-consumer.c +++ b/drivers/regulator/userspace-consumer.c @@ -115,12 +115,41 @@ static const struct attribute_group attr_group = { .is_visible = attr_visible, }; +#define SUPPLY_SUFFIX "-supply" +#define SUPPLY_SUFFIX_LEN strlen(SUPPLY_SUFFIX) + +static size_t prop_supply_name(char *prop_name) +{ + int len = strlen(prop_name); + + if (len <= SUPPLY_SUFFIX_LEN) + return 0; + + if (strcmp(prop_name + len - SUPPLY_SUFFIX_LEN, SUPPLY_SUFFIX) == 0) + return len - SUPPLY_SUFFIX_LEN; + + return 0; +} + +static int get_num_supplies(struct platform_device *pdev) +{ + struct property *prop; + int num_supplies = 0; + + for_each_property_of_node(pdev->dev.of_node, prop) { + if (prop_supply_name(prop->name)) + num_supplies++; + } + return num_supplies; +} + static int regulator_userspace_consumer_probe(struct platform_device *pdev) { struct regulator_userspace_consumer_data tmpdata; struct regulator_userspace_consumer_data *pdata; struct userspace_consumer_data *drvdata; - int ret; + struct property *prop; + int ret, supplies_size; pdata = dev_get_platdata(&pdev->dev); if (!pdata) { @@ -131,11 +160,25 @@ static int regulator_userspace_consumer_probe(struct platform_device *pdev) memset(pdata, 0, sizeof(*pdata)); pdata->no_autoswitch = true; - pdata->num_supplies = 1; - pdata->supplies = devm_kzalloc(&pdev->dev, sizeof(*pdata->supplies), GFP_KERNEL); + pdata->num_supplies = get_num_supplies(pdev); + + supplies_size = pdata->num_supplies * sizeof(*pdata->supplies); + pdata->supplies = devm_kzalloc(&pdev->dev, supplies_size, GFP_KERNEL); if (!pdata->supplies) return -ENOMEM; - pdata->supplies[0].supply = "vout"; + + for_each_property_of_node(pdev->dev.of_node, prop) { + const char *prop_name = prop->name; + size_t supply_len = prop_supply_name(prop->name); + + if (!supply_len) + continue; + + char *supply_name = devm_kstrdup(&pdev->dev, prop_name, GFP_KERNEL); + + supply_name[supply_len] = '\0'; + pdata->supplies[0].supply = supply_name; + } } if (pdata->num_supplies < 1) {