From patchwork Fri Nov 22 08:46:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 3221841 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 1F071C045B for ; Fri, 22 Nov 2013 08:50:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 658A02074A for ; Fri, 22 Nov 2013 08:50:03 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AE07220748 for ; Fri, 22 Nov 2013 08:50:01 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VjmPf-0003aK-AY; Fri, 22 Nov 2013 08:48:32 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VjmP7-0001Aw-Tu; Fri, 22 Nov 2013 08:47:57 +0000 Received: from mailout4.w1.samsung.com ([210.118.77.14]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VjmON-00012A-Qe for linux-arm-kernel@lists.infradead.org; Fri, 22 Nov 2013 08:47:20 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MWN00GNIPNMW340@mailout4.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 22 Nov 2013 08:46:26 +0000 (GMT) X-AuditID: cbfec7f4-b7fee6d000004b2d-f6-528f19e21d7c Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id E7.D5.19245.2E91F825; Fri, 22 Nov 2013 08:46:26 +0000 (GMT) Received: from AMDC1943.digital.local ([106.116.151.171]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MWN0031SPP53W40@eusync2.samsung.com>; Fri, 22 Nov 2013 08:46:26 +0000 (GMT) From: Krzysztof Kozlowski To: MyungJoo Ham , Chanwoo Choi , Samuel Ortiz , Lee Jones , Anton Vorontsov , David Woodhouse , Liam Girdwood , Mark Brown , Grant Likely , Rob Herring , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Pawel Moll , Stephen Warren , Ian Campbell , Rob Landley , linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 4/5] regulator: max14577: Add regulator driver for Maxim 14577 Date: Fri, 22 Nov 2013 09:46:11 +0100 Message-id: <1385109972-28059-5-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1385109972-28059-1-git-send-email-k.kozlowski@samsung.com> References: <1385109972-28059-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrKLMWRmVeSWpSXmKPExsVy+t/xK7qPJPuDDA491rI4uFXTYuOM9awW Ux8+YbO4/uU5q8X8I+dYLSaunMxsceDPDkaLc69WMlq8fmFocbbpDbvF/a9HGS2+Xelgstj0 +BqrxcK2JSwWl3fNYbNYe+Quu8XtxhVsFhOmr2WxOLziAJPFupfTWSxOd7NavDrYxuIg5rFm 3hpGjwWfr7B7TOj/xOixc9Zddo+Vy7+weWxeoeWxaVUnm8er1TNZPe5c28PmMe9koMfmJfUe fVtWMXp83iTnsXFuaABfFJdNSmpOZllqkb5dAlfGtM8P2Aq+h1U8nWXYwHjQo4uRk0NCwETi bdcUVghbTOLCvfVsILaQwFJGiX0v8roYuYDsPiaJTYuuMYIk2ASMJTYvX8IGkhARmMMqsfvM MxYQh1ngKKPE285dTCBVwgLBElP2zAOzWQRUJf5sfga2glfAXeLTjGXMXYwcQOsUJOZMsgEJ cwp4SPRN/80KEhYCKrn/wWoCI+8CRoZVjKKppckFxUnpuYZ6xYm5xaV56XrJ+bmbGCFR82UH 4+JjVocYBTgYlXh4d1j2BQmxJpYVV+YeYpTgYFYS4f11FSjEm5JYWZValB9fVJqTWnyIkYmD U6qBsVzsUfm6fT+ZEwSf9G+cPeXWhdozB0wFHzJte1r19+hdRzPRoj+Ll5v/SDFZI8V/PdIr dZVcfUKK1uk9Sk8kL0t0SZyZeEZv6gSWA4qtpj7BeaU3vmQVO1v6hUz9qXPz7NFtD6MTPHWS FV3Mm85X6Aiydcfs6rn+ZlcC8+4rc7XU503y8Am4qsRSnJFoqMVcVJwIAJG9HF14AgAA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131122_034712_059331_4016EA1F X-CRM114-Status: GOOD ( 25.24 ) X-Spam-Score: -7.4 (-------) Cc: Kyungmin Park , Marek Szyprowski , Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 MAX14577 chip is a multi-function device which includes MUIC, charger and voltage regulator. The driver is located in drivers/mfd. This patch adds regulator driver for MAX14577 chip. There are two regulators in this chip: 1. Safeout LDO with constant voltage output of 4.9V. It can be only enabled or disabled. 2. Current regulator for the charger. It provides current from 90mA up to 950mA. Driver supports Device Tree. Signed-off-by: Krzysztof Kozlowski Signed-off-by: Kyungmin Park --- drivers/regulator/Kconfig | 7 ++ drivers/regulator/Makefile | 1 + drivers/regulator/max14577.c | 272 ++++++++++++++++++++++++++++++++++++++++++ include/linux/mfd/max14577.h | 1 - 4 files changed, 280 insertions(+), 1 deletion(-) create mode 100644 drivers/regulator/max14577.c diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index ce785f4..11ee053 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -249,6 +249,13 @@ config REGULATOR_LP8788 help This driver supports LP8788 voltage regulator chip. +config REGULATOR_MAX14577 + tristate "Maxim 14577 regulator" + depends on MFD_MAX14577 + help + This driver controls a Maxim 14577 regulator via I2C bus. + The regulators include safeout LDO and current regulator 'CHARGER'. + config REGULATOR_MAX1586 tristate "Maxim 1586/1587 voltage regulator" depends on I2C diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 01c597e..654bd43 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -35,6 +35,7 @@ obj-$(CONFIG_REGULATOR_LP872X) += lp872x.o obj-$(CONFIG_REGULATOR_LP8788) += lp8788-buck.o obj-$(CONFIG_REGULATOR_LP8788) += lp8788-ldo.o obj-$(CONFIG_REGULATOR_LP8755) += lp8755.o +obj-$(CONFIG_REGULATOR_MAX14577) += max14577.o obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o obj-$(CONFIG_REGULATOR_MAX8649) += max8649.o obj-$(CONFIG_REGULATOR_MAX8660) += max8660.o diff --git a/drivers/regulator/max14577.c b/drivers/regulator/max14577.c new file mode 100644 index 0000000..d913bed --- /dev/null +++ b/drivers/regulator/max14577.c @@ -0,0 +1,272 @@ +/* + * max14577.c - Regulator driver for the Maxim 14577 + * + * Copyright (C) 2013 Samsung Electronics + * Krzysztof Kozlowski + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include + +struct max14577_regulator { + struct device *dev; + struct max14577 *max14577; + struct regulator_dev **regulators; +}; + +static int max14577_reg_is_enabled(struct regulator_dev *rdev) +{ + int rid = rdev_get_id(rdev); + struct regmap *rmap = rdev->regmap; + u8 reg_data; + + switch (rid) { + case MAX14577_CHARGER: + max14577_read_reg(rmap, MAX14577_CHG_REG_CHG_CTRL2, ®_data); + if ((reg_data & CHGCTRL2_MBCHOSTEN_MASK) == 0) + return 0; + max14577_read_reg(rmap, MAX14577_CHG_REG_STATUS3, ®_data); + if ((reg_data & STATUS3_CGMBC_MASK) == 0) + return 0; + /* MBCHOSTEN and CGMBC are on */ + return 1; + default: + return -EINVAL; + } +} + +static int max14577_reg_get_current_limit(struct regulator_dev *rdev) +{ + u8 reg_data; + struct regmap *rmap = rdev->regmap; + + if (rdev_get_id(rdev) != MAX14577_CHARGER) + return -EINVAL; + + max14577_read_reg(rmap, MAX14577_CHG_REG_CHG_CTRL4, ®_data); + + if ((reg_data & CHGCTRL4_MBCICHWRCL_MASK) == 0) + return MAX14577_REGULATOR_CURRENT_LIMIT_MIN; + + reg_data = ((reg_data & CHGCTRL4_MBCICHWRCH_MASK) >> + CHGCTRL4_MBCICHWRCH_SHIFT); + return MAX14577_REGULATOR_CURRENT_LIMIT_HIGH_START + + reg_data * MAX14577_REGULATOR_CURRENT_LIMIT_HIGH_STEP; +} + +static int max14577_reg_set_current_limit(struct regulator_dev *rdev, + int min_uA, int max_uA) +{ + int i, current_bits = 0xf; + u8 reg_data; + + if (rdev_get_id(rdev) != MAX14577_CHARGER) + return -EINVAL; + + if (min_uA > MAX14577_REGULATOR_CURRENT_LIMIT_MAX || + max_uA < MAX14577_REGULATOR_CURRENT_LIMIT_MIN) + return -EINVAL; + + if (max_uA < MAX14577_REGULATOR_CURRENT_LIMIT_HIGH_START) { + /* Less than 200 mA, so set 90mA (turn only Low Bit off) */ + u8 reg_data = 0x0 << CHGCTRL4_MBCICHWRCL_SHIFT; + return max14577_update_reg(rdev->regmap, + MAX14577_CHG_REG_CHG_CTRL4, + CHGCTRL4_MBCICHWRCL_MASK, reg_data); + } + + /* max_uA is in range: , so search for + * valid current starting from LIMIT_MAX. */ + for (i = MAX14577_REGULATOR_CURRENT_LIMIT_MAX; + i >= MAX14577_REGULATOR_CURRENT_LIMIT_HIGH_START; + i -= MAX14577_REGULATOR_CURRENT_LIMIT_HIGH_STEP) { + if (i <= max_uA) + break; + current_bits--; + } + BUG_ON(current_bits < 0); /* Cannot happen */ + /* Turn Low Bit on (use range 200mA-950 mA) */ + reg_data = 0x1 << CHGCTRL4_MBCICHWRCL_SHIFT; + /* and set proper High Bits */ + reg_data |= current_bits << CHGCTRL4_MBCICHWRCH_SHIFT; + + return max14577_update_reg(rdev->regmap, MAX14577_CHG_REG_CHG_CTRL4, + CHGCTRL4_MBCICHWRCL_MASK | CHGCTRL4_MBCICHWRCH_MASK, + reg_data); +} + +static struct regulator_ops max14577_safeout_ops = { + .is_enabled = regulator_is_enabled_regmap, + .enable = regulator_enable_regmap, + .disable = regulator_disable_regmap, + .list_voltage = regulator_list_voltage_linear, +}; + +static struct regulator_ops max14577_charger_ops = { + .is_enabled = max14577_reg_is_enabled, + .enable = regulator_enable_regmap, + .disable = regulator_disable_regmap, + .get_current_limit = max14577_reg_get_current_limit, + .set_current_limit = max14577_reg_set_current_limit, +}; + +static struct regulator_desc supported_regulators[] = { + [MAX14577_SAFEOUT] = { + .name = "SAFEOUT", + .id = MAX14577_SAFEOUT, + .ops = &max14577_safeout_ops, + .type = REGULATOR_VOLTAGE, + .owner = THIS_MODULE, + .n_voltages = 1, + .min_uV = MAX14577_REGULATOR_SAFEOUT_VOLTAGE, + .enable_reg = MAX14577_REG_CONTROL2, + .enable_mask = CTRL2_SFOUTORD_MASK, + }, + [MAX14577_CHARGER] = { + .name = "CHARGER", + .id = MAX14577_CHARGER, + .ops = &max14577_charger_ops, + .type = REGULATOR_CURRENT, + .owner = THIS_MODULE, + .enable_reg = MAX14577_CHG_REG_CHG_CTRL2, + .enable_mask = CHGCTRL2_MBCHOSTEN_MASK, + }, +}; + +#ifdef CONFIG_OF +static int max14577_regulator_dt_parse_pdata(struct platform_device *pdev, + struct max14577_platform_data *pdata) +{ + struct max14577 *max14577 = dev_get_drvdata(pdev->dev.parent); + struct device_node *np; + struct max14577_regulator_platform_data *reg_pdata; + struct of_regulator_match rmatch; + int i, ret; + + np = of_get_child_by_name(max14577->dev->of_node, "regulators"); + if (!np) + return -EINVAL; + + reg_pdata = devm_kzalloc(&pdev->dev, sizeof(*reg_pdata) * + ARRAY_SIZE(supported_regulators), GFP_KERNEL); + if (!reg_pdata) + return -ENOMEM; + + for (i = 0; i < ARRAY_SIZE(supported_regulators); i++) { + rmatch.name = supported_regulators[i].name; + ret = of_regulator_match(&pdev->dev, np, &rmatch, 1); + if (ret != 1) + continue; + dev_dbg(&pdev->dev, "Found regulator %d/%s\n", + supported_regulators[i].id, + supported_regulators[i].name); + reg_pdata[i].id = supported_regulators[i].id; + reg_pdata[i].initdata = rmatch.init_data; + reg_pdata[i].of_node = rmatch.of_node; + } + + pdata->regulators = reg_pdata; + + return 0; +} +#else +static int max14577_regulator_dt_parse_pdata(struct platform_device *pdev, + struct max14577_platform_data *pdata) +{ + return 0; +} +#endif + +static int max14577_regulator_probe(struct platform_device *pdev) +{ + struct max14577 *max14577 = dev_get_drvdata(pdev->dev.parent); + struct max14577_platform_data *pdata = dev_get_platdata(max14577->dev); + int i, size; + struct regulator_config config = {}; + struct regulator_dev **regulators; + + if (!pdata) { + /* Parent must provide pdata */ + dev_err(&pdev->dev, "No MFD driver platform data found.\n"); + return -ENODEV; + } + + if (max14577->dev->of_node) { + int ret = max14577_regulator_dt_parse_pdata(pdev, pdata); + if (ret) + return ret; + } + + size = sizeof(struct regulator_dev *) * ARRAY_SIZE(supported_regulators); + regulators = devm_kzalloc(&pdev->dev, size, GFP_KERNEL); + if (!regulators) { + dev_err(&pdev->dev, "Cannot allocate memory for regulators\n"); + return -ENOMEM; + } + + config.dev = &pdev->dev; + config.regmap = max14577->regmap; + + for (i = 0; i < ARRAY_SIZE(supported_regulators); i++) { + /* + * Index of supported_regulators[] is also the id and must + * match index of pdata->regulators[]. + */ + config.init_data = pdata->regulators[i].initdata; + config.of_node = pdata->regulators[i].of_node; + + regulators[i] = devm_regulator_register(&pdev->dev, + &supported_regulators[i], &config); + if (IS_ERR(regulators[i])) { + int ret = PTR_ERR(regulators[i]); + dev_err(&pdev->dev, + "Regulator init failed for ID %d with error: %d\n", + i, ret); + return ret; + } + } + + return 0; +} + +static struct platform_driver max14577_regulator_driver = { + .driver = { + .owner = THIS_MODULE, + .name = "max14577-regulator", + }, + .probe = max14577_regulator_probe, +}; + +static int __init max14577_regulator_init(void) +{ + BUILD_BUG_ON(MAX14577_REGULATOR_CURRENT_LIMIT_HIGH_START + + MAX14577_REGULATOR_CURRENT_LIMIT_HIGH_STEP * 0xf != + MAX14577_REGULATOR_CURRENT_LIMIT_MAX); + BUILD_BUG_ON(ARRAY_SIZE(supported_regulators) != MAX14577_REG_MAX); + return platform_driver_register(&max14577_regulator_driver); +} +subsys_initcall(max14577_regulator_init); + +static void __exit max14577_regulator_exit(void) +{ + platform_driver_unregister(&max14577_regulator_driver); +} +module_exit(max14577_regulator_exit); + +MODULE_AUTHOR("Krzysztof Kozlowski "); +MODULE_DESCRIPTION("MAXIM 14577 regulator driver"); +MODULE_LICENSE("GPL"); diff --git a/include/linux/mfd/max14577.h b/include/linux/mfd/max14577.h index 512d731..247b021 100644 --- a/include/linux/mfd/max14577.h +++ b/include/linux/mfd/max14577.h @@ -63,7 +63,6 @@ struct max14577_platform_data { int (*set_gpio_pogo_cb) (int new_dev); - int num_regulators; struct max14577_regulator_platform_data *regulators; };