From patchwork Wed Nov 11 09:06:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 11897007 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64DB8C4742C for ; Wed, 11 Nov 2020 09:08:50 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E20EF206F1 for ; Wed, 11 Nov 2020 09:08:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="iVCLJN8p"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="oU+aGEmh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E20EF206F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=bEqRQAaudutLEI0TOi8rQhTWuAS+Mw0EiRjgedCiOPA=; b=iVCLJN8pb4rmKpcyT/nMY4Wby OT5qyrRX5xu4VzOPbryJ+MQ03cUPvhDofZ7j9HPbRrBd7lXYew75ULZqyhUBK2ZiChLHIjzPcCpm5 +8TmDj52V4+v9/Bn8FtJLVG6io+u9up+XmC32tzfrP9HTe77DsXVQAwtuOnLd5ogBE0D8FHW52nHC 3mortmT0qcY9XKfaPj3feafj2fugA2ETR8GKde/wnFnwb54SGAVUsmKEy7o0GizTQTrdD85zRzXS3 Z3S31DSB+LgePdhSAw15rF4RFcHpg662iIeBEa6xpyeBqO8sYMDHK8x8jMwVMWk78Y/v97eXr/3eO yMkbyLGiA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcm6C-0003zM-0D; Wed, 11 Nov 2020 09:07:28 +0000 Received: from esa2.microchip.iphmx.com ([68.232.149.84]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcm65-0003xu-P3 for linux-arm-kernel@lists.infradead.org; Wed, 11 Nov 2020 09:07:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1605085641; x=1636621641; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=b/5OjSM9VK1XMAdLydktZ7tDE6fgDTRGJoBG4hNXffM=; b=oU+aGEmhU7EvniAkS48C9O8182gALjrRIJoMYUqWqlF/r2YQWN9IhUcL k4ucRfVyVWaAE7MkP/XdImE/P58ncThGIYDH61Rj2PrA4wQiFlfd7UH+Y h0mz4i+wuQR61WlGFHYo+jB1SoyXKRkKGAOmuicdxvMyMu3hJ3sXMvnOM PbCWHg1FF9AZzAD6PDfBVLVotX0L7Hczaf6gs2u7AfpLZkBQ5NhLddyUe cMya3q0mwZz2bRgl7rsnvkv5r9qnfM36mzVurUWAJiMcZkCcqFNYcPw8T FNPBep3FHmAQgrpyDTIQaGq5We9vgXaTrqX/8fxWEdIgynOf4Nw87Thec Q==; IronPort-SDR: 9Wyz7SN26vF/d7IlZ7Zw0pjy4XySquLGnIMG+Bwk5gR+abZGvWyeox14z7/TGN0GYEsOmyzmpg tUF3TpQt9VhBW+vs75quITI1hizqPm8m/XpKChcKGbie12ZSv56ELTN699jyW8q5SOvffS5tzV HzWsu35qGGyqSVtMb9scWpdIFZMm+MTlKYBqtF2XiDlcU6Diy/KmyCNHubCFjOPhfpoqwkPZhY eiwU44epRez2HG371A8nAtDNInFnazNIfxedRkGPTxWczJOy293bpkbfV7Ef6xGYZCiJ9yhklI wqU= X-IronPort-AV: E=Sophos;i="5.77,469,1596524400"; d="scan'208";a="95887102" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 11 Nov 2020 02:07:20 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Wed, 11 Nov 2020 02:07:20 -0700 Received: from m18063-ThinkPad-T460p.microchip.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Wed, 11 Nov 2020 02:07:17 -0700 From: Claudiu Beznea To: , Subject: [PATCH v2 1/6] regulator: core: validate selector against linear_min_sel Date: Wed, 11 Nov 2020 11:06:13 +0200 Message-ID: <1605085578-6783-2-git-send-email-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1605085578-6783-1-git-send-email-claudiu.beznea@microchip.com> References: <1605085578-6783-1-git-send-email-claudiu.beznea@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201111_040721_961722_97414249 X-CRM114-Status: GOOD ( 13.94 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: axel.lin@ingics.com, s.hauer@pengutronix.de, linux-kernel@vger.kernel.org, Claudiu Beznea , ttynkkynen@nvidia.com, linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org There are regulators who's min selector is not zero. Selectors loops (looping b/w zero and regulator::desc::n_voltages) might throw errors because invalid selectors are used (lower than regulator::desc::linear_min_sel). For this situations validate selectors against regulator::desc::linear_min_sel. Fixes: 3a40cfc36bb3d ("regulator: core: create unlocked version of regulator_list_voltage") Fixes: 04eca28cde52c ("regulator: Add helpers for low-level register access") Fixes: 88cd222b259d6 ("regulator: provide consumer interface for fall/rise time") Fixes: d295f7670127e ("regulator: core: Move list_voltage_{linear,linear_range,table} to helpers.c") Signed-off-by: Claudiu Beznea --- drivers/regulator/core.c | 9 +++++++-- drivers/regulator/helpers.c | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 2e1ea18221ef..1d0d35f14f37 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2958,7 +2958,8 @@ static int _regulator_list_voltage(struct regulator_dev *rdev, return rdev->desc->fixed_uV; if (ops->list_voltage) { - if (selector >= rdev->desc->n_voltages) + if (selector >= rdev->desc->n_voltages || + selector < rdev->desc->linear_min_sel) return -EINVAL; if (lock) regulator_lock(rdev); @@ -3109,7 +3110,8 @@ int regulator_list_hardware_vsel(struct regulator *regulator, struct regulator_dev *rdev = regulator->rdev; const struct regulator_ops *ops = rdev->desc->ops; - if (selector >= rdev->desc->n_voltages) + if (selector >= rdev->desc->n_voltages || + selector < rdev->desc->linear_min_sel) return -EINVAL; if (ops->set_voltage_sel != regulator_set_voltage_sel_regmap) return -EOPNOTSUPP; @@ -4032,6 +4034,9 @@ int regulator_set_voltage_time(struct regulator *regulator, for (i = 0; i < rdev->desc->n_voltages; i++) { /* We only look for exact voltage matches here */ + if (i < rdev->desc->linear_min_sel) + continue; + voltage = regulator_list_voltage(regulator, i); if (voltage < 0) return -EINVAL; diff --git a/drivers/regulator/helpers.c b/drivers/regulator/helpers.c index e4bb09bbd3fa..974f1a63993d 100644 --- a/drivers/regulator/helpers.c +++ b/drivers/regulator/helpers.c @@ -647,7 +647,8 @@ int regulator_list_voltage_table(struct regulator_dev *rdev, return -EINVAL; } - if (selector >= rdev->desc->n_voltages) + if (selector >= rdev->desc->n_voltages || + selector < rdev->desc->linear_min_sel) return -EINVAL; return rdev->desc->volt_table[selector]; From patchwork Wed Nov 11 09:06:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 11896999 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B14FC56202 for ; Wed, 11 Nov 2020 09:08:45 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F2109206E3 for ; Wed, 11 Nov 2020 09:08:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="1oWlQj+a"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="PMwNgsQ8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F2109206E3 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=IseH0eIhvo2nLDp2EAjZbcySI+h6N5RxHJ8bsMSgkiQ=; b=1oWlQj+aVDJ2aos4gXIUvowhp 70koERbLVKJUtGYb2BuxDvfxedXIh0F/I4vrCNHw0EzYkKDzqlOQN5ITe/7b74qKAwVXQma1orzX7 wqrk5wsg6r6zT9VV1fTHOkEoVoDhBeKhlu1W7nnEgqr/tGZ0lHix59pBFOEr3A1aEkBN1tCXxTbT+ 9XKxrTrJUp8d0GLGwKjX/Tp3umTwRDcpt+bkstblHhWkgknJFi+Nyz5TGiUy9a7WVxkIq3rRH5ldt V+zTHc02LYPJKBY0VrruHjvu3Vx1jR8zk8D99JS/beZdYKVQH4MAJ7AaXr+xmqts5YytBymVQE6G0 GbKhbofCQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcm6E-00040G-NO; Wed, 11 Nov 2020 09:07:30 +0000 Received: from esa4.microchip.iphmx.com ([68.232.154.123]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcm6A-0003yp-R8 for linux-arm-kernel@lists.infradead.org; Wed, 11 Nov 2020 09:07:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1605085646; x=1636621646; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=qi4ydAI8o4oJpJGd7zvYmGVBebnhYeEm03dyN/oO0L4=; b=PMwNgsQ81zbfFK5BhVYgPAp+LrM9GN5bsf1ZhShejvfFomjUj/2611PQ w/UhCYZAyUsSLirCg9DgtxajpWlcMo4WrNl7Me1fgwm2aB+VQAlURsXLX wm9i0ZBygg2cNEM1QYkVLdajWMkz9WBByv4XTAixrAU1v52XMJeE/Zxdk K8E0H8yAtgx/OAofAABpKPin9+tFSUMKHwlNVbpKfdrn25A5OIOw3CWIT S/lYN/uZGxHztZ+yM29OJO+rSLYG9wKpYL9gyj4EK30uNtf+VywQ0QmYI V/LWanxbwXHkH9atCy2OSLmiN6ZO1NZDosJsyTJvNKsG+X8J/pH0D7AS4 Q==; IronPort-SDR: qeKFsRDBJkGfBlgTc2lcIKHN1zJvPcWtyFfhip8IpDWl9XJU0d6ncieFhIIynyHnD8xN3LjizU 85ZKnbTydQlXrwuT4EPnH90HVy92W25eCgrxj8VXAchDlzWtXy8N4MTejibasfbzBSJkguP5da UimbWR809BOZ7kIUQZvGo5cm4asGPBnvwfDONFet2tm2i6zLpJJAyAe2fW1EtvRYfJDUE47ffN 0Hf/dLgDUBZJagu+RLwPAFWiZZdHUdCCeAvie56iJLIRYxHd6SO3arJJBplVTJVXTAsdM6uuVZ 5Ao= X-IronPort-AV: E=Sophos;i="5.77,469,1596524400"; d="scan'208";a="93264667" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 11 Nov 2020 02:07:24 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Wed, 11 Nov 2020 02:07:24 -0700 Received: from m18063-ThinkPad-T460p.microchip.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Wed, 11 Nov 2020 02:07:20 -0700 From: Claudiu Beznea To: , Subject: [PATCH v2 2/6] regulator: core: do not continue if selector match Date: Wed, 11 Nov 2020 11:06:14 +0200 Message-ID: <1605085578-6783-3-git-send-email-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1605085578-6783-1-git-send-email-claudiu.beznea@microchip.com> References: <1605085578-6783-1-git-send-email-claudiu.beznea@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201111_040727_045576_F499FFC5 X-CRM114-Status: GOOD ( 10.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: axel.lin@ingics.com, s.hauer@pengutronix.de, linux-kernel@vger.kernel.org, Claudiu Beznea , ttynkkynen@nvidia.com, linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Do not continue if selector has already been located. Signed-off-by: Claudiu Beznea --- drivers/regulator/core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 1d0d35f14f37..6724324d372c 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -4037,6 +4037,9 @@ int regulator_set_voltage_time(struct regulator *regulator, if (i < rdev->desc->linear_min_sel) continue; + if (old_sel >= 0 && new_sel >= 0) + break; + voltage = regulator_list_voltage(regulator, i); if (voltage < 0) return -EINVAL; From patchwork Wed Nov 11 09:06:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 11897003 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CB23C4742C for ; Wed, 11 Nov 2020 09:09:06 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 11411206E3 for ; Wed, 11 Nov 2020 09:09:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mgZqhaX3"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="s6ROAJMO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 11411206E3 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+kwv0bC+5FqOWMvcS3+wLN6YkHlS1RMuyeKx2Ug5h2o=; b=mgZqhaX34OF+MiwIbJV5ekUun F8DlFOD585IUg2yE9qN+oRseqwKcyFo+l65uGKfprwuogqLSJ/p5CCd8e5RMx/9kxfHlwz83z8qei +KMj31cD2Hw7FHfP00WHbO1mD0TLxiYrmuiNIvVIaJEKlxvgCjXBOUmc9LqxiZTiJfkQ4KBzK05E2 qKfWUxV0Z4ZwKUm5A+bpxP41VFTDyzDU+CJ7Ru+cTHsNFgr09BeNKUrL9VjX3zGmOt+0sn0QGfLQZ racy0nFvjQan70U06ZVBFcPnTKY8bmHmJpndtvCDayBLHZ1TcRXUkUT3yvpmZEl9YodwP/ysKcBDu g0XkyGOTg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcm6I-00041C-OG; Wed, 11 Nov 2020 09:07:34 +0000 Received: from esa2.microchip.iphmx.com ([68.232.149.84]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcm6D-0003ze-8e for linux-arm-kernel@lists.infradead.org; Wed, 11 Nov 2020 09:07:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1605085649; x=1636621649; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=2XK5086b4/MoCuZ+5zlGoPQBBXPieOKx5f8lfuzIdtM=; b=s6ROAJMOA/2L7OBSzOIV7M3yVfSwrLGdBuJBEwfrqCsz3uwnvjKRHzNP RF/PhTwqIF5b8P4+K/9jL1cpCzGXt0bRT60f5yHbeG5/YjsePhk5hD7zY qrzPZkYEOaBgHLksZG6cLNR9xlTEgqMiBBK2P9tPl/92OhJ/gyEfiTcso ASiN26TVZ+CX11Ay7Q/s2p422Ul1qqSsFgykMyfJOGAaCEBIP3CPJDFg8 RfydUeDXDqlWpFhn0tL/AjlN0JwQARPGihlN1gHBaRU4TSx8ub177Elj4 H4RE7uHw8ClDKZtyYLb434BnlsGsHlbVEOkleA/mPutnaq+QHYQjjhgos A==; IronPort-SDR: T/bf+MrKpolLffhcRK8MsDJGib57H4fMZfNyUUoWL9MaifZIaJWPFKO9QRzcRi9csX9Iw1XXZu FwHZt55pfzEtKhtWiGmZaUxy4XOOTvf5FWAEbqNt2CgQPlgBaKdrcrMIFcsCxNkpgqSqL7XgZl ITVR8nohICEYVaA6ZWSqYIuVruidIVT5Yru7D18DVD8eYHujfhbtvviovq61iGqA0tKtrnJ2th hp4HKUnuiPKD2rhPWIhpITPvg/v/VJFtRoRrw6/tWGKkmZa7EIm29Pynq3zBJIZIldzbF1Knzx wzk= X-IronPort-AV: E=Sophos;i="5.77,469,1596524400"; d="scan'208";a="95887113" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 11 Nov 2020 02:07:28 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Wed, 11 Nov 2020 02:07:28 -0700 Received: from m18063-ThinkPad-T460p.microchip.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Wed, 11 Nov 2020 02:07:24 -0700 From: Claudiu Beznea To: , Subject: [PATCH v2 3/6] regulator: mcp16502: add linear_min_sel Date: Wed, 11 Nov 2020 11:06:15 +0200 Message-ID: <1605085578-6783-4-git-send-email-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1605085578-6783-1-git-send-email-claudiu.beznea@microchip.com> References: <1605085578-6783-1-git-send-email-claudiu.beznea@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201111_040729_478824_D9E6F180 X-CRM114-Status: GOOD ( 11.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: axel.lin@ingics.com, s.hauer@pengutronix.de, linux-kernel@vger.kernel.org, Claudiu Beznea , ttynkkynen@nvidia.com, linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Selectors b/w zero and VDD_LOW_SEL are not valid. Use linear_min_sel. Fixes: 919261c03e7ca ("regulator: mcp16502: add regulator driver for MCP16502") Signed-off-by: Claudiu Beznea --- drivers/regulator/mcp16502.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/regulator/mcp16502.c b/drivers/regulator/mcp16502.c index 6d0ad74935b3..ab78f831f5bf 100644 --- a/drivers/regulator/mcp16502.c +++ b/drivers/regulator/mcp16502.c @@ -93,6 +93,7 @@ static unsigned int mcp16502_of_map_mode(unsigned int mode) .owner = THIS_MODULE, \ .n_voltages = MCP16502_VSEL + 1, \ .linear_ranges = _ranges, \ + .linear_min_sel = VDD_LOW_SEL, \ .n_linear_ranges = ARRAY_SIZE(_ranges), \ .of_match = of_match_ptr(_name), \ .of_map_mode = mcp16502_of_map_mode, \ From patchwork Wed Nov 11 09:06:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 11896997 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E795CC388F9 for ; Wed, 11 Nov 2020 09:09:05 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6CB84206E3 for ; Wed, 11 Nov 2020 09:09:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="KgOp6CfF"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="GBfxyYKO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6CB84206E3 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=z7PGBeYo4TtcH8zl1CoeHYX/hlds4a/a19gB9REiDno=; b=KgOp6CfFVVu7mbhviLqZW6qYZ 6yiiqagJ/WGc+R7jyCONJjst1wYXwZCF4S1i/viRS88HAJyInl/XSl4VvUbmQzSz8hM5dSNO0ajZS ECOQNocyAghL/B8M8sUfwZYIcKp+6bdqkUPSJzqthhfOyWZ++GZIPjC8w9/f912B1IyAIcFsaInkP FYq/ZT1tMegGUVdKE6CujDVj8h8LjFQOLr8soR3JSwPsWm26/xgDtaFL1V1g0jBIm/YoKrOILSVJ8 HR/Wdx/K0/DnBFjDebe4k5T2UZ+EQ1BnhxBmw3Y5eVL9er24VzDUEQKmrjgwU1BmWHXjhmFypfuB3 /CQ8uspOw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcm6O-00042e-I8; Wed, 11 Nov 2020 09:07:40 +0000 Received: from esa4.microchip.iphmx.com ([68.232.154.123]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcm6G-0003yp-Ms for linux-arm-kernel@lists.infradead.org; Wed, 11 Nov 2020 09:07:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1605085652; x=1636621652; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=n+2kDWPFZI5Ji0zVR0elRY7r1xjxPZHctLTadiVY/zQ=; b=GBfxyYKOHQiHFxIxdqbcISiZe5BZQ5QSTJPkdMnoaKMWxS6m1MLqXPp8 ow2WJJ5o130ZTqBLnBLaaXx4SzJ1Wvt2wpZGQjGxRYm0r+Dgv1UCbdLxA 85ijx132iEHORNyAkw5Khs4EpHRkYxH+dJbJntcbosRQTLzS2S1hp2ALC vF2zjNmFbfgc4GZy2bPu5zzUg1DODS+1nmXNxrxyg1pvF5SwQCMspn5bE hzYkI0EK9QzXnQm18fylgdAV5j/n2N0aCkOZMXRw9NSvNJTNOEPlxrSGI +sQcchM/LdEpEIkuUOO8gRKY+JluyQ9Ya8+nhH+y+vNm+2IZStbXMMMrv Q==; IronPort-SDR: zwCFLhPuvanXCzwFpqcWtoD213qh0yU5CsphMDHgGlDRQAaeYbi7rXPULOM96dJDokp3sdFWex 0mvgEq8ZSZ3IbvKpfOo+fblknndXPj1HGA2fDcCHfLdZTFfPfdLWoRKApdDMV8n9yE0bI7D0Vf 3894OqSAvnzKkJNzQgFrEdngbN4H0boJBGjQCXjEryJUxPUDzJxOy4vJzNN2AMkjA0jSTlJ1s2 ebXEWqgQmtmk+JDV6xzDO55AhiZvyiaf2il27oh7Y4nGD56gnzTwP/zV/O+45dzShw2Zxx0qeo RXo= X-IronPort-AV: E=Sophos;i="5.77,469,1596524400"; d="scan'208";a="93264673" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 11 Nov 2020 02:07:32 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Wed, 11 Nov 2020 02:07:32 -0700 Received: from m18063-ThinkPad-T460p.microchip.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Wed, 11 Nov 2020 02:07:28 -0700 From: Claudiu Beznea To: , Subject: [PATCH v2 4/6] regulator: mcp16502: adapt for get/set on other registers Date: Wed, 11 Nov 2020 11:06:16 +0200 Message-ID: <1605085578-6783-5-git-send-email-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1605085578-6783-1-git-send-email-claudiu.beznea@microchip.com> References: <1605085578-6783-1-git-send-email-claudiu.beznea@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201111_040732_977940_6F121605 X-CRM114-Status: GOOD ( 13.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: axel.lin@ingics.com, s.hauer@pengutronix.de, linux-kernel@vger.kernel.org, Claudiu Beznea , ttynkkynen@nvidia.com, linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org MCP16502 have multiple registers for each regulator (as described in enum mcp16502_reg). Adapt the code to be able to get/set all these registers. This is necessary for the following commits. Signed-off-by: Claudiu Beznea --- drivers/regulator/mcp16502.c | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/drivers/regulator/mcp16502.c b/drivers/regulator/mcp16502.c index ab78f831f5bf..48eb64bc4018 100644 --- a/drivers/regulator/mcp16502.c +++ b/drivers/regulator/mcp16502.c @@ -54,13 +54,9 @@ * This function is useful for iterating over all regulators and accessing their * registers in a generic way or accessing a regulator device by its id. */ -#define MCP16502_BASE(i) (((i) + 1) << 4) +#define MCP16502_REG_BASE(i, r) ((((i) + 1) << 4) + MCP16502_REG_##r) #define MCP16502_STAT_BASE(i) ((i) + 5) -#define MCP16502_OFFSET_MODE_A 0 -#define MCP16502_OFFSET_MODE_LPM 1 -#define MCP16502_OFFSET_MODE_HIB 2 - #define MCP16502_OPMODE_ACTIVE REGULATOR_MODE_NORMAL #define MCP16502_OPMODE_LPM REGULATOR_MODE_IDLE #define MCP16502_OPMODE_HIB REGULATOR_MODE_STANDBY @@ -75,6 +71,23 @@ #define MCP16502_MIN_REG 0x0 #define MCP16502_MAX_REG 0x65 +/** + * enum mcp16502_reg - MCP16502 regulators's registers + * @MCP16502_REG_A: active state register + * @MCP16502_REG_LPM: low power mode state register + * @MCP16502_REG_HIB: hibernate state register + * @MCP16502_REG_SEQ: startup sequence register + * @MCP16502_REG_CFG: configuration register + */ +enum mcp16502_reg { + MCP16502_REG_A, + MCP16502_REG_LPM, + MCP16502_REG_HIB, + MCP16502_REG_HPM, + MCP16502_REG_SEQ, + MCP16502_REG_CFG, +}; + static unsigned int mcp16502_of_map_mode(unsigned int mode) { if (mode == REGULATOR_MODE_NORMAL || mode == REGULATOR_MODE_IDLE) @@ -144,22 +157,20 @@ static void mcp16502_gpio_set_mode(struct mcp16502 *mcp, int mode) } /* - * mcp16502_get_reg() - get the PMIC's configuration register for opmode + * mcp16502_get_reg() - get the PMIC's state configuration register for opmode * * @rdev: the regulator whose register we are searching * @opmode: the PMIC's operating mode ACTIVE, Low-power, Hibernate */ -static int mcp16502_get_reg(struct regulator_dev *rdev, int opmode) +static int mcp16502_get_state_reg(struct regulator_dev *rdev, int opmode) { - int reg = MCP16502_BASE(rdev_get_id(rdev)); - switch (opmode) { case MCP16502_OPMODE_ACTIVE: - return reg + MCP16502_OFFSET_MODE_A; + return MCP16502_REG_BASE(rdev_get_id(rdev), A); case MCP16502_OPMODE_LPM: - return reg + MCP16502_OFFSET_MODE_LPM; + return MCP16502_REG_BASE(rdev_get_id(rdev), LPM); case MCP16502_OPMODE_HIB: - return reg + MCP16502_OFFSET_MODE_HIB; + return MCP16502_REG_BASE(rdev_get_id(rdev), HIB); default: return -EINVAL; } @@ -179,7 +190,7 @@ static unsigned int mcp16502_get_mode(struct regulator_dev *rdev) unsigned int val; int ret, reg; - reg = mcp16502_get_reg(rdev, MCP16502_OPMODE_ACTIVE); + reg = mcp16502_get_state_reg(rdev, MCP16502_OPMODE_ACTIVE); if (reg < 0) return reg; @@ -210,7 +221,7 @@ static int _mcp16502_set_mode(struct regulator_dev *rdev, unsigned int mode, int val; int reg; - reg = mcp16502_get_reg(rdev, op_mode); + reg = mcp16502_get_state_reg(rdev, op_mode); if (reg < 0) return reg; @@ -269,10 +280,10 @@ static int mcp16502_suspend_get_target_reg(struct regulator_dev *rdev) { switch (pm_suspend_target_state) { case PM_SUSPEND_STANDBY: - return mcp16502_get_reg(rdev, MCP16502_OPMODE_LPM); + return mcp16502_get_state_reg(rdev, MCP16502_OPMODE_LPM); case PM_SUSPEND_ON: case PM_SUSPEND_MEM: - return mcp16502_get_reg(rdev, MCP16502_OPMODE_HIB); + return mcp16502_get_state_reg(rdev, MCP16502_OPMODE_HIB); default: dev_err(&rdev->dev, "invalid suspend target: %d\n", pm_suspend_target_state); From patchwork Wed Nov 11 09:06:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 11897001 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E5D4C56202 for ; Wed, 11 Nov 2020 09:09:06 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 26D78206F1 for ; Wed, 11 Nov 2020 09:09:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="2XqV1L8x"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="Wa4kqY0O" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 26D78206F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=zNgWbXDo7RwNwMFrHVy+fap6zrJP9H79I5+vWsHX4D0=; b=2XqV1L8xj53s5WDvXjptOIp95 IMG7pf2YxnTfgwWUDz213RunFB4uBp6e6m5oTUhQYThtg4BjjTq8IrOmORZ7uSbFXyorwIJ1ejJqL ZNouCPiOdddKEC+xjrB9nEoF4PKa7yrBIHYrh2C6eEbrwfDzlyxlypIopMngqgh48FjGMlBceKatg zhs0DBqnO9mmd4eGX/OdCP+JoFRpoCibaG0YxSl2vwUg+57UZzYBMIfPBMW+j5MZP+k5RXwBj8jPT 7c7l8yIh85lm9QMWL5fKg96xPgnGlpLsgCNc4Tt0Dt/+FWt44U2xEBRup+tI0ny2O1lm2OyI8aMGe nT6T774wA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcm6S-00044T-RM; Wed, 11 Nov 2020 09:07:44 +0000 Received: from esa4.microchip.iphmx.com ([68.232.154.123]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcm6K-0003yp-BV for linux-arm-kernel@lists.infradead.org; Wed, 11 Nov 2020 09:07:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1605085656; x=1636621656; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=W9PR6krF29oMp6eQyd6TqdoQp291Aij+lhywEtVU4gA=; b=Wa4kqY0OEfLoy4Rh0GTNU19Ue+jzSFH6r90E5BpCL1Ud8+/NhpsHCCNk NgYWWJm6NzCtakdVYF+D4RHuNcBIDdL20ugUS+1c92T29DyY6Jj3Ynnlj nc0Hy70IFoYyEWhL0tJoDvstW33HrSTnywbxZwB1bylZtFxgV07C3Jvgf 2DE+1o5gajMZPztAxj0e8WdXyAq115Z0ssaNDv6vbeIbicVaFilE5aFAu +0MlxoT39fEscqypKIMh1LmqGR6+UxlkmubYMH1L2ElyztnWFVufG6yXD 2SV1D72XGySNzXmv9WGcBNkkfEsVxeOLaL0u3STJdjoN3csYEfySSnLEj w==; IronPort-SDR: YpbTnxcABhZD+77TfCyCcGQ5f/xo9QIGWW6zGf56axsrYmVXHdRoNPdxMIz9nDRNMLlq92G8kz wmO/tyhSetCuXP5iY4Je0ySqh0BuXnUvgf+OfeEJyxs9mpUguBlMV1+Qq0SJkWqvucywuVHdIx YcLjaZUsx4sLsgY8Q269J8mwgFfYUPFtc45N7FGu36TA9Xa44NuIKsDsz4uyCpe4Kk8cGz2TZK cEpfk0TxU8vq+CDX8XXGby3rsEdzmHnHg2NSrnziAnvtG2c8uwz/+8EO9yZIyrisTw1eLSZNZC sdk= X-IronPort-AV: E=Sophos;i="5.77,469,1596524400"; d="scan'208";a="93264679" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 11 Nov 2020 02:07:35 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Wed, 11 Nov 2020 02:07:35 -0700 Received: from m18063-ThinkPad-T460p.microchip.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Wed, 11 Nov 2020 02:07:32 -0700 From: Claudiu Beznea To: , Subject: [PATCH v2 5/6] regulator: mcp16502: add support for ramp delay Date: Wed, 11 Nov 2020 11:06:17 +0200 Message-ID: <1605085578-6783-6-git-send-email-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1605085578-6783-1-git-send-email-claudiu.beznea@microchip.com> References: <1605085578-6783-1-git-send-email-claudiu.beznea@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201111_040737_499104_C7A735B2 X-CRM114-Status: GOOD ( 17.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: axel.lin@ingics.com, s.hauer@pengutronix.de, linux-kernel@vger.kernel.org, Claudiu Beznea , ttynkkynen@nvidia.com, linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org MCP16502 have configurable ramp delay support (via DVSR bits in regulators' CFG register). Signed-off-by: Claudiu Beznea Reported-by: kernel test robot --- drivers/regulator/mcp16502.c | 89 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 2 deletions(-) diff --git a/drivers/regulator/mcp16502.c b/drivers/regulator/mcp16502.c index 48eb64bc4018..777d1a6cd1c5 100644 --- a/drivers/regulator/mcp16502.c +++ b/drivers/regulator/mcp16502.c @@ -22,8 +22,9 @@ #define VDD_LOW_SEL 0x0D #define VDD_HIGH_SEL 0x3F -#define MCP16502_FLT BIT(7) -#define MCP16502_ENS BIT(0) +#define MCP16502_FLT BIT(7) +#define MCP16502_DVSR GENMASK(3, 2) +#define MCP16502_ENS BIT(0) /* * The PMIC has four sets of registers corresponding to four power modes: @@ -88,6 +89,12 @@ enum mcp16502_reg { MCP16502_REG_CFG, }; +/* Ramp delay (uV/us) for buck1, ldo1, ldo2. */ +static const int mcp16502_ramp_b1l12[] = { 6250, 3125, 2083, 1563 }; + +/* Ramp delay (uV/us) for buck2, buck3, buck4. */ +static const int mcp16502_ramp_b234[] = { 3125, 1563, 1042, 781 }; + static unsigned int mcp16502_of_map_mode(unsigned int mode) { if (mode == REGULATOR_MODE_NORMAL || mode == REGULATOR_MODE_IDLE) @@ -271,6 +278,80 @@ static int mcp16502_get_status(struct regulator_dev *rdev) return REGULATOR_STATUS_UNDEFINED; } +static int mcp16502_set_voltage_time_sel(struct regulator_dev *rdev, + unsigned int old_sel, + unsigned int new_sel) +{ + static const u8 us_ramp[] = { 8, 16, 24, 32 }; + int id = rdev_get_id(rdev); + unsigned int uV_delta, val; + int ret; + + ret = regmap_read(rdev->regmap, MCP16502_REG_BASE(id, CFG), &val); + if (ret) + return ret; + + val = (val & MCP16502_DVSR) >> 2; + uV_delta = abs(new_sel * rdev->desc->linear_ranges->uV_step - + old_sel * rdev->desc->linear_ranges->uV_step); + switch (id) { + case BUCK1: + case LDO1: + case LDO2: + ret = DIV_ROUND_CLOSEST(uV_delta * us_ramp[val], + mcp16502_ramp_b1l12[val]); + break; + + case BUCK2: + case BUCK3: + case BUCK4: + ret = DIV_ROUND_CLOSEST(uV_delta * us_ramp[val], + mcp16502_ramp_b234[val]); + break; + + default: + return -EINVAL; + } + + return ret; +} + +static int mcp16502_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay) +{ + const int *ramp; + int id = rdev_get_id(rdev); + unsigned int i, size; + + switch (id) { + case BUCK1: + case LDO1: + case LDO2: + ramp = mcp16502_ramp_b1l12; + size = ARRAY_SIZE(mcp16502_ramp_b1l12); + break; + + case BUCK2: + case BUCK3: + case BUCK4: + ramp = mcp16502_ramp_b234; + size = ARRAY_SIZE(mcp16502_ramp_b234); + break; + + default: + return -EINVAL; + } + + for (i = 0; i < size; i++) { + if (ramp[i] == ramp_delay) + break; + } + if (i == size) + return -EINVAL; + + return regmap_update_bits(rdev->regmap, MCP16502_REG_BASE(id, CFG), + MCP16502_DVSR, (i << 2)); +} + #ifdef CONFIG_SUSPEND /* * mcp16502_suspend_get_target_reg() - get the reg of the target suspend PMIC @@ -365,6 +446,8 @@ static const struct regulator_ops mcp16502_buck_ops = { .disable = regulator_disable_regmap, .is_enabled = regulator_is_enabled_regmap, .get_status = mcp16502_get_status, + .set_voltage_time_sel = mcp16502_set_voltage_time_sel, + .set_ramp_delay = mcp16502_set_ramp_delay, .set_mode = mcp16502_set_mode, .get_mode = mcp16502_get_mode, @@ -389,6 +472,8 @@ static const struct regulator_ops mcp16502_ldo_ops = { .disable = regulator_disable_regmap, .is_enabled = regulator_is_enabled_regmap, .get_status = mcp16502_get_status, + .set_voltage_time_sel = mcp16502_set_voltage_time_sel, + .set_ramp_delay = mcp16502_set_ramp_delay, #ifdef CONFIG_SUSPEND .set_suspend_voltage = mcp16502_set_suspend_voltage, From patchwork Wed Nov 11 09:06:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 11896985 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E1BCC388F9 for ; Wed, 11 Nov 2020 09:08:19 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 75750206E3 for ; Wed, 11 Nov 2020 09:08:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="j5e+PExz"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="ePPNxjRR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 75750206E3 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ruYXJ0ti/nGKij+sz+hc8hJahkPRuL98qkfYS8Rl8k8=; b=j5e+PExzXpoit238HWaY7iFpc QN+RVx8tdfp3SJBq96kG3MIS0jf+Q9LsEfTyWOulc4bpUnxLPelQWq2l7s0cLWF6Oi/QcPF6D4l1V zt5C2MJwyLq1QC90gu6F0eOxiWcT9Sa6H5DL0pjWdDajjuQhifbcND1DtGy5z+6MGy4RkUMpYzIMG AggY+JTeYyThVBEE+XEQW2FQNxBfYa1goNjIX/4sVhATKvhlAqLCIh11NMUA1K4BCEO+7H5wICpwX MfUcAG6bjXaSczmCzMJuws6sNegpqsCscusLvhrTcfgumTqS6FrfZDeV9hnBTG176Gi03jiO91D9N SKPYtjPeQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcm6b-00046C-7v; Wed, 11 Nov 2020 09:07:53 +0000 Received: from esa4.microchip.iphmx.com ([68.232.154.123]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcm6O-0003yp-3Y for linux-arm-kernel@lists.infradead.org; Wed, 11 Nov 2020 09:07:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1605085660; x=1636621660; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=eCi4EukJCBANf6WBfNViz9r4o2Ea2mcX7pgqcbOIWRM=; b=ePPNxjRRTFVazLnGX7MoIp1iZhXhXwBZBLVVCF2B/buBPMDoKWMdzVcD tpWALH/d2L6X9h21JNRLl8oeCu+K9iTU4An0pNhWLedspsOwd1E9tMvHX uXp6aXR5U0G7YnMXMYrIn+e0YE7IRqufYJlYHFnJIhuDaOxtQla1GB07f Cw53WmVDMyeyJNm97Ud+Vgfq0fKcv+ELcjvhs6MMcjgH7Nbyxf+gjbxHe X1KMKdtgRZjQjYZEKN+FuS9LsL0HljzAIZnWjfrNYEYsBoW+/ETG136Jy 0Sjzxami7h0tX0PhlyAxYxx2ZaOshEZz/LWwpXtf2L6HV8X3nvQTNtAiW w==; IronPort-SDR: IvBPkPUmi/apBFjGWLNvLSriTL0FZ2AYUwa+ee50sR9BggGktNCsxH+jmO+hBGbEkdcswdC6w9 Feq5jPnn2uk6qmrNTUiQQU+2bDj7HysCxDp3wYDcpqxQVE5pPoc1Y+dCJe3ZIfyt+kIIaqMrr1 p/xwcab3w+V0xz7C7IPOhSWI4nMbnfLRJ7+twTFQ9lfCrX+GyVAphanhtHyFniZC0IDehIrPCa Z7uWpsfSzIk/9QPwQv+bkA0DdyRVcX9yd5dWiMqu+jGn3zynIYa3k3F+HF+Z7BTAHTsaG0elOX thk= X-IronPort-AV: E=Sophos;i="5.77,469,1596524400"; d="scan'208";a="93264687" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 11 Nov 2020 02:07:39 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Wed, 11 Nov 2020 02:07:39 -0700 Received: from m18063-ThinkPad-T460p.microchip.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Wed, 11 Nov 2020 02:07:35 -0700 From: Claudiu Beznea To: , Subject: [PATCH v2 6/6] regulator: mcp16502: remove void documentation of struct mcp16502 Date: Wed, 11 Nov 2020 11:06:18 +0200 Message-ID: <1605085578-6783-7-git-send-email-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1605085578-6783-1-git-send-email-claudiu.beznea@microchip.com> References: <1605085578-6783-1-git-send-email-claudiu.beznea@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201111_040740_338301_4C1DA08D X-CRM114-Status: GOOD ( 10.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: axel.lin@ingics.com, s.hauer@pengutronix.de, linux-kernel@vger.kernel.org, Claudiu Beznea , ttynkkynen@nvidia.com, linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org struct mcp16502 has no members called rdev or rmap. Remove the documentation. Signed-off-by: Claudiu Beznea --- drivers/regulator/mcp16502.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/regulator/mcp16502.c b/drivers/regulator/mcp16502.c index 777d1a6cd1c5..c6b72d1d38a9 100644 --- a/drivers/regulator/mcp16502.c +++ b/drivers/regulator/mcp16502.c @@ -135,8 +135,6 @@ enum { /* * struct mcp16502 - PMIC representation - * @rdev: the regulators belonging to this chip - * @rmap: regmap to be used for I2C communication * @lpm: LPM GPIO descriptor */ struct mcp16502 {