From patchwork Tue Oct 21 13:19:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 5124991 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B887AC11AC for ; Tue, 21 Oct 2014 13:22:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DFE1420155 for ; Tue, 21 Oct 2014 13:22:53 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0B4D620121 for ; Tue, 21 Oct 2014 13:22:53 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XgZMe-00080y-NL; Tue, 21 Oct 2014 13:20:40 +0000 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XgZMX-0007wy-Mg for linux-arm-kernel@lists.infradead.org; Tue, 21 Oct 2014 13:20:34 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NDS006WEQI8IA30@mailout2.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 21 Oct 2014 14:22:56 +0100 (BST) X-AuditID: cbfec7f4-b7f6c6d00000120b-cc-54465d86368c Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 48.0F.04619.68D56445; Tue, 21 Oct 2014 14:20:07 +0100 (BST) Received: from AMDC1943.digital.local ([106.116.151.171]) by eusync1.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0NDS00G9ZQDE1310@eusync1.samsung.com>; Tue, 21 Oct 2014 14:20:06 +0100 (BST) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , linux-kernel@vger.kernel.org, Ben Dooks , Kukjin Kim , Russell King , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org, Samuel Ortiz , Lee Jones Subject: [PATCH v3 1/4] regulator: max77686: Replace hard-coded opmode values with defines Date: Tue, 21 Oct 2014 15:19:52 +0200 Message-id: <1413897595-28752-2-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1413897595-28752-1-git-send-email-k.kozlowski@samsung.com> References: <1413897595-28752-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrJLMWRmVeSWpSXmKPExsVy+t/xy7rtsW4hBrM9LDbOWM9qMWndASaL qQ+fsFlc//Kc1WL+kXOsFkd/F1i8fmFo0bvgKpvF2aY37Bb3vx5ltPh2pYPJYtPja6wWl3fN YbOYcX4fk8Xty7wWa4/cZbc43c3qIOjR0tzD5vH3+XUWj7+rXjB77Jx1l91j06pONo871/aw ecw7GeixeUm9R9+WVYwenzfJBXBFcdmkpOZklqUW6dslcGVMbjMt6JGoePBrN2sD42vhLkZO DgkBE4lTBy+yQNhiEhfurWfrYuTiEBJYyijx9/JKdginj0ni16YZzCBVbALGEpuXL2EDsUUE OpklvnwPACliFljNJPHzyimwImGBGIk52w4wgdgsAqoSn8/PYgSxeQXcJaaf+s8IsU5O4uSx yawgNqeAh8Tv3XuB4hxA29wlrn1OncDIu4CRYRWjaGppckFxUnquoV5xYm5xaV66XnJ+7iZG SHB/2cG4+JjVIUYBDkYlHt4Ny1xDhFgTy4orcw8xSnAwK4nw5gq7hQjxpiRWVqUW5ccXleak Fh9iZOLglGpglJl9bOom29OVJQazvq1J9uTa95+/Z1rv5e89i5/MPfzP5cNbKZ/FJQf37u5b mXWZ00mwPENEuV2z7uF1a26ZGeeF1NK3PJeyag6fWvszdp5+752IGt1T4u9fd1S3/exceb3m 10+JA9sDH1gmylyP36tRk9PIfn52pcGZml9r1iX9unHSlTmGSYmlOCPRUIu5qDgRAAUYB51M AgAA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141021_062033_898908_4B561927 X-CRM114-Status: GOOD ( 11.34 ) X-Spam-Score: -6.5 (------) Cc: Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Chanwoo Choi , Kyungmin Park , Javier Martinez Canillas , Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add defines for regulator operating modes which should be more readable, especially if one does not have Maxim 77686 datasheet. The patch does not introduce any functional change. Signed-off-by: Krzysztof Kozlowski Suggested-by: Javier Martinez Canillas Reviewed-by: Javier Martinez Canillas --- drivers/regulator/max77686.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c index ef1af2debbd2..3d0922051488 100644 --- a/drivers/regulator/max77686.c +++ b/drivers/regulator/max77686.c @@ -45,6 +45,25 @@ #define MAX77686_DVS_MINUV 600000 #define MAX77686_DVS_UVSTEP 12500 +/* Values used for configuring Buck[1234] */ +#define MAX77686_BUCK_OFF_PWRREQ 0x1 +#define MAX77686_BUCK_LOWPOWER 0x2 +#define MAX77686_BUCK_NORMAL 0x3 + +/* + * Values used for configuring LDOn: + * - LDO1, 3-5, 9, 13, 17-26: forcing low power mode + */ +#define MAX77686_LDO_LOWPOWER 0x1 +/* + * In the same time for LDOn: + * - LDO2, 6-8, 10-12, 14-16: on/off controlled by PWRREQ + */ +#define MAX77686_LDO_OFF_PWRREQ 0x1 +/* Low power mode controlled by PWRREQ */ +#define MAX77686_LDO_LOWPOWER_PWRREQ 0x2 +#define MAX77686_LDO_NORMAL 0x3 + #define MAX77686_OPMODE_SHIFT 6 #define MAX77686_OPMODE_BUCK234_SHIFT 4 #define MAX77686_OPMODE_MASK 0x3 @@ -76,9 +95,10 @@ static int max77686_buck_set_suspend_disable(struct regulator_dev *rdev) int ret, id = rdev_get_id(rdev); if (id == MAX77686_BUCK1) - val = 0x1; + val = MAX77686_BUCK_OFF_PWRREQ; else - val = 0x1 << MAX77686_OPMODE_BUCK234_SHIFT; + val = MAX77686_BUCK_OFF_PWRREQ + << MAX77686_OPMODE_BUCK234_SHIFT; ret = regmap_update_bits(rdev->regmap, rdev->desc->enable_reg, rdev->desc->enable_mask, val); @@ -103,10 +123,10 @@ static int max77686_set_suspend_mode(struct regulator_dev *rdev, switch (mode) { case REGULATOR_MODE_IDLE: /* ON in LP Mode */ - val = 0x2 << MAX77686_OPMODE_SHIFT; + val = MAX77686_LDO_LOWPOWER_PWRREQ << MAX77686_OPMODE_SHIFT; break; case REGULATOR_MODE_NORMAL: /* ON in Normal Mode */ - val = 0x3 << MAX77686_OPMODE_SHIFT; + val = MAX77686_LDO_NORMAL << MAX77686_OPMODE_SHIFT; break; default: pr_warn("%s: regulator_suspend_mode : 0x%x not supported\n", @@ -133,13 +153,13 @@ static int max77686_ldo_set_suspend_mode(struct regulator_dev *rdev, switch (mode) { case REGULATOR_MODE_STANDBY: /* switch off */ - val = 0x1 << MAX77686_OPMODE_SHIFT; + val = MAX77686_LDO_OFF_PWRREQ << MAX77686_OPMODE_SHIFT; break; case REGULATOR_MODE_IDLE: /* ON in LP Mode */ - val = 0x2 << MAX77686_OPMODE_SHIFT; + val = MAX77686_LDO_LOWPOWER_PWRREQ << MAX77686_OPMODE_SHIFT; break; case REGULATOR_MODE_NORMAL: /* ON in Normal Mode */ - val = 0x3 << MAX77686_OPMODE_SHIFT; + val = MAX77686_LDO_NORMAL << MAX77686_OPMODE_SHIFT; break; default: pr_warn("%s: regulator_suspend_mode : 0x%x not supported\n",