From patchwork Tue Jul 14 09:55:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 51097 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 51291202B9 for ; Tue, 14 Jul 2015 09:59:32 +0000 (UTC) Received: by wipp2 with SMTP id p2sf3323689wip.2 for ; Tue, 14 Jul 2015 02:59:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=QbkXvtbDpEW5NNQj27tc0+MKhMFq36fuycEL2UgWeEM=; b=dRAqNAzKEkgvINps3OwCjuy7yPHuBr6c6AxykjrQj8B31iHBqqGCY+egJFZmdCfMeK lmoPUfpqNIoHicY4T0qwK0nXMMtDeonMDzeVE4aHytxcP9kxpn2vuu7rSkcKgZ5/q0do CQTl32s1ry+2mv8dHlQYda+Zw6ji1iZ2G+Fldd1DFN1ovOaxmQ1frn912EChV1OzpyTR IEYZz/nHKLodnvsWWEAcpHmiU0O/4SCZ09Eo9BziR+VQfln0s0j5itbZHUB6b6uFyj8+ 32bhseuHv9neoRAgT1sf8VJxxRBo1jhclowy0npWNUcD+RK95G1XEp84E5X/IfAxDwNM bOAA== X-Gm-Message-State: ALoCoQnFEMT3pkBZn9KQIdvNbjU917EPMmIwjXG4cb0ua3Q8g9+y0kKmPbdKqm9V185dbzVAavF0 X-Received: by 10.180.35.162 with SMTP id i2mr9651289wij.6.1436867971683; Tue, 14 Jul 2015 02:59:31 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.225 with SMTP id v1ls24392lav.71.gmail; Tue, 14 Jul 2015 02:59:31 -0700 (PDT) X-Received: by 10.152.178.229 with SMTP id db5mr37484629lac.55.1436867971485; Tue, 14 Jul 2015 02:59:31 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id bx11si435093lbb.141.2015.07.14.02.59.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jul 2015 02:59:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by lagw2 with SMTP id w2so2927969lag.3 for ; Tue, 14 Jul 2015 02:59:31 -0700 (PDT) X-Received: by 10.152.7.7 with SMTP id f7mr37085951laa.106.1436867971015; Tue, 14 Jul 2015 02:59:31 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp2267565lbb; Tue, 14 Jul 2015 02:59:29 -0700 (PDT) X-Received: by 10.70.42.37 with SMTP id k5mr79478398pdl.13.1436867969147; Tue, 14 Jul 2015 02:59:29 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pm4si870984pbb.107.2015.07.14.02.59.28; Tue, 14 Jul 2015 02:59:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755039AbbGNJ7S (ORCPT + 26 others); Tue, 14 Jul 2015 05:59:18 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:35909 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755027AbbGNJ7P (ORCPT ); Tue, 14 Jul 2015 05:59:15 -0400 Received: by pdjr16 with SMTP id r16so3402684pdj.3 for ; Tue, 14 Jul 2015 02:59:14 -0700 (PDT) X-Received: by 10.68.205.196 with SMTP id li4mr78307297pbc.122.1436867954799; Tue, 14 Jul 2015 02:59:14 -0700 (PDT) Received: from localhost.localdomain ([202.62.77.106]) by smtp.gmail.com with ESMTPSA id yr9sm761651pab.26.2015.07.14.02.59.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Jul 2015 02:59:13 -0700 (PDT) From: Vaibhav Hiremath To: linux-arm-kernel@lists.infradead.org Cc: sameo@linux.intel.com, lee.jones@linaro.org, linux-kernel@vger.kernel.org, Vaibhav Hiremath Subject: [PATCH-v2 2/2] mfd: 88pm800: Add init time initial configuration support Date: Tue, 14 Jul 2015 15:25:28 +0530 Message-Id: <1436867728-30370-3-git-send-email-vaibhav.hiremath@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436867728-30370-1-git-send-email-vaibhav.hiremath@linaro.org> References: <1436867728-30370-1-git-send-email-vaibhav.hiremath@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: vaibhav.hiremath@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch adds init time configuration of 88PM800/805 and 88PM860. It includes, - Enable BUCK clock gating in low power mode - Full mode support for BUCK2 and 4 - Enable voltage change (LPF, DVC) in PMIC Note that both 88PM800 and 88PM860 do share common configurations, but since I can not validate the configuration on 88PM800, restricting myself only to 88PM860. If anyone can validate on 88PM800, we can move common code accordingly. Signed-off-by: Vaibhav Hiremath Reviewed-by: Krzysztof Kozlowski --- drivers/mfd/88pm800.c | 71 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/mfd/88pm80x.h | 13 +++++++++ 2 files changed, 84 insertions(+) diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c index 95c8ad4..0a82f58 100644 --- a/drivers/mfd/88pm800.c +++ b/drivers/mfd/88pm800.c @@ -521,6 +521,70 @@ out: return ret; } +static int pm800_init_config(struct pm80x_chip *chip, struct device_node *np) +{ + int ret; + unsigned int val; + + /* + * Although both 88PM800 & 88PM860 do share some common configurations, + * and should have common code wherever possible. But due to lack of + * testing on 88pm800/88pm805 device, common code is avoided as of now. + * + * Once it is tested on 88PM800, it can be moved to common code. + */ + switch (chip->type) { + case CHIP_PM800: + case CHIP_PM805: + break; + case CHIP_PM860: + /* Enable LDO and BUCK clock gating in low power mode */ + ret = regmap_update_bits(chip->regmap, PM800_LOW_POWER_CONFIG3, + PM800_LDOBK_FREEZE, PM800_LDOBK_FREEZE); + if (ret) + goto error; + + /* Enable voltage change in pmic, POWER_HOLD = 1 */ + ret = regmap_update_bits(chip->regmap, PM800_WAKEUP1, + PM800_PWR_HOLD_EN, PM800_PWR_HOLD_EN); + if (ret) + goto error; + + /* + * Set buck2 and buck4 driver selection to be full. + * The default value is 0, for full drive support + * it should be set to 1. + * In A1 version it will be set to 1 by default. + * To be on safer side, set it explicitly + */ + ret = regmap_update_bits(chip->subchip->regmap_power, + PM860_BUCK2_MISC2, + PM860_BUCK2_FULL_DRV, + PM860_BUCK2_FULL_DRV); + if (ret) + goto error; + + ret = regmap_update_bits(chip->subchip->regmap_power, + PM860_BUCK4_MISC2, + PM860_BUCK4_FULL_DRV, + PM860_BUCK4_FULL_DRV); + if (ret) + goto error; + + + break; + default: + dev_err(chip->dev, "Unknown device type: %d\n", chip->type); + break; + } + + return 0; + +error: + dev_err(chip->dev, "failed to access registers\n"); + return ret; +} + static int pm800_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -585,6 +649,13 @@ static int pm800_probe(struct i2c_client *client, if (pdata->plat_config) pdata->plat_config(chip, pdata); + /* common register configurations , init time only */ + ret = pm800_init_config(chip, np); + if (ret) { + dev_err(chip->dev, "Failed to configure 88pm800 devices\n"); + goto err_device_init; + } + return 0; err_device_init: diff --git a/include/linux/mfd/88pm80x.h b/include/linux/mfd/88pm80x.h index 2e25fb1..2ef62af 100644 --- a/include/linux/mfd/88pm80x.h +++ b/include/linux/mfd/88pm80x.h @@ -74,6 +74,7 @@ enum { /* Wakeup Registers */ #define PM800_WAKEUP1 (0x0D) +#define PM800_PWR_HOLD_EN BIT(7) #define PM800_WAKEUP2 (0x0E) #define PM800_WAKEUP2_INV_INT BIT(0) @@ -87,7 +88,10 @@ enum { /* Referance and low power registers */ #define PM800_LOW_POWER1 (0x20) #define PM800_LOW_POWER2 (0x21) + #define PM800_LOW_POWER_CONFIG3 (0x22) +#define PM800_LDOBK_FREEZE BIT(7) + #define PM800_LOW_POWER_CONFIG4 (0x23) /* GPIO register */ @@ -279,6 +283,15 @@ enum { #define PM805_EARPHONE_SETTING (0x29) #define PM805_AUTO_SEQ_SETTING (0x2A) + +/* 88PM860 Registers */ + +#define PM860_BUCK2_MISC2 (0x7C) +#define PM860_BUCK2_FULL_DRV BIT(2) + +#define PM860_BUCK4_MISC2 (0x82) +#define PM860_BUCK4_FULL_DRV BIT(2) + struct pm80x_rtc_pdata { int vrtc; int rtc_wakeup;