From patchwork Tue Aug 14 17:06:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10565901 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CE9D0157B for ; Tue, 14 Aug 2018 17:07:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B56552A478 for ; Tue, 14 Aug 2018 17:07:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A9ED52A4C4; Tue, 14 Aug 2018 17:07:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BBB62A478 for ; Tue, 14 Aug 2018 17:07:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387653AbeHNTy5 (ORCPT ); Tue, 14 Aug 2018 15:54:57 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:37360 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387652AbeHNTy4 (ORCPT ); Tue, 14 Aug 2018 15:54:56 -0400 Received: by mail-pl0-f68.google.com with SMTP id d5-v6so8570641pll.4 for ; Tue, 14 Aug 2018 10:06:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sGksIB8cizHaKApnUuX97vs90VO3iPXhSR8JaN7x2IY=; b=jVNUuhuLaWAUk3mi7QZkJiZY6h5l7ESWMHbmr57casDI1YZPMFj/AhbQ9IUXs4rAfF z5txz22DhcqC3J/D+h566gKxXRo+kgsz58HycewKR1jwrBWWUEVvyuZm8l7KwHno/75P 5n76nx20yMVukneKSO2SeJAVkXU5f1W9E4M9c= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=sGksIB8cizHaKApnUuX97vs90VO3iPXhSR8JaN7x2IY=; b=Sp1yguci7KwbmCn+ty/9CqU0pvEPJkP8qRjfoJulAvF0w4T9znz9+s20wBbW9ekWgS iV/LWfcegjOpJEwCgeIPLY2MOQkyy3S10N69ZgGnZE/O6CCTSWLwj6tcM3SCbpyOYPhe I9XmudgCdiFozGWu3A9iTlHbOE5Lhv++wEykJV/eIzyry59nDzKdc2RKwfQE3B8hzT8p bdFW22a39b2Jt1H2+fvlr7rzAImemzRJdBngvtEc1Pz3uPtE2W7ZK620TG75N1SD9bqx A7+7ow/WItOW3cYhJUeSSTgg4mo5SEXu/FX+oCAaPkv916TPyNo1D80nQYNl3xzyY5JM RG2w== X-Gm-Message-State: AOUpUlHmUk7l0fR5ZJ9Qudcs0beYNten1Z21JuINAExfifCLGjJoK2If hrTR99p129E5q5MXDzY2EXXxrQ== X-Google-Smtp-Source: AA+uWPxYNurYc+HnkMKAZMixu8wqvH0Cc03EYWd/cEzk5rSegr6Ch+ARZQ9ph7GiX/qz8SkIpEdo1A== X-Received: by 2002:a17:902:8f8c:: with SMTP id z12-v6mr20890675plo.4.1534266416567; Tue, 14 Aug 2018 10:06:56 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c8e0:70d7:4be7:a36]) by smtp.gmail.com with ESMTPSA id d19-v6sm67940763pfe.42.2018.08.14.10.06.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Aug 2018 10:06:55 -0700 (PDT) From: Douglas Anderson To: broonie@kernel.org Cc: linux-arm-msm@vger.kernel.org, bjorn.andersson@linaro.org, collinsd@codeaurora.org, swboyd@chromium.org, Douglas Anderson , Liam Girdwood , linux-kernel@vger.kernel.org Subject: [PATCH 3/4] regulator: core: Add consumer-requested load in regulator_summary Date: Tue, 14 Aug 2018 10:06:16 -0700 Message-Id: <20180814170617.100087-4-dianders@chromium.org> X-Mailer: git-send-email 2.18.0.865.gffc8e1a3cd6-goog In-Reply-To: <20180814170617.100087-1-dianders@chromium.org> References: <20180814170617.100087-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It's handy to see the load requested by a regulator consumer in the regulator_summary. Add it. Since this patch comes after the patch ("regulator: core: If consumers don't call regulator_set_load() assume max") we'll also differentiate between the case where a consumer hasn't called regulator_set_load() and the case where a consumer called it but the load is currently 0 mA. Signed-off-by: Douglas Anderson --- drivers/regulator/core.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index b8b8048efbdd..23f64faa6961 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -4709,9 +4709,16 @@ static void regulator_summary_show_subtree(struct seq_file *s, switch (rdev->desc->type) { case REGULATOR_VOLTAGE: - seq_printf(s, "%45dmV %5dmV", - consumer->voltage[PM_SUSPEND_ON].min_uV / 1000, - consumer->voltage[PM_SUSPEND_ON].max_uV / 1000); + if (consumer->uA_load_set) { + seq_printf(s, "%37dmA %5dmV %5dmV", + consumer->uA_load / 1000, + consumer->voltage[PM_SUSPEND_ON].min_uV / 1000, + consumer->voltage[PM_SUSPEND_ON].max_uV / 1000); + } else { + seq_printf(s, "%45dmV %5dmV", + consumer->voltage[PM_SUSPEND_ON].min_uV / 1000, + consumer->voltage[PM_SUSPEND_ON].max_uV / 1000); + } break; case REGULATOR_CURRENT: break;