From patchwork Wed Dec 21 09:03:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Liu X-Patchwork-Id: 5924 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id F3C1F242F7 for ; Wed, 21 Dec 2011 09:04:29 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id DE3EBA18322 for ; Wed, 21 Dec 2011 09:04:29 +0000 (UTC) Received: by eaac11 with SMTP id c11so4315911eaa.11 for ; Wed, 21 Dec 2011 01:04:29 -0800 (PST) Received: by 10.204.129.24 with SMTP id m24mr1820638bks.89.1324458269594; Wed, 21 Dec 2011 01:04:29 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.82.144 with SMTP id ac16cs33726bkc; Wed, 21 Dec 2011 01:04:24 -0800 (PST) Received: by 10.42.156.9 with SMTP id x9mr5937624icw.50.1324458261967; Wed, 21 Dec 2011 01:04:21 -0800 (PST) Received: from mail-iy0-f178.google.com (mail-iy0-f178.google.com [209.85.210.178]) by mx.google.com with ESMTPS id ge1si1632809igb.12.2011.12.21.01.04.21 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Dec 2011 01:04:21 -0800 (PST) Received-SPF: neutral (google.com: 209.85.210.178 is neither permitted nor denied by best guess record for domain of paul.liu@linaro.org) client-ip=209.85.210.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.178 is neither permitted nor denied by best guess record for domain of paul.liu@linaro.org) smtp.mail=paul.liu@linaro.org Received: by iagf6 with SMTP id f6so13989178iag.37 for ; Wed, 21 Dec 2011 01:04:21 -0800 (PST) Received: by 10.42.202.17 with SMTP id fc17mr5828121icb.15.1324458260994; Wed, 21 Dec 2011 01:04:20 -0800 (PST) Received: from freya.lan (host-77.138-185-111.static.totalbb.net.tw. [111.185.138.77]) by mx.google.com with ESMTPS id l35sm14829174ibj.0.2011.12.21.01.04.16 (version=SSLv3 cipher=OTHER); Wed, 21 Dec 2011 01:04:19 -0800 (PST) From: "Ying-Chun Liu (PaulLiu)" To: linux-kernel@vger.kernel.org, linaro-dev@lists.linaro.org Cc: patches@linaro.org, eric.miao@linaro.org, broonie@opensource.wolfsonmicro.com, "Ying-Chun Liu (PaulLiu)" , Nancy Chen , Liam Girdwood Subject: [PATCHv2] Regulator: Add Anatop regulator driver Date: Wed, 21 Dec 2011 17:03:31 +0800 Message-Id: <1324458211-1612-1-git-send-email-paul.liu@linaro.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1323265998-29088-2-git-send-email-paul.liu@linaro.org> References: <1323265998-29088-2-git-send-email-paul.liu@linaro.org> From: "Ying-Chun Liu (PaulLiu)" Anatop regulator driver is used by i.MX6 SoC. The regulator provides controlling the voltage of PU, CORE, SOC, and some devices. This patch adds the Anatop regulator driver. Signed-off-by: Nancy Chen Signed-off-by: Ying-Chun Liu (PaulLiu) Cc: Mark Brown Cc: Liam Girdwood --- drivers/regulator/Kconfig | 7 + drivers/regulator/Makefile | 1 + drivers/regulator/anatop-regulator.c | 260 ++++++++++++++++++++++++++++ include/linux/regulator/anatop-regulator.h | 67 +++++++ 4 files changed, 335 insertions(+), 0 deletions(-) create mode 100644 drivers/regulator/anatop-regulator.c create mode 100644 include/linux/regulator/anatop-regulator.h diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 9713b1b..6aebd6d 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -327,5 +327,12 @@ config REGULATOR_AAT2870 If you have a AnalogicTech AAT2870 say Y to enable the regulator driver. +config REGULATOR_ANATOP + tristate "ANATOP LDO regulators" + depends on SOC_IMX6 + default y if SOC_IMX6 + help + Say y here to support ANATOP LDOs regulators. + endif diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 93a6318..990c332 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -46,5 +46,6 @@ obj-$(CONFIG_REGULATOR_AB8500) += ab8500.o obj-$(CONFIG_REGULATOR_DB8500_PRCMU) += db8500-prcmu.o obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o obj-$(CONFIG_REGULATOR_AAT2870) += aat2870-regulator.o +obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c new file mode 100644 index 0000000..31156d5 --- /dev/null +++ b/drivers/regulator/anatop-regulator.c @@ -0,0 +1,260 @@ +/* + * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. + */ + +/* + * 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. + + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static int anatop_set_voltage(struct regulator_dev *reg, int min_uV, + int max_uV, unsigned *selector) +{ + struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg); + u32 val, rega; + int uv; + + uv = max_uV; + pr_debug("%s: uv %d, min %d, max %d\n", __func__, + uv, reg->constraints->min_uV, + reg->constraints->max_uV); + + if (uv < reg->constraints->min_uV || uv > reg->constraints->max_uV) + return -EINVAL; + + if (anatop_reg->rdata->control_reg) { + val = anatop_reg->rdata->min_bit_val + + (uv - reg->constraints->min_uV) / 25000; + rega = (__raw_readl(anatop_reg->rdata->control_reg) & + ~(anatop_reg->rdata->vol_bit_mask << + anatop_reg->rdata->vol_bit_shift)); + pr_debug("%s: calculated val %d\n", __func__, val); + __raw_writel((val << anatop_reg->rdata->vol_bit_shift) | rega, + anatop_reg->rdata->control_reg); + return 0; + } else { + pr_debug("Regulator not supported.\n"); + return -ENOTSUPP; + } +} + +static int anatop_get_voltage(struct regulator_dev *reg) +{ + struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg); + int uv; + struct anatop_regulator_data *rdata = anatop_reg->rdata; + + if (rdata->control_reg) { + u32 val = (__raw_readl(rdata->control_reg) << + rdata->vol_bit_shift) & rdata->vol_bit_mask; + uv = reg->constraints->min_uV + + (val - rdata->min_bit_val) * 25000; + pr_debug("vddio = %d, val=%u\n", uv, val); + return uv; + } else { + pr_debug("Regulator not supported.\n"); + return -ENOTSUPP; + } +} + +static int anatop_enable(struct regulator_dev *reg) +{ + return 0; +} + +static int anatop_disable(struct regulator_dev *reg) +{ + return 0; +} + +static int anatop_is_enabled(struct regulator_dev *reg) +{ + return 1; +} + +static struct regulator_ops anatop_rops = { + .set_voltage = anatop_set_voltage, + .get_voltage = anatop_get_voltage, + .enable = anatop_enable, + .disable = anatop_disable, + .is_enabled = anatop_is_enabled, +}; + +static struct regulator_desc anatop_reg_desc[] = { + { + .name = "vddpu", + .id = ANATOP_VDDPU, + .ops = &anatop_rops, + .irq = 0, + .type = REGULATOR_VOLTAGE, + .owner = THIS_MODULE + }, + { + .name = "vddcore", + .id = ANATOP_VDDCORE, + .ops = &anatop_rops, + .irq = 0, + .type = REGULATOR_VOLTAGE, + .owner = THIS_MODULE + }, + { + .name = "vddsoc", + .id = ANATOP_VDDSOC, + .ops = &anatop_rops, + .irq = 0, + .type = REGULATOR_VOLTAGE, + .owner = THIS_MODULE + }, + { + .name = "vdd2p5", + .id = ANATOP_VDD2P5, + .ops = &anatop_rops, + .irq = 0, + .type = REGULATOR_VOLTAGE, + .owner = THIS_MODULE + }, + { + .name = "vdd1p1", + .id = ANATOP_VDD1P1, + .ops = &anatop_rops, + .irq = 0, + .type = REGULATOR_VOLTAGE, + .owner = THIS_MODULE + }, + { + .name = "vdd3p0", + .id = ANATOP_VDD3P0, + .ops = &anatop_rops, + .irq = 0, + .type = REGULATOR_VOLTAGE, + .owner = THIS_MODULE + }, +}; + +int anatop_regulator_probe(struct platform_device *pdev) +{ + struct regulator_desc *rdesc; + struct regulator_dev *rdev; + struct anatop_regulator *sreg; + struct regulator_init_data *initdata; + + sreg = platform_get_drvdata(pdev); + initdata = pdev->dev.platform_data; + sreg->cur_current = 0; + sreg->next_current = 0; + sreg->cur_voltage = 0; + + init_waitqueue_head(&sreg->wait_q); + spin_lock_init(&sreg->lock); + + if (pdev->id > ANATOP_SUPPLY_NUM) { + rdesc = kzalloc(sizeof(struct regulator_desc), GFP_KERNEL); + memcpy(rdesc, &anatop_reg_desc[ANATOP_SUPPLY_NUM], + sizeof(struct regulator_desc)); + rdesc->name = kstrdup(sreg->rdata->name, GFP_KERNEL); + } else + rdesc = &anatop_reg_desc[pdev->id]; + + pr_debug("probing regulator %s %s %d\n", + sreg->rdata->name, + rdesc->name, + pdev->id); + + /* register regulator */ + rdev = regulator_register(rdesc, &pdev->dev, + initdata, sreg); + + if (IS_ERR(rdev)) { + dev_err(&pdev->dev, "failed to register %s\n", + rdesc->name); + return PTR_ERR(rdev); + } + + return 0; +} + + +int anatop_regulator_remove(struct platform_device *pdev) +{ + struct regulator_dev *rdev = platform_get_drvdata(pdev); + + regulator_unregister(rdev); + + return 0; + +} + +int anatop_register_regulator( + struct anatop_regulator *reg_data, int reg, + struct regulator_init_data *initdata) +{ + struct platform_device *pdev; + int ret; + + pdev = platform_device_alloc("anatop_reg", reg); + if (!pdev) + return -ENOMEM; + + pdev->dev.platform_data = initdata; + + platform_set_drvdata(pdev, reg_data); + ret = platform_device_add(pdev); + + if (ret != 0) { + pr_debug("Failed to register regulator %d: %d\n", + reg, ret); + platform_device_del(pdev); + } + pr_debug("register regulator %s, %d: %d\n", + reg_data->rdata->name, reg, ret); + + return ret; +} +EXPORT_SYMBOL_GPL(anatop_register_regulator); + +struct platform_driver anatop_reg = { + .driver = { + .name = "anatop_reg", + }, + .probe = anatop_regulator_probe, + .remove = anatop_regulator_remove, +}; + +int anatop_regulator_init(void) +{ + return platform_driver_register(&anatop_reg); +} + +void anatop_regulator_exit(void) +{ + platform_driver_unregister(&anatop_reg); +} + +postcore_initcall(anatop_regulator_init); +module_exit(anatop_regulator_exit); + +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("ANATOP Regulator driver"); +MODULE_LICENSE("GPL"); + diff --git a/include/linux/regulator/anatop-regulator.h b/include/linux/regulator/anatop-regulator.h new file mode 100644 index 0000000..70f096b --- /dev/null +++ b/include/linux/regulator/anatop-regulator.h @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. + */ + +/* + * 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. + + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef __ANATOP_REGULATOR_H +#define __ANATOP_REGULATOR_H +#include + +/* regulator supplies for Anatop */ +enum anatop_regulator_supplies { + ANATOP_VDDPU, + ANATOP_VDDCORE, + ANATOP_VDDSOC, + ANATOP_VDD2P5, + ANATOP_VDD1P1, + ANATOP_VDD3P0, + ANATOP_SUPPLY_NUM +}; + +struct anatop_regulator { + struct regulator_desc regulator; + struct anatop_regulator *parent; + struct anatop_regulator_data *rdata; + struct completion done; + + spinlock_t lock; + wait_queue_head_t wait_q; + struct notifier_block nb; + + int mode; + int cur_voltage; + int cur_current; + int next_current; +}; + + +struct anatop_regulator_data { + char name[80]; + char *parent_name; + + u32 control_reg; + int vol_bit_shift; + int vol_bit_mask; + int min_bit_val; +}; + +int anatop_register_regulator( + struct anatop_regulator *reg_data, int reg, + struct regulator_init_data *initdata); + +#endif /* __ANATOP_REGULATOR_H */