From patchwork Thu Nov 3 11:01:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 14817 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp458993wru; Thu, 3 Nov 2022 04:08:35 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7rViui3WgXOLILFbKNUGvDA1mJPDzDvSpG0xdmDp4KBpxoQ8FhSt/bgBDBNRSDT/AEmQHL X-Received: by 2002:a17:902:7d87:b0:17f:9cd0:2e03 with SMTP id a7-20020a1709027d8700b0017f9cd02e03mr29593050plm.164.1667473715416; Thu, 03 Nov 2022 04:08:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667473715; cv=none; d=google.com; s=arc-20160816; b=o/fbTwFsxTcrPP4R/S8B3wneV2SWBrSQykxnFDFFOD419UfCr6VU0uavYBpajSGC96 8iY5LRgnKJVlY6WM/N5S0vJcASmwus1OBWvYNzBApLykLkqLBz6WD9kODjAsS3YC8tm/ B+t0/45RPHsEyI1I5ed62+6DcNt7kTu5DCZ8gb4+wdLZ0HU5Pvc5YmRJxXnrS9hMe6ek 0oVn1Y8Lm/VRDzcTlBwDcjhDAe7WcKd7b/tjM1zriI0p6MjHQGXLPvlLwyafw+df7sH8 Zrp59vOoxV/60bN3d3Y8P9CD9eTH8v+kGp+KVMkxTlpwFxuvzEcz8PF/u9vDVX2moHNB 59HA== 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=CUlxdNeoLlpwqgvI1vJN7b1g7ZmITiL31RBfTgzzy+4=; b=G+ug+BIpsJXT0Sb3ymo0cQ84xJrlaceKA/YKcbWncHSerMhSrsZ4tjLlkd39kQBahs dWrVs0cUE9vAo1WG3UDraPzecOWeODpNDOkmm7yVIZsBXRqF6kvXw7IOtkS99qTsZAFX ZwiLulgSn+XLTSIgIbD0/SS0QpLRkqLkMVHuTKcqhYNrCxJcjGOxV1W6EgzOuFpEngVy mZQBHyK2kEkubsgCjATKqK5WYrEc9/iUUzW9mJY+iBlL1awvI0N5Cb3XNRJphaYJh1EG 9fZEyu4g5T+QizTpDJLwPSQ4IbSq1ug2RxhU2JKrPL8hScTAAZn7svJcdSc+YHQjmCls nSoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XJqmPRwv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q40-20020a17090a1b2b00b00215e3cdaa35si1877816pjq.134.2022.11.03.04.08.20; Thu, 03 Nov 2022 04:08:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XJqmPRwv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231411AbiKCLBu (ORCPT + 99 others); Thu, 3 Nov 2022 07:01:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231375AbiKCLBh (ORCPT ); Thu, 3 Nov 2022 07:01:37 -0400 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75A36B7EB for ; Thu, 3 Nov 2022 04:01:36 -0700 (PDT) Received: by mail-pl1-x62b.google.com with SMTP id l2so1531491pld.13 for ; Thu, 03 Nov 2022 04:01:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=CUlxdNeoLlpwqgvI1vJN7b1g7ZmITiL31RBfTgzzy+4=; b=XJqmPRwvw+FN/EEePw4qaKUzYroDLu2G9Z6BA7HPgsLyBuvWmXKCSGvjHrIuOEIARG uLbAxrwgIuW4C5fAjPdhLpEMEd99EaT457UbyTI8jBNoVJv6ZVLJnMKPnFxE94t0pcCL ir0xmdfgQ/FjROoq+EP+b2wH+9gP6VhFXEjgdgSxIout3u2ddUFIXPyJL8HVuA+JcCEc AGD/OxvZS1hTK32WR0qll0Hdq/35CG2SO78CgHKA9m/Xi8/d69FtbaYQvyZsPFGyGHTi 0LG17JB/H9gightd066xVQsKspk0uBv9QvMyjhnSLn1vEY/pM4WshA9PVhP4R62yNHhJ 5Vsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=CUlxdNeoLlpwqgvI1vJN7b1g7ZmITiL31RBfTgzzy+4=; b=qro1cS37YmNQONg53IsS5UMbWhxwEuwIJagsLGvRtQyV67s7EpSVOPajdOrEAe6WSO djqUd/dkCcDV1r+bYMCujW7FJZVw1TEq1eRsxLdyLUtAD0sLp9U4hgaMjJfOTpXfgaUK Iaxf6BJRuNW9N9iYvyIvbKCFu1WNeTwMQn9yfbGKD9bFlLLsFClWZ/OqUOz4N1KiS3FR KceH4RoXviKeOwT4tflpcDox+9Eq8oWxssrLZNAmR3NmCV7wUOpe7/x8r6Fr/5K8qsFo GmnvxhH5eGCfxfkqZ5CYus589UEOP+Avpm5vAZOCREp24idQeORbVfQBN+j7vUdotK6V rB+Q== X-Gm-Message-State: ACrzQf0v7FH+6W6rgFQFKb4xtyGt38kx6ngvYyUtN5Y8vJK3JB2hC0/V ucqOz21SUntRw0gNzdKsvvfI1g== X-Received: by 2002:a17:90a:d084:b0:213:8cf1:4d34 with SMTP id k4-20020a17090ad08400b002138cf14d34mr31351688pju.150.1667473295998; Thu, 03 Nov 2022 04:01:35 -0700 (PDT) Received: from localhost ([122.172.84.80]) by smtp.gmail.com with ESMTPSA id s2-20020a170902b18200b001871acf245csm391281plr.37.2022.11.03.04.01.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 04:01:35 -0700 (PDT) From: Viresh Kumar To: James Calligeros , Viresh Kumar , Nishanth Menon , Stephen Boyd Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org Subject: [PATCH 3/5] OPP: Parse named opp-microwatt property too Date: Thu, 3 Nov 2022 16:31:06 +0530 Message-Id: X-Mailer: git-send-email 2.31.1.272.g89b43f80a514 In-Reply-To: References: 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_NONE, SPF_HELO_NONE,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748472918572404961?= X-GMAIL-MSGID: =?utf-8?q?1748472918572404961?= We missed parsing the named opp-microwatt- property, fix that. Signed-off-by: Viresh Kumar --- drivers/opp/of.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/opp/of.c b/drivers/opp/of.c index 605d68673f92..e010e119c42b 100644 --- a/drivers/opp/of.c +++ b/drivers/opp/of.c @@ -695,9 +695,19 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev, } } - /* Search for "opp-microwatt" */ - sprintf(name, "opp-microwatt"); - prop = of_find_property(opp->np, name, NULL); + /* Search for "opp-microwatt-" */ + prop = NULL; + if (opp_table->prop_name) { + snprintf(name, sizeof(name), "opp-microwatt-%s", + opp_table->prop_name); + prop = of_find_property(opp->np, name, NULL); + } + + if (!prop) { + /* Search for "opp-microwatt" */ + sprintf(name, "opp-microwatt"); + prop = of_find_property(opp->np, name, NULL); + } if (prop) { pcount = of_property_count_u32_elems(opp->np, name);