make mc13783 code generic
PATCH 1/1 make mc13783 code generic
Hi there,
For better code share between mc13783 and mc13892, I did some clean up and move some common code to a separated file. And mc13892 code will come after this patch.
Thanks
Yong
PATCH 1/1 make mc13783 code generic
Quoted 1 line · Yong Shen
Hi there,
Hi,
Quoted 4 lines
For better code share between mc13783 and mc13892, I did some clean up and move some common code to a separated file. And mc13892 code will come after this patch.
Please find comments below. They've been done only after looking at the patch so num build-test, no runtime-test. Moreover, the patch have been broken by something as there's word wrapping at some places, making patch rather grumpy.
Quoted 28 lines
Thanks
YongQuoted 1 line
From
98e187834085624c3651587da56da48bec958e05Mon Sep 17 00:00:00 2001From: Yong Shen <[email protected]>
Date: Tue, 30 Nov 2010 14:11:34 +0800
Subject: [PATCH] make mc13783 code genericmove some common functions and micros to a seperate file, which makes it possible for mc13892 to share code
Signed-off-by Yong Shen <[email protected]>--- drivers/regulator/Makefile | 2 +- drivers/regulator/mc13783-regulator.c | 311 +++++----------------------- drivers/regulator/mc13xxx-regulator-core.c | 241 +++++++++++++++++++++ include/linux/mfd/mc13783.h | 67 +++--- include/linux/regulator/mc13xxx.h | 101 +++++++++ 5 files changed, 426 insertions(+), 296 deletions(-) create mode 100644 drivers/regulator/mc13xxx-regulator-core.c create mode 100644 include/linux/regulator/mc13xxx.hdrivers/regulator/Makefile +0
-0
drivers/regulator/Makefile obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o · line 33
Quoted 6 lines
drivers/regulator/Makefile +1
-1@@ -29,7 +29,7 @@ obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o obj-$(CONFIG_REGULATOR_DA903X) += da903x.o obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o -obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o +obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o mc13xxx-regulator-core.o obj-$(CONFIG_REGULATOR_AB3100) += ab3100.o
Why don't you add a common Kconfig entry ? I've the (wrong ?) feeling that you're going to do :
obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o mc13xxx-regulator-core.o
which should be avoided. Being able to build mc13783 and mc13892 support at the same time is a must-have imho.
Quoted 53 lines
drivers/regulator/Makefile +0
-0obj-$(CONFIG_REGULATOR_TPS65023) += tps65023-regulator.odrivers/regulator/mc13783-regulator.c +3
-12@@ -1,6 +1,7 @@/* * Regulator Driver for Freescale MC13783 PMIC * +* Copyright 2010 Yong Shen <[email protected]> * Copyright (C) 2008 Sascha Hauer, Pengutronix <[email protected]> * Copyright 2009 Alberto Panizzo <[email protected]> * @@ -10,6 +11,7 @@*/ #include <linux/mfd/mc13783.h> +#include <linux/regulator/mc13xxx.h> #include <linux/regulator/machine.h> #include <linux/regulator/driver.h> #include <linux/platform_device.h> @@ -89,16 +91,6 @@#define MC13783_REG_POWERMISC_PWGTSPI_M (3 << 15) -struct mc13783_regulator { -struct regulator_desc desc; -int reg; -int enable_bit; -int vsel_reg; -int vsel_shift; -int vsel_mask; -int const *voltages; -}; -/* Voltage Values */ static const int const mc13783_sw3_val[] = {5000000 ,5000000 ,5000000 ,5500000 ,@@ -175,10 +167,9 @@ static const int const mc13783_pwgtdrv_val[] = { 5500000, }; -static struct regulator_ops mc13783_regulator_ops; -static struct regulator_ops mc13783_fixed_regulator_ops;static struct regulator_ops mc13783_gpo_regulator_ops; +/* #define MC13783_DEFINE(prefix, _name, _reg, _vsel_reg, _voltages) \ [MC13783_ ## prefix ## _ ## _name] = { \ .desc = { \
drivers/regulator/mc13783-regulator.c static struct regulator_ops mc13783_gpo_regulator_ops; · line 190
Quoted 4 lines
drivers/regulator/mc13783-regulator.c +1
-0@@ -196,43 +187,26 @@ static struct regulator_ops mc13783_gpo_regulator_ops;.vsel_mask = MC13783_REG_ ## _vsel_reg ## _ ## _name ## VSEL_M,\ .voltages = _voltages, \ } +*/
Forgot to remove it before sending the patch ?
Quoted 8 lines
drivers/regulator/mc13783-regulator.c +0
-7-#define MC13783_FIXED_DEFINE (prefix, _name, _reg, _voltages) \ - [MC13783_ ## prefix ## _ ## _name] = { \ - .desc = { \ - .name = #prefix "_" #_name, \ - .n_voltages = ARRAY_SIZE(_voltages), \ - .ops = &mc13783_fixed_regulator_ops, \ - .type = REGULATOR_VOLTAGE, \
drivers/regulator/mc13783-regulator.c static struct regulator_ops mc13783_gpo_regulator_ops; · line 193
Quoted 10 lines
drivers/regulator/mc13783-regulator.c +3
-7- .id = MC13783_ ## prefix ## _ ## _name, \ - .owner = THIS_MODULE, \ - }, \ - .reg = MC13783_REG_ ## _reg, \ - .enable_bit = MC13783_REG_ ## _reg ## _ ## _name ## EN, \ - .voltages = _voltages, \ - } +#define MC13783_DEFINE (prefix, name, reg, vsel_reg, voltages) \ + MC13xxx_DEFINE(MC13783_REG_, name, reg, vsel_reg, voltages, \ + mc13xxx_regulator_ops)
Why don't you just modify mc13783 driver to use MC13xxx_* instead of doing this ?
Quoted 18 lines
drivers/regulator/mc13783-regulator.c +3
-14-#define MC13783_GPO_DEFINE (prefix, _name, _reg, _voltages) \ - [MC13783_ ## prefix ## _ ## _name] = { \ - .desc = { \ - .name = #prefix "_" #_name, \ - .n_voltages = ARRAY_SIZE(_voltages), \ - .ops = &mc13783_gpo_regulator_ops, \ - .type = REGULATOR_VOLTAGE, \ - .id = MC13783_ ## prefix ## _ ## _name, \ - .owner = THIS_MODULE, \ - }, \ - .reg = MC13783_REG_ ## _reg, \ - .enable_bit = MC13783_REG_ ## _reg ## _ ## _name ## EN, \ - .voltages = _voltages, \ - } +#define MC13783_FIXED_DEFINE (prefix, name, reg, voltages) \ + MC13xxx_FIXED_DEFINE(MC13783_REG_, name, reg, voltages, \ + mc13xxx_fixed_regulator_ops)
drivers/regulator/mc13783-regulator.c static struct regulator_ops mc13783_gpo_regulator_ops; · line 206
Quoted 10 lines
drivers/regulator/mc13783-regulator.c +4
-0+ +#define MC13783_GPO_DEFINE (prefix, name, reg, voltages) \ + MC13xxx_GPO_DEFINE(MC13783_REG_, name, reg, voltages, \ + mc13783_gpo_regulator_ops)#define MC13783_DEFINE_SW (_name, _reg, _vsel_reg, _voltages) \ MC13783_DEFINE(SW, _name, _reg, _vsel_reg, _voltages)#define MC13783_DEFINE_REGU (_name, _reg, _vsel_reg, _voltages) \ MC13783_DEFINE(REGU, _name, _reg, _vsel_reg, _voltages)
same here.
Quoted 217 lines
drivers/regulator/mc13783-regulator.c +4
-195-static struct mc13783_regulator mc13783_regulators[] = { +static struct mc13xxx_regulator mc13783_regulators[] = {MC13783_DEFINE_SW (SW3 ,SWITCHERS5 ,SWITCHERS5 , mc13783_sw3_val),MC13783_FIXED_DEFINE (REGU ,VAUDIO ,REGULATORMODE0 , mc13783_vaudio_val),@@ -274,207 +248,16 @@ static struct mc13783_regulator mc13783_regulators[] = { MC13783_GPO_DEFINE(REGU, PWGT2SPI, POWERMISC, mc13783_pwgtdrv_val), }; -struct mc13783_regulator_priv { -struct mc13783 *mc13783; -u32 powermisc_pwgt_state; -struct regulator_dev *regulators[]; -}; - -static int mc13783_regulator_enable (struct regulator_dev *rdev) -{ -struct mc13783_regulator_priv *priv =rdev_get_drvdata (rdev); -int id =rdev_get_id (rdev); -int ret; - -dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id); - -mc13783_lock (priv->mc13783); - ret =mc13783_reg_rmw (priv->mc13783, mc13783_regulators[id].reg, - mc13783_regulators[id].enable_bit, - mc13783_regulators[id].enable_bit); -mc13783_unlock (priv->mc13783); - -return ret; -} - -static int mc13783_regulator_disable (struct regulator_dev *rdev) -{ -struct mc13783_regulator_priv *priv =rdev_get_drvdata (rdev); -int id =rdev_get_id (rdev); -int ret; - -dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id); - -mc13783_lock (priv->mc13783); - ret =mc13783_reg_rmw (priv->mc13783, mc13783_regulators[id].reg, - mc13783_regulators[id].enable_bit,0 ); -mc13783_unlock (priv->mc13783); - -return ret; -} - -static int mc13783_regulator_is_enabled (struct regulator_dev *rdev) -{ -struct mc13783_regulator_priv *priv =rdev_get_drvdata (rdev); -int ret, id =rdev_get_id (rdev); -unsigned int val; - -mc13783_lock (priv->mc13783); - ret =mc13783_reg_read (priv->mc13783, mc13783_regulators[id].reg, &val); -mc13783_unlock (priv->mc13783); - -if (ret) -return ret; - -return (val & mc13783_regulators[id].enable_bit) !=0 ; -} - -static int mc13783_regulator_list_voltage (struct regulator_dev *rdev, -unsigned selector) -{ -int id =rdev_get_id (rdev); - -if (selector >= mc13783_regulators[id].desc.n_voltages) -return -EINVAL ; - -return mc13783_regulators[id].voltages[selector]; -} - -static int mc13783_get_best_voltage_index (struct regulator_dev *rdev, -int min_uV,int max_uV) -{ -int reg_id =rdev_get_id (rdev); -int i; -int bestmatch; -int bestindex; - -/* -* Locate the minimum voltage fitting the criteria on -* this regulator. The switchable voltages are not -* in strict falling order so we need to check them -* all for the best match. -*/ - bestmatch =INT_MAX ; - bestindex =-1 ; -for (i =0 ; i < mc13783_regulators[reg_id].desc.n_voltages; i++) { -if (mc13783_regulators[reg_id].voltages[i] >= min_uV && - mc13783_regulators[reg_id].voltages[i] < bestmatch) { - bestmatch = mc13783_regulators[reg_id].voltages[i]; - bestindex = i; - } - } - -if (bestindex <0 || bestmatch > max_uV) { -dev_warn (&rdev->dev,"no possible value for %d<=x<=%d uV\n" , - min_uV, max_uV); -return -EINVAL ; - } -return bestindex; -} - -static int mc13783_regulator_set_voltage (struct regulator_dev *rdev, -int min_uV,int max_uV) -{ -struct mc13783_regulator_priv *priv =rdev_get_drvdata (rdev); -int value, id =rdev_get_id (rdev); -int ret; - -dev_dbg (rdev_get_dev (rdev),"%s id: %d min_uV: %d max_uV: %d\n" , - __func__, id, min_uV, max_uV); - -/* Find the best index */ - value =mc13783_get_best_voltage_index (rdev, min_uV, max_uV); -dev_dbg (rdev_get_dev (rdev),"%s best value: %d \n" , __func__, value); -if (value <0 ) -return value; - -mc13783_lock (priv->mc13783); - ret =mc13783_reg_rmw (priv->mc13783, mc13783_regulators[id].vsel_reg, - mc13783_regulators[id].vsel_mask, - value << mc13783_regulators[id].vsel_shift); -mc13783_unlock (priv->mc13783); - -return ret; -} - -static int mc13783_regulator_get_voltage (struct regulator_dev *rdev) -{ -struct mc13783_regulator_priv *priv =rdev_get_drvdata (rdev); -int ret, id =rdev_get_id (rdev); -unsigned int val; - -dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id); - -mc13783_lock (priv->mc13783); - ret =mc13783_reg_read (priv->mc13783, - mc13783_regulators[id].vsel_reg, &val); -mc13783_unlock (priv->mc13783); - -if (ret) -return ret; - - val = (val & mc13783_regulators[id].vsel_mask) - >> mc13783_regulators[id].vsel_shift; - -dev_dbg (rdev_get_dev (rdev),"%s id: %d val: %d\n" , __func__, id, val); - -BUG_ON (val <0 || val > mc13783_regulators[id].desc.n_voltages); - -return mc13783_regulators[id].voltages[val]; -} - -static struct regulator_ops mc13783_regulator_ops = { - .enable = mc13783_regulator_enable, - .disable = mc13783_regulator_disable, - .is_enabled = mc13783_regulator_is_enabled, - .list_voltage = mc13783_regulator_list_voltage, - .set_voltage = mc13783_regulator_set_voltage, - .get_voltage = mc13783_regulator_get_voltage, -}; - -static int mc13783_fixed_regulator_set_voltage (struct regulator_dev *rdev, -int min_uV,int max_uV) -{ -int id =rdev_get_id (rdev); - -dev_dbg (rdev_get_dev (rdev),"%s id: %d min_uV: %d max_uV: %d\n" , - __func__, id, min_uV, max_uV); - -if (min_uV >= mc13783_regulators[id].voltages[0 ] && - max_uV <= mc13783_regulators[id].voltages[0 ]) -return 0 ; -else -return -EINVAL ; -} - -static int mc13783_fixed_regulator_get_voltage (struct regulator_dev *rdev) -{ -int id =rdev_get_id (rdev); - -dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id); - -return mc13783_regulators[id].voltages[0 ]; -} - -static struct regulator_ops mc13783_fixed_regulator_ops = { - .enable = mc13783_regulator_enable, - .disable = mc13783_regulator_disable, - .is_enabled = mc13783_regulator_is_enabled, - .list_voltage = mc13783_regulator_list_voltage, - .set_voltage = mc13783_fixed_regulator_set_voltage, - .get_voltage = mc13783_fixed_regulator_get_voltage, -}; - -int mc13783_powermisc_rmw (struct mc13783_regulator_priv *priv,u32 mask, +int mc13783_powermisc_rmw (struct mc13xxx_regulator_priv *priv,u32 mask,u32 val) { -struct mc13783 *mc13783 = priv->mc13783; +struct mc13xxx *mc13783 = priv->mc13xxx;int ret;u32 valread;BUG_ON (val & ~mask); - ret =mc13783_reg_read (mc13783,MC13783_REG_POWERMISC , &valread); + ret =mc13xxx_reg_read (mc13783,MC13783_REG_POWERMISC , &valread);if (ret)return ret;
drivers/regulator/mc13783-regulator.c int mc13783_powermisc_rmw(struct · line 272
Quoted 1 line
drivers/regulator/mc13783-regulator.c +0
-0@@ -489,34 +272,36 @@ int mc13783_powermisc_rmw(struct mc13783_regulator_priv *priv, u32 mask,
patch broken.
Quoted 46 lines
drivers/regulator/mc13783-regulator.c +11
-9valread = (valread & ~MC13783_REG_POWERMISC_PWGTSPI_M ) | priv->powermisc_pwgt_state; -return mc13783_reg_write (mc13783,MC13783_REG_POWERMISC , valread); +return mc13xxx_reg_write (mc13783,MC13783_REG_POWERMISC , valread); }static int mc13783_gpo_regulator_enable (struct regulator_dev *rdev) { -struct mc13783_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators;int id =rdev_get_id (rdev);int ret; -u32 en_val = mc13783_regulators[id].enable_bit; +u32 en_val = mc13xxx_regulators[id].enable_bit;dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id);/* Power Gate enable value is 0 */ -if (id ==MC13783_REGU_PWGT1SPI || - id ==MC13783_REGU_PWGT2SPI ) +if (id ==MC13783_REG_PWGT1SPI || + id ==MC13783_REG_PWGT2SPI ) en_val =0 ; -mc13783_lock (priv->mc13783); - ret =mc13783_powermisc_rmw (priv, mc13783_regulators[id].enable_bit, +mc13xxx_lock (priv->mc13xxx); + ret =mc13783_powermisc_rmw (priv, mc13xxx_regulators[id].enable_bit, en_val); -mc13783_unlock (priv->mc13783); +mc13xxx_unlock (priv->mc13xxx);return ret; }static int mc13783_gpo_regulator_disable (struct regulator_dev *rdev) { -struct mc13783_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators;int id =rdev_get_id (rdev);int ret;drivers/regulator/mc13783-regulator.c +0
-0u32 dis_val =0 ;
drivers/regulator/mc13783-regulator.c static int mc13783_gpo_regulator_disable(struct · line 309
Quoted 1 line
drivers/regulator/mc13783-regulator.c +0
-0@@ -524,27 +309,28 @@ static int mc13783_gpo_regulator_disable(struct regulator_dev *rdev)
again.
Quoted 39 lines
drivers/regulator/mc13783-regulator.c +11
-10dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id);/* Power Gate disable value is 1 */ -if (id ==MC13783_REGU_PWGT1SPI || - id ==MC13783_REGU_PWGT2SPI ) - dis_val = mc13783_regulators[id].enable_bit; +if (id ==MC13783_REG_PWGT1SPI || + id ==MC13783_REG_PWGT2SPI ) + dis_val = mc13xxx_regulators[id].enable_bit; -mc13783_lock (priv->mc13783); - ret =mc13783_powermisc_rmw (priv, mc13783_regulators[id].enable_bit, +mc13xxx_lock (priv->mc13xxx); + ret =mc13783_powermisc_rmw (priv, mc13xxx_regulators[id].enable_bit, dis_val); -mc13783_unlock (priv->mc13783); +mc13xxx_unlock (priv->mc13xxx);return ret; }static int mc13783_gpo_regulator_is_enabled (struct regulator_dev *rdev) { -struct mc13783_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators;int ret, id =rdev_get_id (rdev);unsigned int val; -mc13783_lock (priv->mc13783); - ret =mc13783_reg_read (priv->mc13783, mc13783_regulators[id].reg, &val); -mc13783_unlock (priv->mc13783); +mc13xxx_lock (priv->mc13xxx); + ret =mc13xxx_reg_read (priv->mc13xxx, mc13xxx_regulators[id].reg, &val); +mc13xxx_unlock (priv->mc13xxx);if (ret)drivers/regulator/mc13783-regulator.c +0
-0return ret;
drivers/regulator/mc13783-regulator.c static int · line 340
Quoted 1 line
drivers/regulator/mc13783-regulator.c +0
-0@@ -554,22 +340,22 @@ static int mc13783_gpo_regulator_is_enabled(struct regulator_dev *rdev)
yet an other one
Quoted 63 lines
drivers/regulator/mc13783-regulator.c +6
-6val = (val & ~MC13783_REG_POWERMISC_PWGTSPI_M ) | (priv->powermisc_pwgt_state ^MC13783_REG_POWERMISC_PWGTSPI_M ); -return (val & mc13783_regulators[id].enable_bit) !=0 ; +return (val & mc13xxx_regulators[id].enable_bit) !=0 ; }static struct regulator_ops mc13783_gpo_regulator_ops = { .enable = mc13783_gpo_regulator_enable, .disable = mc13783_gpo_regulator_disable, .is_enabled = mc13783_gpo_regulator_is_enabled, - .list_voltage = mc13783_regulator_list_voltage, - .set_voltage = mc13783_fixed_regulator_set_voltage, - .get_voltage = mc13783_fixed_regulator_get_voltage, + .list_voltage = mc13xxx_regulator_list_voltage, + .set_voltage = mc13xxx_fixed_regulator_set_voltage, + .get_voltage = mc13xxx_fixed_regulator_get_voltage, };static int __devinit mc13783_regulator_probe (struct platform_device *pdev) { -struct mc13783_regulator_priv *priv; -struct mc13783 *mc13783 =dev_get_drvdata (pdev->dev.parent); +struct mc13xxx_regulator_priv *priv; +struct mc13xxx *mc13783 =dev_get_drvdata (pdev->dev.parent);struct mc13783_regulator_platform_data *pdata =dev_get_platdata (&pdev->dev);drivers/regulator/mc13783-regulator.c +2
-1struct mc13783_regulator_init_data *init_data;@@ -583,7 +369,8 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev) if (!priv) return -ENOMEM; - priv->mc13783 = mc13783; + priv->mc13xxx_regulators = mc13783_regulators; + priv->mc13xxx = mc13783; for (i = 0; i < pdata->num_regulators; i++) {drivers/regulator/mc13783-regulator.c +1
-1init_data = &pdata->regulators[i];@@ -613,7 +400,7 @@ err: static int __devexit mc13783_regulator_remove(struct platform_device *pdev) { -struct mc13783_regulator_priv *priv =platform_get_drvdata (pdev); +struct mc13xxx_regulator_priv *priv =platform_get_drvdata (pdev);struct mc13783_regulator_platform_data *pdata =dev_get_platdata (&pdev->dev);int i;drivers/regulator/mc13xxx-regulator-core.c new file +8
-0@@ -0,0 +1,241 @@ +/* +* Regulator Driver for Freescale MC13xxx PMIC +* +* Copyright 2010 Yong Shen <[email protected]> +* +* Based on mc13783 regulator driver : +* Copyright (C) 2008 Sascha Hauer, Pengutronix <[email protected]> +* Copyright 2009 Alberto Panizzo <[email protected]>
drivers/regulator/mc13xxx-regulator-core.c line 18
Quoted 10 lines
drivers/regulator/mc13xxx-regulator-core.c new file +10
-0+* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* Regs infos taken from mc13xxx drivers from freescale and mc13xxx.pdf file +* from freescale +*/ + +#define DEBUG
drop this. It's nice for debugging but not for merged code. CONFIG_REGULATOR_DEBUG is there for that.
Quoted 213 lines
drivers/regulator/mc13xxx-regulator-core.c new file +213
-0+ +#include <linux/mfd/mc13xxx.h> +#include <linux/regulator/mc13xxx.h> +#include <linux/regulator/machine.h> +#include <linux/regulator/driver.h> +#include <linux/platform_device.h> +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/init.h> +#include <linux/err.h> + +static int mc13xxx_regulator_enable (struct regulator_dev *rdev) +{ +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; +int id =rdev_get_id (rdev); +int ret; + +dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id); + +mc13xxx_lock (priv->mc13xxx); + ret =mc13xxx_reg_rmw (priv->mc13xxx, mc13xxx_regulators[id].reg, + mc13xxx_regulators[id].enable_bit, + mc13xxx_regulators[id].enable_bit); +mc13xxx_unlock (priv->mc13xxx); + +return ret; +} + +static int mc13xxx_regulator_disable (struct regulator_dev *rdev) +{ +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; +int id =rdev_get_id (rdev); +int ret; + +dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id); + +mc13xxx_lock (priv->mc13xxx); + ret =mc13xxx_reg_rmw (priv->mc13xxx, mc13xxx_regulators[id].reg, + mc13xxx_regulators[id].enable_bit,0 ); +mc13xxx_unlock (priv->mc13xxx); + +return ret; +} + +static int mc13xxx_regulator_is_enabled (struct regulator_dev *rdev) +{ +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; +int ret, id =rdev_get_id (rdev); +unsigned int val; + +mc13xxx_lock (priv->mc13xxx); + ret =mc13xxx_reg_read (priv->mc13xxx, mc13xxx_regulators[id].reg, &val); +mc13xxx_unlock (priv->mc13xxx); + +if (ret) +return ret; + +return (val & mc13xxx_regulators[id].enable_bit) !=0 ; +} + +int mc13xxx_regulator_list_voltage (struct regulator_dev *rdev, +unsigned selector) +{ +int id =rdev_get_id (rdev); +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + +if (selector >= mc13xxx_regulators[id].desc.n_voltages) +return -EINVAL ; + +return mc13xxx_regulators[id].voltages[selector]; +} + +int mc13xxx_get_best_voltage_index (struct regulator_dev *rdev, +int min_uV,int max_uV) +{ +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; +int reg_id =rdev_get_id (rdev); +int i; +int bestmatch; +int bestindex; + +/* +* Locate the minimum voltage fitting the criteria on +* this regulator. The switchable voltages are not +* in strict falling order so we need to check them +* all for the best match. +*/ + bestmatch =INT_MAX ; + bestindex =-1 ; +for (i =0 ; i < mc13xxx_regulators[reg_id].desc.n_voltages; i++) { +if (mc13xxx_regulators[reg_id].voltages[i] >= min_uV && + mc13xxx_regulators[reg_id].voltages[i] < bestmatch) { + bestmatch = mc13xxx_regulators[reg_id].voltages[i]; + bestindex = i; + } + } + +if (bestindex <0 || bestmatch > max_uV) { +dev_warn (&rdev->dev,"no possible value for %d<=x<=%d uV\n" , + min_uV, max_uV); +return -EINVAL ; + } +return bestindex; +} + +static int mc13xxx_regulator_set_voltage (struct regulator_dev *rdev, +int min_uV,int max_uV) +{ +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; +int value, id =rdev_get_id (rdev); +int ret; + +dev_dbg (rdev_get_dev (rdev),"%s id: %d min_uV: %d max_uV: %d\n" , + __func__, id, min_uV, max_uV); + +/* Find the best index */ + value =mc13xxx_get_best_voltage_index (rdev, min_uV, max_uV); +dev_dbg (rdev_get_dev (rdev),"%s best value: %d\n" , __func__, value); +if (value <0 ) +return value; + +mc13xxx_lock (priv->mc13xxx); + ret =mc13xxx_reg_rmw (priv->mc13xxx, mc13xxx_regulators[id].vsel_reg, + mc13xxx_regulators[id].vsel_mask, + value << mc13xxx_regulators[id].vsel_shift); +mc13xxx_unlock (priv->mc13xxx); + +return ret; +} + +static int mc13xxx_regulator_get_voltage (struct regulator_dev *rdev) +{ +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; +int ret, id =rdev_get_id (rdev); +unsigned int val; + +dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id); + +mc13xxx_lock (priv->mc13xxx); + ret =mc13xxx_reg_read (priv->mc13xxx, + mc13xxx_regulators[id].vsel_reg, &val); +mc13xxx_unlock (priv->mc13xxx); + +if (ret) +return ret; + + val = (val & mc13xxx_regulators[id].vsel_mask) + >> mc13xxx_regulators[id].vsel_shift; + +dev_dbg (rdev_get_dev (rdev),"%s id: %d val: %d\n" , __func__, id, val); + +BUG_ON (val <0 || val > mc13xxx_regulators[id].desc.n_voltages); + +return mc13xxx_regulators[id].voltages[val]; +} + +struct regulator_ops mc13xxx_regulator_ops = { + .enable = mc13xxx_regulator_enable, + .disable = mc13xxx_regulator_disable, + .is_enabled = mc13xxx_regulator_is_enabled, + .list_voltage = mc13xxx_regulator_list_voltage, + .set_voltage = mc13xxx_regulator_set_voltage, + .get_voltage = mc13xxx_regulator_get_voltage, +}; + +int mc13xxx_fixed_regulator_set_voltage (struct regulator_dev *rdev, +int min_uV,int max_uV) +{ +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; +int id =rdev_get_id (rdev); + +dev_dbg (rdev_get_dev (rdev),"%s id: %d min_uV: %d max_uV: %d\n" , + __func__, id, min_uV, max_uV); + +if (min_uV >= mc13xxx_regulators[id].voltages[0 ] && + max_uV <= mc13xxx_regulators[id].voltages[0 ]) +return 0 ; +else +return -EINVAL ; +} + +int mc13xxx_fixed_regulator_get_voltage (struct regulator_dev *rdev) +{ +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; +int id =rdev_get_id (rdev); + +dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id); + +return mc13xxx_regulators[id].voltages[0 ]; +} + +struct regulator_ops mc13xxx_fixed_regulator_ops = { + .enable = mc13xxx_regulator_enable, + .disable = mc13xxx_regulator_disable, + .is_enabled = mc13xxx_regulator_is_enabled, + .list_voltage = mc13xxx_regulator_list_voltage, + .set_voltage = mc13xxx_fixed_regulator_set_voltage, + .get_voltage = mc13xxx_fixed_regulator_get_voltage, +}; + +int mc13xxx_sw_regulator (struct regulator_dev *rdev) +{ +return 0 ; +}
drivers/regulator/mc13xxx-regulator-core.c line 241
Quoted 10 lines
drivers/regulator/mc13xxx-regulator-core.c new file +10
-0+ +int mc13xxx_sw_regulator_is_enabled (struct regulator_dev *rdev) +{ +return 1 ; +} + +MODULE_LICENSE ("GPL v2" ); +MODULE_AUTHOR ("Yong Shen <[email protected]>" ); +MODULE_DESCRIPTION ("Regulator Driver for Freescale MC13xxx PMIC" ); +MODULE_ALIAS ("platform:mc13xxx-regulator-core" );
How can this work ? From a quick look, nothing else is using mc13xxx-regulator-core.
include/linux/mfd/mc13783.h int mc13783_adc_do_conversion(struct mc13783 · line 124
Quoted 13 lines
include/linux/mfd/mc13783.h +1
-0@@ -1,4 +1,5 @@/* +* Copyright 2010 Yong Shen <[email protected]> * Copyright 2009-2010 Pengutronix * Uwe Kleine-Koenig <[email protected]> * @@ -122,39 +123,39 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode, unsigned int channel, unsigned int *sample);
patch broken here.
Quoted 58 lines
include/linux/mfd/mc13783.h +23
-33-#define MC13783_SW_SW1A 0 -#define MC13783_SW_SW1B 1 -#define MC13783_SW_SW2A 2 -#define MC13783_SW_SW2B 3 -#define MC13783_SW_SW3 4 -#define MC13783_SW_PLL 5 -#define MC13783_REGU_VAUDIO 6 -#define MC13783_REGU_VIOHI 7 -#define MC13783_REGU_VIOLO 8 -#define MC13783_REGU_VDIG 9 -#define MC13783_REGU_VGEN 10 -#define MC13783_REGU_VRFDIG 11 -#define MC13783_REGU_VRFREF 12 -#define MC13783_REGU_VRFCP 13 -#define MC13783_REGU_VSIM 14 -#define MC13783_REGU_VESIM 15 -#define MC13783_REGU_VCAM 16 -#define MC13783_REGU_VRFBG 17 -#define MC13783_REGU_VVIB 18 -#define MC13783_REGU_VRF1 19 -#define MC13783_REGU_VRF2 20 -#define MC13783_REGU_VMMC1 21 -#define MC13783_REGU_VMMC2 22 -#define MC13783_REGU_GPO1 23 -#define MC13783_REGU_GPO2 24 -#define MC13783_REGU_GPO3 25 -#define MC13783_REGU_GPO4 26 -#define MC13783_REGU_V1 27 -#define MC13783_REGU_V2 28 -#define MC13783_REGU_V3 29 -#define MC13783_REGU_V4 30 -#define MC13783_REGU_PWGT1SPI 31 -#define MC13783_REGU_PWGT2SPI 32 +#define MC13783_REG_SW1A 0 +#define MC13783_REG_SW1B 1 +#define MC13783_REG_SW2A 2 +#define MC13783_REG_SW2B 3 +#define MC13783_REG_SW3 4 +#define MC13783_REG_PLL 5 +#define MC13783_REG_VAUDIO 6 +#define MC13783_REG_VIOHI 7 +#define MC13783_REG_VIOLO 8 +#define MC13783_REG_VDIG 9 +#define MC13783_REG_VGEN 10 +#define MC13783_REG_VRFDIG 11 +#define MC13783_REG_VRFREF 12 +#define MC13783_REG_VRFCP 13 +#define MC13783_REG_VSIM 14 +#define MC13783_REG_VESIM 15 +#define MC13783_REG_VCAM 16 +#define MC13783_REG_VRFBG 17 +#define MC13783_REG_VVIB 18 +#define MC13783_REG_VRF1 19 +#define MC13783_REG_VRF2 20 +#define MC13783_REG_VMMC1 21 +#define MC13783_REG_VMMC2 22
include/linux/mfd/mc13783.h int mc13783_adc_do_conversion(struct mc13783 · line 157
Quoted 10 lines
include/linux/mfd/mc13783.h +10
-0+#define MC13783_REG_GPO1 23 +#define MC13783_REG_GPO2 24 +#define MC13783_REG_GPO3 25 +#define MC13783_REG_GPO4 26 +#define MC13783_REG_V1 27 +#define MC13783_REG_V2 28 +#define MC13783_REG_V3 29 +#define MC13783_REG_V4 30 +#define MC13783_REG_PWGT1SPI 31 +#define MC13783_REG_PWGT2SPI 32
What's the purpose of this mass renaming ?
Arnaud
PATCH 1/1 make mc13783 code generic
Hi Arnaud,
Thanks for quick response.
First of all, due to I am behind a firewall in the office, so I can not send out patch by 'git send-email', maybe that's why you found some format issue. Next time, I will enclose the patch as an attachment or I manage to send out patch at home. Sorry for the inconvenience.
Please find out further feedback inline.
Yong
Quoted 6 lines · Arnaud Patard
Quoted 1 line · Yong Shen
Hi there,
Hi,
Quoted 1 line
Quoted 8 lines
Quoted 3 lines
For better code share between mc13783 and mc13892, I did some clean up and move some common code to a separated file. And mc13892 code will come after this patch.
Please find comments below. They've been done only after looking at the patch so num build-test, no runtime-test. Moreover, the patch have been broken by something as there's word wrapping at some places, making patch rather grumpy.
I have done build test and run time test. This is patch is based ongit://git.pengutronix.de/git/imx/linux-2.6.git and on branch imx-for-2.6.38. Maybe you patched it on other repo.
Quoted 40 lines
Quoted 34 lines
Thanks
YongQuoted 1 line
From
98e187834085624c3651587da56da48bec958e05Mon Sep 17 00:00:00 2001From: Yong Shen <[email protected]>
Date: Tue, 30 Nov 2010 14:11:34 +0800
Subject: [PATCH] make mc13783 code genericmove some common functions and micros to a seperate file, which makes it possible for mc13892 to share code
Signed-off-by Yong Shen <[email protected]>---
?drivers/regulator/Makefile ? ? ? ? ? ? ? ? | ? ?2 +- ?drivers/regulator/mc13783-regulator.c ? ? ?| ?311 +++++----------------------- ?drivers/regulator/mc13xxx-regulator-core.c | ?241 +++++++++++++++++++++ ?include/linux/mfd/mc13783.h ? ? ? ? ? ? ? ?| ? 67 +++--- ?include/linux/regulator/mc13xxx.h ? ? ? ? ?| ?101 +++++++++?5 files changed, 426 insertions(+), 296 deletions(-) ?create mode 100644
drivers/regulator/mc13xxx-regulator-core.c?create mode 100644include/linux/regulator/mc13xxx.hdrivers/regulator/Makefile +0
-0@@ -29,7 +29,7 @@ obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o?obj-$(CONFIG_REGULATOR_DA903X) ? ? ? += da903x.o ?obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o ?obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
drivers/regulator/Makefile +1
-1-obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o +obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o mc13xxx-regulator-core.oQuoted 1 line
?obj-$(CONFIG_REGULATOR_AB3100) += ab3100.o
Why don't you add a common
Kconfigentry ? I've the (wrong ?) feeling that you're going to do :
obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o mc13xxx-regulator-core.o
Quoted 2 lines
which should be avoided. Being able to build mc13783 and mc13892 support at the same time is a must-have imho.
Agreed.
Quoted 74 lines
Quoted 54 lines
?obj-$(CONFIG_REGULATOR_TPS65023) += tps65023-regulator.o
drivers/regulator/mc13783-regulator.c +0
-0@@ -1,6 +1,7 @@?/*
? * Regulator Driver for Freescale MC13783 PMIC
? *
+ * Copyright 2010 Yong Shen <[email protected]>
? * Copyright (C) 2008 Sascha Hauer, Pengutronix <[email protected]> ? * Copyright 2009 Alberto Panizzo <[email protected]> ? *drivers/regulator/mc13783-regulator.c +0
-0@@ -10,6 +11,7 @@? */
?#include <
linux/mfd/mc13783.h>
+#include <linux/regulator/mc13xxx.h>
?#include <linux/regulator/machine.h>
?#include <linux/regulator/driver.h>
?#include <linux/platform_device.h>drivers/regulator/mc13783-regulator.c +0
-10@@ -89,16 +91,6 @@ ?#define MC13783_REG_POWERMISC_PWGTSPI_M ? ? ? ? ? ? ? ? ? ? ?(3 << 15) -struct mc13783_regulator { - ? ? struct regulator_desc desc; - ? ? int reg; - ? ? int enable_bit; - ? ? int vsel_reg; - ? ? int vsel_shift; - ? ? int vsel_mask; - ? ? int const *voltages; -}; -?/* Voltage Values */
?static const int const mc13783_sw3_val[] = {
? ? ? 5000000, 5000000, 5000000, 5500000,drivers/regulator/mc13783-regulator.c +1
-2@@ -175,10 +167,9 @@ static const int const mc13783_pwgtdrv_val[] = { ? ? ? 5500000, ?}; -static struct regulator_ops mc13783_regulator_ops; -static struct regulator_ops mc13783_fixed_regulator_ops; ?static struct regulator_ops mc13783_gpo_regulator_ops; +/* ?#define MC13783_DEFINE(prefix, _name, _reg, _vsel_reg, _voltages) ? ?\ ? ? ? [MC13783_ ## prefix ## _ ## _name] = { ? ? ? ? ? ? ? ? ? ? ? ? ?\ ? ? ? ? ? ? ? .desc = { ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \ drivers/regulator/mc13783-regulator.c static struct regulator_ops mc13783_gpo_regulator_ops; · line 190
Quoted 4 lines
drivers/regulator/mc13783-regulator.c +1
-0@@ -196,43 +187,26 @@ static struct regulator_ops mc13783_gpo_regulator_ops;? ? ? ? ? ? ? .vsel_mask = MC13783_REG_ ## _vsel_reg ## _ ## _name ## VSEL_M,\ ? ? ? ? ? ? ? .voltages = ?_voltages, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \ ? ? ? } +? ? */ Forgot to remove it before sending the patch ?
Quoted 13 lines
drivers/regulator/mc13783-regulator.c +0
-12-#define MC13783_FIXED_DEFINE (prefix, _name, _reg, _voltages) ? ? ? ? \ - ? ? [MC13783_ ## prefix ## _ ## _name] = { ? ? ? ? ? ? ? ? ? ? ? ? ?\ - ? ? ? ? ? ? .desc = { ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \ - ? ? ? ? ? ? ? ? ? ? .name = #prefix "_" #_name, ? ? ? ? ? ? ? ? ? ? \ - ? ? ? ? ? ? ? ? ? ? .n_voltages = ARRAY_SIZE(_voltages), ? ? ? ? ? ?\ - ? ? ? ? ? ? ? ? ? ? .ops = &mc13783_fixed_regulator_ops, ? ? ? ? ? ?\ - ? ? ? ? ? ? ? ? ? ? .type = REGULATOR_VOLTAGE, ? ? ? ? ? ? ? ? ? ? ?\ - ? ? ? ? ? ? ? ? ? ? .id = MC13783_ ## prefix ## _ ## _name, ? ? ? ? \ - ? ? ? ? ? ? ? ? ? ? .owner = THIS_MODULE, ? ? ? ? ? ? ? ? ? ? ? ? ? \ - ? ? ? ? ? ? }, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?\ - ? ? ? ? ? ? .reg = MC13783_REG_ ## _reg, ? ? ? ? ? ? ? ? ? ? ? ? ? ?\ - ? ? ? ? ? ? .enable_bit = MC13783_REG_ ## _reg ## _ ## _name ## EN, \
Quoted 8 lines
drivers/regulator/mc13783-regulator.c static struct regulator_ops mc13783_gpo_regulator_ops; · line 193
Quoted 5 lines
drivers/regulator/mc13783-regulator.c +3
-2- ? ? ? ? ? ? .voltages = ?_voltages, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \ - ? ? } +#define MC13783_DEFINE (prefix, name, reg, vsel_reg, voltages) ? ? ? ?\ + ? ? MC13xxx_DEFINE(MC13783_REG_, name, reg, vsel_reg, voltages, \ + ? ? ? ? ? ? ? ? ? ? mc13xxx_regulator_ops)Why don't you just modify mc13783 driver to use MC13xxx_* instead of doing this ?
I try to modify less code, so those entries in the table don't have to be changed.
Quoted 414 lines
Quoted 19 lines
drivers/regulator/mc13783-regulator.c +3
-14-#define MC13783_GPO_DEFINE(prefix, _name, _reg, ?_voltages) ? ? ? ? ?\ - ? ? [MC13783_ ## prefix ## _ ## _name] = { ? ? ? ? ? ? ? ? ? ? ? ? ?\ - ? ? ? ? ? ? .desc = { ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \ - ? ? ? ? ? ? ? ? ? ? .name = #prefix "_" #_name, ? ? ? ? ? ? ? ? ? ? \ - ? ? ? ? ? ? ? ? ? ? .n_voltages = ARRAY_SIZE(_voltages), ? ? ? ? ? ?\ - ? ? ? ? ? ? ? ? ? ? .ops = &mc13783_gpo_regulator_ops, ? ? ? ? ? ? ?\ - ? ? ? ? ? ? ? ? ? ? .type = REGULATOR_VOLTAGE, ? ? ? ? ? ? ? ? ? ? ?\ - ? ? ? ? ? ? ? ? ? ? .id = MC13783_ ## prefix ## _ ## _name, ? ? ? ? \ - ? ? ? ? ? ? ? ? ? ? .owner = THIS_MODULE, ? ? ? ? ? ? ? ? ? ? ? ? ? \ - ? ? ? ? ? ? }, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?\ - ? ? ? ? ? ? .reg = MC13783_REG_ ## _reg, ? ? ? ? ? ? ? ? ? ? ? ? ? ?\ - ? ? ? ? ? ? .enable_bit = MC13783_REG_ ## _reg ## _ ## _name ## EN, \ - ? ? ? ? ? ? .voltages = ?_voltages, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \ - ? ? } +#define MC13783_FIXED_DEFINE (prefix, name, reg, voltages) ? ? ? ? ? ?\ + ? ? MC13xxx_FIXED_DEFINE(MC13783_REG_, name, reg, voltages, \ + ? ? ? ? ? ? ? ? ? ? mc13xxx_fixed_regulator_ops)drivers/regulator/mc13783-regulator.c static struct regulator_ops mc13783_gpo_regulator_ops; · line 206
Quoted 10 lines
drivers/regulator/mc13783-regulator.c +4
-0+ +#define MC13783_GPO_DEFINE (prefix, name, reg, voltages) ? ? ? ? ? ? ?\ + ? ? MC13xxx_GPO_DEFINE(MC13783_REG_, name, reg, voltages, \ + ? ? ? ? ? ? ? ? ? ? mc13783_gpo_regulator_ops) ?#define MC13783_DEFINE_SW(_name, _reg, _vsel_reg, _voltages) ? ? ? ? \ ? ? ? MC13783_DEFINE(SW, _name, _reg, _vsel_reg, _voltages) ?#define MC13783_DEFINE_REGU(_name, _reg, _vsel_reg, _voltages) ? ? ? ? ? ? ? \ ? ? ? MC13783_DEFINE(REGU, _name, _reg, _vsel_reg, _voltages)same here.
Quoted 217 lines
drivers/regulator/mc13783-regulator.c +4
-195-static struct mc13783_regulator mc13783_regulators[] = { +static struct mc13xxx_regulator mc13783_regulators[] = { ? ? ? MC13783_DEFINE_SW(SW3, SWITCHERS5, SWITCHERS5, mc13783_sw3_val), ? ? ? MC13783_FIXED_DEFINE(REGU, VAUDIO, REGULATORMODE0, mc13783_vaudio_val),@@ -274,207 +248,16 @@ static struct mc13783_regulator mc13783_regulators[] = { ? ? ? MC13783_GPO_DEFINE(REGU, PWGT2SPI, POWERMISC, mc13783_pwgtdrv_val), ?}; -struct mc13783_regulator_priv { - ? ? struct mc13783 *mc13783; - ? ? u32 powermisc_pwgt_state; - ? ? struct regulator_dev *regulators[]; -}; - -static int mc13783_regulator_enable (struct regulator_dev *rdev) -{ - ? ? struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev); - ? ? int id = rdev_get_id(rdev); - ? ? int ret; - - ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); - - ? ? mc13783_lock(priv->mc13783); - ? ? ret = mc13783_reg_rmw(priv->mc13783, mc13783_regulators[id].reg, - ? ? ? ? ? ? ? ? ? ? mc13783_regulators[id].enable_bit, - ? ? ? ? ? ? ? ? ? ? mc13783_regulators[id].enable_bit); - ? ? mc13783_unlock(priv->mc13783); - - ? ? return ret; -} - -static int mc13783_regulator_disable (struct regulator_dev *rdev) -{ - ? ? struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev); - ? ? int id = rdev_get_id(rdev); - ? ? int ret; - - ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); - - ? ? mc13783_lock(priv->mc13783); - ? ? ret = mc13783_reg_rmw(priv->mc13783, mc13783_regulators[id].reg, - ? ? ? ? ? ? ? ? ? ? mc13783_regulators[id].enable_bit, 0); - ? ? mc13783_unlock(priv->mc13783); - - ? ? return ret; -} - -static int mc13783_regulator_is_enabled (struct regulator_dev *rdev) -{ - ? ? struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev); - ? ? int ret, id = rdev_get_id(rdev); - ? ? unsigned int val; - - ? ? mc13783_lock(priv->mc13783); - ? ? ret = mc13783_reg_read(priv->mc13783, mc13783_regulators[id].reg, &val); - ? ? mc13783_unlock(priv->mc13783); - - ? ? if (ret) - ? ? ? ? ? ? return ret; - - ? ? return (val & mc13783_regulators[id].enable_bit) != 0; -} - -static int mc13783_regulator_list_voltage (struct regulator_dev *rdev, - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? unsigned selector) -{ - ? ? int id = rdev_get_id(rdev); - - ? ? if (selector >= mc13783_regulators[id].desc.n_voltages) - ? ? ? ? ? ? return -EINVAL; - - ? ? return mc13783_regulators[id].voltages[selector]; -} - -static int mc13783_get_best_voltage_index (struct regulator_dev *rdev, - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int min_uV, int max_uV) -{ - ? ? int reg_id = rdev_get_id(rdev); - ? ? int i; - ? ? int bestmatch; - ? ? int bestindex; - - ? ? /* - ? ? ?* Locate the minimum voltage fitting the criteria on - ? ? ?* this regulator. The switchable voltages are not - ? ? ?* in strict falling order so we need to check them - ? ? ?* all for the best match. - ? ? ?*/ - ? ? bestmatch = INT_MAX; - ? ? bestindex = -1; - ? ? for (i = 0; i < mc13783_regulators[reg_id].desc.n_voltages; i++) { - ? ? ? ? ? ? if (mc13783_regulators[reg_id].voltages[i] >= min_uV && - ? ? ? ? ? ? ? ? mc13783_regulators[reg_id].voltages[i] < bestmatch) { - ? ? ? ? ? ? ? ? ? ? bestmatch = mc13783_regulators[reg_id].voltages[i]; - ? ? ? ? ? ? ? ? ? ? bestindex = i; - ? ? ? ? ? ? } - ? ? } - - ? ? if (bestindex < 0 || bestmatch > max_uV) { - ? ? ? ? ? ? dev_warn(&rdev->dev, "no possible value for %d<=x<=%d uV\n", - ? ? ? ? ? ? ? ? ? ? ? ? ? ? min_uV, max_uV); - ? ? ? ? ? ? return -EINVAL; - ? ? } - ? ? return bestindex; -} - -static int mc13783_regulator_set_voltage (struct regulator_dev *rdev, - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int min_uV, int max_uV) -{ - ? ? struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev); - ? ? int value, id = rdev_get_id(rdev); - ? ? int ret; - - ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d min_uV: %d max_uV: %d\n", - ? ? ? ? ? ? __func__, id, min_uV, max_uV); - - ? ? /* Find the best index */ - ? ? value = mc13783_get_best_voltage_index(rdev, min_uV, max_uV); - ? ? dev_dbg(rdev_get_dev(rdev), "%s best value: %d \n", __func__, value); - ? ? if (value < 0) - ? ? ? ? ? ? return value; - - ? ? mc13783_lock(priv->mc13783); - ? ? ret = mc13783_reg_rmw(priv->mc13783, mc13783_regulators[id].vsel_reg, - ? ? ? ? ? ? ? ? ? ? mc13783_regulators[id].vsel_mask, - ? ? ? ? ? ? ? ? ? ? value << mc13783_regulators[id].vsel_shift); - ? ? mc13783_unlock(priv->mc13783); - - ? ? return ret; -} - -static int mc13783_regulator_get_voltage (struct regulator_dev *rdev) -{ - ? ? struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev); - ? ? int ret, id = rdev_get_id(rdev); - ? ? unsigned int val; - - ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); - - ? ? mc13783_lock(priv->mc13783); - ? ? ret = mc13783_reg_read(priv->mc13783, - ? ? ? ? ? ? ? ? ? ? ? ? ? ? mc13783_regulators[id].vsel_reg, &val); - ? ? mc13783_unlock(priv->mc13783); - - ? ? if (ret) - ? ? ? ? ? ? return ret; - - ? ? val = (val & mc13783_regulators[id].vsel_mask) - ? ? ? ? ? ? >> mc13783_regulators[id].vsel_shift; - - ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d val: %d\n", __func__, id, val); - - ? ? BUG_ON(val < 0 || val > mc13783_regulators[id].desc.n_voltages); - - ? ? return mc13783_regulators[id].voltages[val]; -} - -static struct regulator_ops mc13783_regulator_ops = { - ? ? .enable = mc13783_regulator_enable, - ? ? .disable = mc13783_regulator_disable, - ? ? .is_enabled = mc13783_regulator_is_enabled, - ? ? .list_voltage = mc13783_regulator_list_voltage, - ? ? .set_voltage = mc13783_regulator_set_voltage, - ? ? .get_voltage = mc13783_regulator_get_voltage, -}; - -static int mc13783_fixed_regulator_set_voltage (struct regulator_dev *rdev, - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int min_uV, int max_uV) -{ - ? ? int id = rdev_get_id(rdev); - - ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d min_uV: %d max_uV: %d\n", - ? ? ? ? ? ? __func__, id, min_uV, max_uV); - - ? ? if (min_uV >= mc13783_regulators[id].voltages[0] && - ? ? ? ? max_uV <= mc13783_regulators[id].voltages[0]) - ? ? ? ? ? ? return 0; - ? ? else - ? ? ? ? ? ? return -EINVAL; -} - -static int mc13783_fixed_regulator_get_voltage (struct regulator_dev *rdev) -{ - ? ? int id = rdev_get_id(rdev); - - ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); - - ? ? return mc13783_regulators[id].voltages[0]; -} - -static struct regulator_ops mc13783_fixed_regulator_ops = { - ? ? .enable = mc13783_regulator_enable, - ? ? .disable = mc13783_regulator_disable, - ? ? .is_enabled = mc13783_regulator_is_enabled, - ? ? .list_voltage = mc13783_regulator_list_voltage, - ? ? .set_voltage = mc13783_fixed_regulator_set_voltage, - ? ? .get_voltage = mc13783_fixed_regulator_get_voltage, -}; - -int mc13783_powermisc_rmw (struct mc13783_regulator_priv *priv,u32 mask, +int mc13783_powermisc_rmw (struct mc13xxx_regulator_priv *priv,u32 mask, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? u32 val) ?{ - ? ? struct mc13783 *mc13783 = priv->mc13783; + ? ? struct mc13xxx *mc13783 = priv->mc13xxx; ? ? ? int ret; ? ? ? u32 valread; ? ? ? BUG_ON(val & ~mask); - ? ? ret = mc13783_reg_read(mc13783, MC13783_REG_POWERMISC, &valread); + ? ? ret = mc13xxx_reg_read(mc13783, MC13783_REG_POWERMISC, &valread); ? ? ? if (ret) ? ? ? ? ? ? ? return ret;drivers/regulator/mc13783-regulator.c int mc13783_powermisc_rmw(struct · line 272
Quoted 1 line
drivers/regulator/mc13783-regulator.c +0
-0@@ -489,34 +272,36 @@ int mc13783_powermisc_rmw(struct mc13783_regulator_priv *priv, u32 mask,patch broken.
Quoted 46 lines
? ? ? valread = (valread & ~MC13783_REG_POWERMISC_PWGTSPI_M) | ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?
priv->powermisc_pwgt_state;- ? ? return
mc13783_reg_write(mc13783, MC13783_REG_POWERMISC, valread);
+ ? ? returnmc13xxx_reg_write(mc13783, MC13783_REG_POWERMISC, valread); ?}?static int
mc13783_gpo_regulator_enable(struct regulator_dev *rdev)?{
- ? ? structmc13783_regulator_priv*priv =rdev_get_drvdata(rdev);
+ ? ? structmc13xxx_regulator_priv*priv =rdev_get_drvdata(rdev);
+ ? ? structmc13xxx_regulator*mc13xxx_regulators=priv->mc13xxx_regulators; ? ? ? int id =rdev_get_id(rdev);
? ? ? int ret;
- ? ? u32en_val= mc13783_regulators[id].enable_bit;
+ ? ? u32en_val= mc13xxx_regulators[id].enable_bit;? ? ?
dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);? ? ? /* Power Gate enable value is 0 */
- ? ? if (id ==MC13783_REGU_PWGT1SPI||
- ? ? ? ? id ==MC13783_REGU_PWGT2SPI)
+ ? ? if (id ==MC13783_REG_PWGT1SPI||
+ ? ? ? ? id ==MC13783_REG_PWGT2SPI)
? ? ? ? ? ? ?en_val= 0;- ? ?
mc13783_lock(priv->mc13783);
- ? ? ret = mc13783_powermisc_rmw(priv, mc13783_regulators[id].enable_bit,
+ ? ?mc13xxx_lock(priv->mc13xxx);
+ ? ? ret =mc13783_powermisc_rmw(priv, mc13xxx_regulators[id].enable_bit, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? en_val);
- ? ?mc13783_unlock(priv->mc13783);
+ ? ?mc13xxx_unlock(priv->mc13xxx);? ? ? return ret;
?}?static int
mc13783_gpo_regulator_disable(struct regulator_dev *rdev)?{
- ? ? structmc13783_regulator_priv*priv =rdev_get_drvdata(rdev);
+ ? ? structmc13xxx_regulator_priv*priv =rdev_get_drvdata(rdev);
+ ? ? structmc13xxx_regulator*mc13xxx_regulators=priv->mc13xxx_regulators; ? ? ? int id =rdev_get_id(rdev);
? ? ? int ret;
? ? ? u32dis_val= 0;drivers/regulator/mc13783-regulator.c static int mc13783_gpo_regulator_disable(struct · line 309
Quoted 1 line
drivers/regulator/mc13783-regulator.c +0
-0@@ -524,27 +309,28 @@ static int mc13783_gpo_regulator_disable(struct regulator_dev *rdev)again.
Quoted 39 lines
drivers/regulator/mc13783-regulator.c +0
-0? ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);? ? ? /* Power Gate disable value is 1 */
- ? ? if (id ==MC13783_REGU_PWGT1SPI||
- ? ? ? ? id ==MC13783_REGU_PWGT2SPI)
- ? ? ? ? ? ?dis_val= mc13783_regulators[id].enable_bit;
+ ? ? if (id ==MC13783_REG_PWGT1SPI||
+ ? ? ? ? id ==MC13783_REG_PWGT2SPI)
+ ? ? ? ? ? ?dis_val= mc13xxx_regulators[id].enable_bit;- ? ?
mc13783_lock(priv->mc13783);
- ? ? ret = mc13783_powermisc_rmw(priv, mc13783_regulators[id].enable_bit,
+ ? ?mc13xxx_lock(priv->mc13xxx);
+ ? ? ret =mc13783_powermisc_rmw(priv, mc13xxx_regulators[id].enable_bit, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? dis_val);
- ? ?mc13783_unlock(priv->mc13783);
+ ? ?mc13xxx_unlock(priv->mc13xxx);? ? ? return ret;
?}?static int
mc13783_gpo_regulator_is_enabled(struct regulator_dev *rdev)?{
- ? ? structmc13783_regulator_priv*priv =rdev_get_drvdata(rdev);
+ ? ? structmc13xxx_regulator_priv*priv =rdev_get_drvdata(rdev);
+ ? ? structmc13xxx_regulator*mc13xxx_regulators=priv->mc13xxx_regulators; ? ? ? int ret, id =rdev_get_id(rdev);
? ? ? unsigned int val;- ? ?
mc13783_lock(priv->mc13783);
- ? ? ret =mc13783_reg_read(priv->mc13783, mc13783_regulators[id].reg, &val);
- ? ?mc13783_unlock(priv->mc13783);
+ ? ?mc13xxx_lock(priv->mc13xxx);
+ ? ? ret =mc13xxx_reg_read(priv->mc13xxx, mc13xxx_regulators[id].reg, &val);
+ ? ?mc13xxx_unlock(priv->mc13xxx);? ? ? if (ret)
? ? ? ? ? ? ? return ret;drivers/regulator/mc13783-regulator.c static int · line 340
Quoted 1 line
drivers/regulator/mc13783-regulator.c +0
-0@@ -554,22 +340,22 @@ static int mc13783_gpo_regulator_is_enabled(struct regulator_dev *rdev)yet an other one
Quoted 68 lines
? ? ? val = (val & ~MC13783_REG_POWERMISC_PWGTSPI_M) |
? ? ? ? ? ? (priv->powermisc_pwgt_state^MC13783_REG_POWERMISC_PWGTSPI_M);- ? ? return (val & mc13783_regulators[id].enable_bit) != 0;
+ ? ? return (val & mc13xxx_regulators[id].enable_bit) != 0; ?}?static struct
regulator_opsmc13783_gpo_regulator_ops= { ? ? ? .enable =mc13783_gpo_regulator_enable,
? ? ? .disable =mc13783_gpo_regulator_disable,
? ? ? .is_enabled =mc13783_gpo_regulator_is_enabled,
- ? ? .list_voltage =mc13783_regulator_list_voltage,
- ? ? .set_voltage =mc13783_fixed_regulator_set_voltage,
- ? ? .get_voltage =mc13783_fixed_regulator_get_voltage,
+ ? ? .list_voltage =mc13xxx_regulator_list_voltage,
+ ? ? .set_voltage =mc13xxx_fixed_regulator_set_voltage,
+ ? ? .get_voltage =mc13xxx_fixed_regulator_get_voltage, ?};?static int
__devinitmc13783_regulator_probe(struct platform_device *pdev)?{
- ? ? structmc13783_regulator_priv*priv;
- ? ? struct mc13783 *mc13783 =dev_get_drvdata(pdev->dev.parent);
+ ? ? structmc13xxx_regulator_priv*priv;
+ ? ? struct mc13xxx *mc13783 =dev_get_drvdata(pdev->dev.parent); ? ? ? structmc13783_regulator_platform_data*pdata =
? ? ? ? ? ? ?dev_get_platdata(&pdev->dev);
? ? ? structmc13783_regulator_init_data*init_data;drivers/regulator/mc13783-regulator.c +2
-1@@ -583,7 +369,8 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev) ? ? ? if (!priv) ? ? ? ? ? ? ? return -ENOMEM; - ? ? priv->mc13783 = mc13783; + ? ? priv->mc13xxx_regulators = mc13783_regulators; + ? ? priv->mc13xxx = mc13783; ? ? ? for (i = 0; i < pdata->num_regulators; i++) {? ? ? ? ? ? ?
init_data= &pdata->regulators[i];drivers/regulator/mc13783-regulator.c +1
-1@@ -613,7 +400,7 @@ err: ?static int __devexit mc13783_regulator_remove(struct platform_device *pdev) ?{ - ? ? struct mc13783_regulator_priv *priv = platform_get_drvdata(pdev); + ? ? struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);? ? ? struct
mc13783_regulator_platform_data*pdata = ? ? ? ? ? ? ?dev_get_platdata(&pdev->dev);
? ? ? int i;drivers/regulator/mc13xxx-regulator-core.c new file +13
-0@@ -0,0 +1,241 @@ +/* +* Regulator Driver for Freescale MC13xxx PMIC +* +* Copyright 2010 Yong Shen <[email protected]> +* +* Based on mc13783 regulator driver : +* Copyright (C) 2008 Sascha Hauer, Pengutronix <[email protected]> +* Copyright 2009 Alberto Panizzo <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*
Quoted 9 lines
drivers/regulator/mc13xxx-regulator-core.c line 18
Quoted 5 lines
drivers/regulator/mc13xxx-regulator-core.c new file +5
-0+* Regs infos taken from mc13xxx drivers from freescale and mc13xxx.pdf file +* from freescale +*/ + +#define DEBUG drop this. It's nice for debugging but not for merged code.
CONFIG_REGULATOR_DEBUGis there for that.
Agreed.
Quoted 306 lines
Quoted 213 lines
drivers/regulator/mc13xxx-regulator-core.c new file +213
-0+ +#include <linux/mfd/mc13xxx.h> +#include <linux/regulator/mc13xxx.h> +#include <linux/regulator/machine.h> +#include <linux/regulator/driver.h> +#include <linux/platform_device.h> +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/init.h> +#include <linux/err.h> + +static int mc13xxx_regulator_enable (struct regulator_dev *rdev) +{ + ? ? struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); + ? ? struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + ? ? int id = rdev_get_id(rdev); + ? ? int ret; + + ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); + + ? ? mc13xxx_lock(priv->mc13xxx); + ? ? ret = mc13xxx_reg_rmw(priv->mc13xxx, mc13xxx_regulators[id].reg, + ? ? ? ? ? ? ? ? ? ? mc13xxx_regulators[id].enable_bit, + ? ? ? ? ? ? ? ? ? ? mc13xxx_regulators[id].enable_bit); + ? ? mc13xxx_unlock(priv->mc13xxx); + + ? ? return ret; +} + +static int mc13xxx_regulator_disable (struct regulator_dev *rdev) +{ + ? ? struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); + ? ? struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + ? ? int id = rdev_get_id(rdev); + ? ? int ret; + + ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); + + ? ? mc13xxx_lock(priv->mc13xxx); + ? ? ret = mc13xxx_reg_rmw(priv->mc13xxx, mc13xxx_regulators[id].reg, + ? ? ? ? ? ? ? ? ? ? mc13xxx_regulators[id].enable_bit, 0); + ? ? mc13xxx_unlock(priv->mc13xxx); + + ? ? return ret; +} + +static int mc13xxx_regulator_is_enabled (struct regulator_dev *rdev) +{ + ? ? struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); + ? ? struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + ? ? int ret, id = rdev_get_id(rdev); + ? ? unsigned int val; + + ? ? mc13xxx_lock(priv->mc13xxx); + ? ? ret = mc13xxx_reg_read(priv->mc13xxx, mc13xxx_regulators[id].reg, &val); + ? ? mc13xxx_unlock(priv->mc13xxx); + + ? ? if (ret) + ? ? ? ? ? ? return ret; + + ? ? return (val & mc13xxx_regulators[id].enable_bit) != 0; +} + +int mc13xxx_regulator_list_voltage (struct regulator_dev *rdev, + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? unsigned selector) +{ + ? ? int id = rdev_get_id(rdev); + ? ? struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); + ? ? struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + + ? ? if (selector >= mc13xxx_regulators[id].desc.n_voltages) + ? ? ? ? ? ? return -EINVAL; + + ? ? return mc13xxx_regulators[id].voltages[selector]; +} + +int mc13xxx_get_best_voltage_index (struct regulator_dev *rdev, + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int min_uV, int max_uV) +{ + ? ? struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); + ? ? struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + ? ? int reg_id = rdev_get_id(rdev); + ? ? int i; + ? ? int bestmatch; + ? ? int bestindex; + + ? ? /* + ? ? ?* Locate the minimum voltage fitting the criteria on + ? ? ?* this regulator. The switchable voltages are not + ? ? ?* in strict falling order so we need to check them + ? ? ?* all for the best match. + ? ? ?*/ + ? ? bestmatch = INT_MAX; + ? ? bestindex = -1; + ? ? for (i = 0; i < mc13xxx_regulators[reg_id].desc.n_voltages; i++) { + ? ? ? ? ? ? if (mc13xxx_regulators[reg_id].voltages[i] >= min_uV && + ? ? ? ? ? ? ? ? mc13xxx_regulators[reg_id].voltages[i] < bestmatch) { + ? ? ? ? ? ? ? ? ? ? bestmatch = mc13xxx_regulators[reg_id].voltages[i]; + ? ? ? ? ? ? ? ? ? ? bestindex = i; + ? ? ? ? ? ? } + ? ? } + + ? ? if (bestindex < 0 || bestmatch > max_uV) { + ? ? ? ? ? ? dev_warn(&rdev->dev, "no possible value for %d<=x<=%d uV\n", + ? ? ? ? ? ? ? ? ? ? ? ? ? ? min_uV, max_uV); + ? ? ? ? ? ? return -EINVAL; + ? ? } + ? ? return bestindex; +} + +static int mc13xxx_regulator_set_voltage (struct regulator_dev *rdev, + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int min_uV, int max_uV) +{ + ? ? struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); + ? ? struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + ? ? int value, id = rdev_get_id(rdev); + ? ? int ret; + + ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d min_uV: %d max_uV: %d\n", + ? ? ? ? ? ? __func__, id, min_uV, max_uV); + + ? ? /* Find the best index */ + ? ? value = mc13xxx_get_best_voltage_index(rdev, min_uV, max_uV); + ? ? dev_dbg(rdev_get_dev(rdev), "%s best value: %d\n", __func__, value); + ? ? if (value < 0) + ? ? ? ? ? ? return value; + + ? ? mc13xxx_lock(priv->mc13xxx); + ? ? ret = mc13xxx_reg_rmw(priv->mc13xxx, mc13xxx_regulators[id].vsel_reg, + ? ? ? ? ? ? ? ? ? ? mc13xxx_regulators[id].vsel_mask, + ? ? ? ? ? ? ? ? ? ? value << mc13xxx_regulators[id].vsel_shift); + ? ? mc13xxx_unlock(priv->mc13xxx); + + ? ? return ret; +} + +static int mc13xxx_regulator_get_voltage (struct regulator_dev *rdev) +{ + ? ? struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); + ? ? struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + ? ? int ret, id = rdev_get_id(rdev); + ? ? unsigned int val; + + ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); + + ? ? mc13xxx_lock(priv->mc13xxx); + ? ? ret = mc13xxx_reg_read(priv->mc13xxx, + ? ? ? ? ? ? ? ? ? ? ? ? ? ? mc13xxx_regulators[id].vsel_reg, &val); + ? ? mc13xxx_unlock(priv->mc13xxx); + + ? ? if (ret) + ? ? ? ? ? ? return ret; + + ? ? val = (val & mc13xxx_regulators[id].vsel_mask) + ? ? ? ? ? ? >> mc13xxx_regulators[id].vsel_shift; + + ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d val: %d\n", __func__, id, val); + + ? ? BUG_ON(val < 0 || val > mc13xxx_regulators[id].desc.n_voltages); + + ? ? return mc13xxx_regulators[id].voltages[val]; +} + +struct regulator_ops mc13xxx_regulator_ops = { + ? ? .enable = mc13xxx_regulator_enable, + ? ? .disable = mc13xxx_regulator_disable, + ? ? .is_enabled = mc13xxx_regulator_is_enabled, + ? ? .list_voltage = mc13xxx_regulator_list_voltage, + ? ? .set_voltage = mc13xxx_regulator_set_voltage, + ? ? .get_voltage = mc13xxx_regulator_get_voltage, +}; + +int mc13xxx_fixed_regulator_set_voltage (struct regulator_dev *rdev, + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int min_uV, int max_uV) +{ + ? ? struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); + ? ? struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + ? ? int id = rdev_get_id(rdev); + + ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d min_uV: %d max_uV: %d\n", + ? ? ? ? ? ? __func__, id, min_uV, max_uV); + + ? ? if (min_uV >= mc13xxx_regulators[id].voltages[0] && + ? ? ? ? max_uV <= mc13xxx_regulators[id].voltages[0]) + ? ? ? ? ? ? return 0; + ? ? else + ? ? ? ? ? ? return -EINVAL; +} + +int mc13xxx_fixed_regulator_get_voltage (struct regulator_dev *rdev) +{ + ? ? struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); + ? ? struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + ? ? int id = rdev_get_id(rdev); + + ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); + + ? ? return mc13xxx_regulators[id].voltages[0]; +} + +struct regulator_ops mc13xxx_fixed_regulator_ops = { + ? ? .enable = mc13xxx_regulator_enable, + ? ? .disable = mc13xxx_regulator_disable, + ? ? .is_enabled = mc13xxx_regulator_is_enabled, + ? ? .list_voltage = mc13xxx_regulator_list_voltage, + ? ? .set_voltage = mc13xxx_fixed_regulator_set_voltage, + ? ? .get_voltage = mc13xxx_fixed_regulator_get_voltage, +}; + +int mc13xxx_sw_regulator (struct regulator_dev *rdev) +{ + ? ? return 0; +}drivers/regulator/mc13xxx-regulator-core.c line 241
Quoted 10 lines
drivers/regulator/mc13xxx-regulator-core.c new file +10
-0+ +int mc13xxx_sw_regulator_is_enabled (struct regulator_dev *rdev) +{ + ? ? return 1; +} + +MODULE_LICENSE ("GPL v2" ); +MODULE_AUTHOR ("Yong Shen <[email protected]>" ); +MODULE_DESCRIPTION ("Regulator Driver for Freescale MC13xxx PMIC" ); +MODULE_ALIAS ("platform:mc13xxx-regulator-core" );How can this work ? From a quick look, nothing else is using mc13xxx-regulator-core.
include/linux/mfd/mc13783.h int mc13783_adc_do_conversion(struct mc13783 · line 124
Quoted 13 lines
include/linux/mfd/mc13783.h +0
-0@@ -1,4 +1,5 @@?/*
+ * Copyright 2010 Yong Shen <[email protected]> ? * Copyright 2009-2010 Pengutronix
? * Uwe Kleine-Koenig <[email protected]> ? *include/linux/mfd/mc13783.h +0
-0@@ -122,39 +123,39 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode, ? ? ? ? ? ? ? unsigned int channel, unsigned int *sample);patch broken here.
Quoted 63 lines
include/linux/mfd/mc13783.h +28
-33-#define ? ? ?MC13783_SW_SW1A ? ? ? ? 0 -#define ? ? ?MC13783_SW_SW1B ? ? ? ? 1 -#define ? ? ?MC13783_SW_SW2A ? ? ? ? 2 -#define ? ? ?MC13783_SW_SW2B ? ? ? ? 3 -#define ? ? ?MC13783_SW_SW3 ? ? ? ? ?4 -#define ? ? ?MC13783_SW_PLL ? ? ? ? ?5 -#define ? ? ?MC13783_REGU_VAUDIO ? ? 6 -#define ? ? ?MC13783_REGU_VIOHI ? ? ?7 -#define ? ? ?MC13783_REGU_VIOLO ? ? ?8 -#define ? ? ?MC13783_REGU_VDIG ? ? ? 9 -#define ? ? ?MC13783_REGU_VGEN ? ? ? 10 -#define ? ? ?MC13783_REGU_VRFDIG ? ? 11 -#define ? ? ?MC13783_REGU_VRFREF ? ? 12 -#define ? ? ?MC13783_REGU_VRFCP ? ? ?13 -#define ? ? ?MC13783_REGU_VSIM ? ? ? 14 -#define ? ? ?MC13783_REGU_VESIM ? ? ?15 -#define ? ? ?MC13783_REGU_VCAM ? ? ? 16 -#define ? ? ?MC13783_REGU_VRFBG ? ? ?17 -#define ? ? ?MC13783_REGU_VVIB ? ? ? 18 -#define ? ? ?MC13783_REGU_VRF1 ? ? ? 19 -#define ? ? ?MC13783_REGU_VRF2 ? ? ? 20 -#define ? ? ?MC13783_REGU_VMMC1 ? ? ?21 -#define ? ? ?MC13783_REGU_VMMC2 ? ? ?22 -#define ? ? ?MC13783_REGU_GPO1 ? ? ? 23 -#define ? ? ?MC13783_REGU_GPO2 ? ? ? 24 -#define ? ? ?MC13783_REGU_GPO3 ? ? ? 25 -#define ? ? ?MC13783_REGU_GPO4 ? ? ? 26 -#define ? ? ?MC13783_REGU_V1 ? ? ? ? 27 -#define ? ? ?MC13783_REGU_V2 ? ? ? ? 28 -#define ? ? ?MC13783_REGU_V3 ? ? ? ? 29 -#define ? ? ?MC13783_REGU_V4 ? ? ? ? 30 -#define ? ? ?MC13783_REGU_PWGT1SPI ? 31 -#define ? ? ?MC13783_REGU_PWGT2SPI ? 32 +#define ? ? ?MC13783_REG_SW1A ? ? ? ? ? ? ? ?0 +#define ? ? ?MC13783_REG_SW1B ? ? ? ? ? ? ? ?1 +#define ? ? ?MC13783_REG_SW2A ? ? ? ? ? ? ? ?2 +#define ? ? ?MC13783_REG_SW2B ? ? ? ? ? ? ? ?3 +#define ? ? ?MC13783_REG_SW3 ? ? ? ? 4 +#define ? ? ?MC13783_REG_PLL ? ? ? ? 5 +#define ? ? ?MC13783_REG_VAUDIO ? ? ?6 +#define ? ? ?MC13783_REG_VIOHI ? ? ? 7 +#define ? ? ?MC13783_REG_VIOLO ? ? ? 8 +#define ? ? ?MC13783_REG_VDIG ? ? ? ?9 +#define ? ? ?MC13783_REG_VGEN ? ? ? ?10 +#define ? ? ?MC13783_REG_VRFDIG ? ? ?11 +#define ? ? ?MC13783_REG_VRFREF ? ? ?12 +#define ? ? ?MC13783_REG_VRFCP ? ? ? 13 +#define ? ? ?MC13783_REG_VSIM ? ? ? ?14 +#define ? ? ?MC13783_REG_VESIM ? ? ? 15 +#define ? ? ?MC13783_REG_VCAM ? ? ? ?16 +#define ? ? ?MC13783_REG_VRFBG ? ? ? 17 +#define ? ? ?MC13783_REG_VVIB ? ? ? ?18 +#define ? ? ?MC13783_REG_VRF1 ? ? ? ?19 +#define ? ? ?MC13783_REG_VRF2 ? ? ? ?20 +#define ? ? ?MC13783_REG_VMMC1 ? ? ? 21 +#define ? ? ?MC13783_REG_VMMC2 ? ? ? 22 +#define ? ? ?MC13783_REG_GPO1 ? ? ? ?23 +#define ? ? ?MC13783_REG_GPO2 ? ? ? ?24 +#define ? ? ?MC13783_REG_GPO3 ? ? ? ?25 +#define ? ? ?MC13783_REG_GPO4 ? ? ? ?26 +#define ? ? ?MC13783_REG_V1 ? ? ? ? ?27
Quoted 8 lines
include/linux/mfd/mc13783.h int mc13783_adc_do_conversion(struct mc13783 · line 157
Quoted 5 lines
include/linux/mfd/mc13783.h +5
-0+#define ? ? ?MC13783_REG_V2 ? ? ? ? ?28 +#define ? ? ?MC13783_REG_V3 ? ? ? ? ?29 +#define ? ? ?MC13783_REG_V4 ? ? ? ? ?30 +#define ? ? ?MC13783_REG_PWGT1SPI ? ?31 +#define ? ? ?MC13783_REG_PWGT2SPI ? ?32What's the purpose of this mass renaming ?
two reasons:
1. switches and regulators are basically the same in terms of providing voltage and current (different only in how they work inside chipset), so we don't have to try them differently in the micro definitions.
2. This changes make it easier for those micro definition, like MC13xxx_DEFINE.
Quoted 5 lines
Arnaud
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-make-mc13783-code-generic.patch
Type: text/x-patch
Size: 29780 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20101130/7a7a857f/attachment-0001.bin>
PATCH 1/1 make mc13783 code generic
Quoted 6 lines · Yong Shen
Hi Arnaud,
Thanks for quick response.
First of all, due to I am behind a firewall in the office, so I can not send out patch by 'git send-email', maybe that's why you found some format issue.
I don't know the exact problems you have with your firewall, but I'd expect that if you can send a mail with a normal MUA git-send-email should work, too.
I saw you using gmail, so maybe
https://git.wiki.kernel.org/index.php/GitTips#Using_gmail_to_send_your_patches
offers a working setup for you?
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 1/1 make mc13783 code generic
Uwe,
Thanks for the suggestion.
I had tried the method you mentioned long time ago, and it did not work since the port is blocked by the firewall. Next time, I will try to use my company's smtp server, however the constrain is that the company's smtp server may filter some emails from outside.
Thanks
Yong
2010/12/2 Uwe Kleine-K?nig <[email protected]>:
Quoted 24 lines · Yong Shen
Quoted 6 lines
Hi Arnaud,
Thanks for quick response.
First of all, due to I am behind a firewall in the office, so I can not send out patch by 'git send-email', maybe that's why you found some format issue.I don't know the exact problems you have with your firewall, but I'd expect that if you can send a mail with a normal MUA git-send-email should work, too.
I saw you using gmail, so maybe
? ? ? ?https://git.wiki.kernel.org/index.php/GitTips#Using_gmail_to_send_your_patches
offers a working setup for you?
Best regards
Uwe--
Pengutronix e.K. ? ? ? ? ? ? ? ? ? ? ? ? ? | Uwe Kleine-K?nig ? ? ? ? ? ?| Industrial Linux Solutions ? ? ? ? ? ? ? ? | http://www.pengutronix.de/ ?|
PATCH 1/1 make mc13783 code generic
In reply to Arnaud Patard (Rtp)Hello,
Quoted 16 lines · Arnaud Patard
drivers/regulator/Makefile obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o · line 33
Quoted 11 lines
drivers/regulator/Makefile +1
-1@@ -29,7 +29,7 @@ obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o obj-$(CONFIG_REGULATOR_DA903X) += da903x.o obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o -obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o +obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o mc13xxx-regulator-core.o obj-$(CONFIG_REGULATOR_AB3100) += ab3100.oWhy don't you add a common
Kconfigentry ? I've the (wrong ?) feeling that you're going to do :
obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o mc13xxx-regulator-core.o
Quoted 2 lines
which should be avoided. Being able to build mc13783 and mc13892 support at the same time is a must-have imho.
AFAIK using this idiom is just fine. You could argue that it's cleaner to have a CONFIG_REGULATOR_MC13XXX, but the result should be identical.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 1/1 make mc13783 code generic
In reply to Yong ShenHi Yong,
some comments inline..
Quoted 92 lines · Yong Shen
Hi there,
For better code share between mc13783 and mc13892, I did some clean up and move some common code to a separated file. And mc13892 code will come after this patch.
Thanks
YongFrom
98e187834085624c3651587da56da48bec958e05Mon Sep 17 00:00:00 2001
From: Yong Shen <[email protected]>
Date: Tue, 30 Nov 2010 14:11:34 +0800
Subject: [PATCH] make mc13783 code genericmove some common functions and micros to a seperate file, which makes it possible for mc13892 to share code
Signed-off-by Yong Shen <[email protected]>--- drivers/regulator/Makefile | 2 +- drivers/regulator/mc13783-regulator.c | 311 +++++----------------------- drivers/regulator/mc13xxx-regulator-core.c | 241 +++++++++++++++++++++ include/linux/mfd/mc13783.h | 67 +++--- include/linux/regulator/mc13xxx.h | 101 +++++++++ 5 files changed, 426 insertions(+), 296 deletions(-) create mode 100644 drivers/regulator/mc13xxx-regulator-core.c create mode 100644 include/linux/regulator/mc13xxx.hdrivers/regulator/Makefile +1
-1@@ -29,7 +29,7 @@ obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o obj-$(CONFIG_REGULATOR_DA903X) += da903x.o obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o -obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o +obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o mc13xxx-regulator-core.o obj-$(CONFIG_REGULATOR_AB3100) += ab3100.o obj-$(CONFIG_REGULATOR_TPS65023) += tps65023-regulator.odrivers/regulator/mc13783-regulator.c +3
-12@@ -1,6 +1,7 @@/* * Regulator Driver for Freescale MC13783 PMIC * +* Copyright 2010 Yong Shen <[email protected]> * Copyright (C) 2008 Sascha Hauer, Pengutronix <[email protected]> * Copyright 2009 Alberto Panizzo <[email protected]> * @@ -10,6 +11,7 @@*/ #include <linux/mfd/mc13783.h> +#include <linux/regulator/mc13xxx.h> #include <linux/regulator/machine.h> #include <linux/regulator/driver.h> #include <linux/platform_device.h> @@ -89,16 +91,6 @@#define MC13783_REG_POWERMISC_PWGTSPI_M (3 << 15) -struct mc13783_regulator { -struct regulator_desc desc; -int reg; -int enable_bit; -int vsel_reg; -int vsel_shift; -int vsel_mask; -int const *voltages; -}; -/* Voltage Values */ static const int const mc13783_sw3_val[] = {5000000 ,5000000 ,5000000 ,5500000 ,@@ -175,10 +167,9 @@ static const int const mc13783_pwgtdrv_val[] = { 5500000, }; -static struct regulator_ops mc13783_regulator_ops; -static struct regulator_ops mc13783_fixed_regulator_ops;static struct regulator_ops mc13783_gpo_regulator_ops; +/* #define MC13783_DEFINE(prefix, _name, _reg, _vsel_reg, _voltages) \ [MC13783_ ## prefix ## _ ## _name] = { \ .desc = { \
drivers/regulator/mc13783-regulator.c static struct regulator_ops mc13783_gpo_regulator_ops; · line 190
Quoted 4 lines
drivers/regulator/mc13783-regulator.c +1
-0@@ -196,43 +187,26 @@ static struct regulator_ops mc13783_gpo_regulator_ops;.vsel_mask = MC13783_REG_ ## _vsel_reg ## _ ## _name ## VSEL_M,\ .voltages = _voltages, \ } +*/
Is this really meant to be commented?
Quoted 263 lines
drivers/regulator/mc13783-regulator.c +14
-223-#define MC13783_FIXED_DEFINE (prefix, _name, _reg, _voltages) \ - [MC13783_ ## prefix ## _ ## _name] = { \ - .desc = { \ - .name = #prefix "_" #_name, \ - .n_voltages = ARRAY_SIZE(_voltages), \ - .ops = &mc13783_fixed_regulator_ops, \ - .type = REGULATOR_VOLTAGE, \ - .id = MC13783_ ## prefix ## _ ## _name, \ - .owner = THIS_MODULE, \ - }, \ - .reg = MC13783_REG_ ## _reg, \ - .enable_bit = MC13783_REG_ ## _reg ## _ ## _name ## EN, \ - .voltages = _voltages, \ - } +#define MC13783_DEFINE (prefix, name, reg, vsel_reg, voltages) \ + MC13xxx_DEFINE(MC13783_REG_, name, reg, vsel_reg, voltages, \ + mc13xxx_regulator_ops) -#define MC13783_GPO_DEFINE (prefix, _name, _reg, _voltages) \ - [MC13783_ ## prefix ## _ ## _name] = { \ - .desc = { \ - .name = #prefix "_" #_name, \ - .n_voltages = ARRAY_SIZE(_voltages), \ - .ops = &mc13783_gpo_regulator_ops, \ - .type = REGULATOR_VOLTAGE, \ - .id = MC13783_ ## prefix ## _ ## _name, \ - .owner = THIS_MODULE, \ - }, \ - .reg = MC13783_REG_ ## _reg, \ - .enable_bit = MC13783_REG_ ## _reg ## _ ## _name ## EN, \ - .voltages = _voltages, \ - } +#define MC13783_FIXED_DEFINE (prefix, name, reg, voltages) \ + MC13xxx_FIXED_DEFINE(MC13783_REG_, name, reg, voltages, \ + mc13xxx_fixed_regulator_ops) + +#define MC13783_GPO_DEFINE (prefix, name, reg, voltages) \ + MC13xxx_GPO_DEFINE(MC13783_REG_, name, reg, voltages, \ + mc13783_gpo_regulator_ops)#define MC13783_DEFINE_SW (_name, _reg, _vsel_reg, _voltages) \ MC13783_DEFINE(SW, _name, _reg, _vsel_reg, _voltages)#define MC13783_DEFINE_REGU (_name, _reg, _vsel_reg, _voltages) \ MC13783_DEFINE(REGU, _name, _reg, _vsel_reg, _voltages) -static struct mc13783_regulator mc13783_regulators[] = { +static struct mc13xxx_regulator mc13783_regulators[] = {MC13783_DEFINE_SW (SW3 ,SWITCHERS5 ,SWITCHERS5 , mc13783_sw3_val),MC13783_FIXED_DEFINE (REGU ,VAUDIO ,REGULATORMODE0 , mc13783_vaudio_val),@@ -274,207 +248,16 @@ static struct mc13783_regulator mc13783_regulators[] = { MC13783_GPO_DEFINE(REGU, PWGT2SPI, POWERMISC, mc13783_pwgtdrv_val), }; -struct mc13783_regulator_priv { -struct mc13783 *mc13783; -u32 powermisc_pwgt_state; -struct regulator_dev *regulators[]; -}; - -static int mc13783_regulator_enable (struct regulator_dev *rdev) -{ -struct mc13783_regulator_priv *priv =rdev_get_drvdata (rdev); -int id =rdev_get_id (rdev); -int ret; - -dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id); - -mc13783_lock (priv->mc13783); - ret =mc13783_reg_rmw (priv->mc13783, mc13783_regulators[id].reg, - mc13783_regulators[id].enable_bit, - mc13783_regulators[id].enable_bit); -mc13783_unlock (priv->mc13783); - -return ret; -} - -static int mc13783_regulator_disable (struct regulator_dev *rdev) -{ -struct mc13783_regulator_priv *priv =rdev_get_drvdata (rdev); -int id =rdev_get_id (rdev); -int ret; - -dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id); - -mc13783_lock (priv->mc13783); - ret =mc13783_reg_rmw (priv->mc13783, mc13783_regulators[id].reg, - mc13783_regulators[id].enable_bit,0 ); -mc13783_unlock (priv->mc13783); - -return ret; -} - -static int mc13783_regulator_is_enabled (struct regulator_dev *rdev) -{ -struct mc13783_regulator_priv *priv =rdev_get_drvdata (rdev); -int ret, id =rdev_get_id (rdev); -unsigned int val; - -mc13783_lock (priv->mc13783); - ret =mc13783_reg_read (priv->mc13783, mc13783_regulators[id].reg, &val); -mc13783_unlock (priv->mc13783); - -if (ret) -return ret; - -return (val & mc13783_regulators[id].enable_bit) !=0 ; -} - -static int mc13783_regulator_list_voltage (struct regulator_dev *rdev, -unsigned selector) -{ -int id =rdev_get_id (rdev); - -if (selector >= mc13783_regulators[id].desc.n_voltages) -return -EINVAL ; - -return mc13783_regulators[id].voltages[selector]; -} - -static int mc13783_get_best_voltage_index (struct regulator_dev *rdev, -int min_uV,int max_uV) -{ -int reg_id =rdev_get_id (rdev); -int i; -int bestmatch; -int bestindex; - -/* -* Locate the minimum voltage fitting the criteria on -* this regulator. The switchable voltages are not -* in strict falling order so we need to check them -* all for the best match. -*/ - bestmatch =INT_MAX ; - bestindex =-1 ; -for (i =0 ; i < mc13783_regulators[reg_id].desc.n_voltages; i++) { -if (mc13783_regulators[reg_id].voltages[i] >= min_uV && - mc13783_regulators[reg_id].voltages[i] < bestmatch) { - bestmatch = mc13783_regulators[reg_id].voltages[i]; - bestindex = i; - } - } - -if (bestindex <0 || bestmatch > max_uV) { -dev_warn (&rdev->dev,"no possible value for %d<=x<=%d uV\n" , - min_uV, max_uV); -return -EINVAL ; - } -return bestindex; -} - -static int mc13783_regulator_set_voltage (struct regulator_dev *rdev, -int min_uV,int max_uV) -{ -struct mc13783_regulator_priv *priv =rdev_get_drvdata (rdev); -int value, id =rdev_get_id (rdev); -int ret; - -dev_dbg (rdev_get_dev (rdev),"%s id: %d min_uV: %d max_uV: %d\n" , - __func__, id, min_uV, max_uV); - -/* Find the best index */ - value =mc13783_get_best_voltage_index (rdev, min_uV, max_uV); -dev_dbg (rdev_get_dev (rdev),"%s best value: %d \n" , __func__, value); -if (value <0 ) -return value; - -mc13783_lock (priv->mc13783); - ret =mc13783_reg_rmw (priv->mc13783, mc13783_regulators[id].vsel_reg, - mc13783_regulators[id].vsel_mask, - value << mc13783_regulators[id].vsel_shift); -mc13783_unlock (priv->mc13783); - -return ret; -} - -static int mc13783_regulator_get_voltage (struct regulator_dev *rdev) -{ -struct mc13783_regulator_priv *priv =rdev_get_drvdata (rdev); -int ret, id =rdev_get_id (rdev); -unsigned int val; - -dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id); - -mc13783_lock (priv->mc13783); - ret =mc13783_reg_read (priv->mc13783, - mc13783_regulators[id].vsel_reg, &val); -mc13783_unlock (priv->mc13783); - -if (ret) -return ret; - - val = (val & mc13783_regulators[id].vsel_mask) - >> mc13783_regulators[id].vsel_shift; - -dev_dbg (rdev_get_dev (rdev),"%s id: %d val: %d\n" , __func__, id, val); - -BUG_ON (val <0 || val > mc13783_regulators[id].desc.n_voltages); - -return mc13783_regulators[id].voltages[val]; -} - -static struct regulator_ops mc13783_regulator_ops = { - .enable = mc13783_regulator_enable, - .disable = mc13783_regulator_disable, - .is_enabled = mc13783_regulator_is_enabled, - .list_voltage = mc13783_regulator_list_voltage, - .set_voltage = mc13783_regulator_set_voltage, - .get_voltage = mc13783_regulator_get_voltage, -}; - -static int mc13783_fixed_regulator_set_voltage (struct regulator_dev *rdev, -int min_uV,int max_uV) -{ -int id =rdev_get_id (rdev); - -dev_dbg (rdev_get_dev (rdev),"%s id: %d min_uV: %d max_uV: %d\n" , - __func__, id, min_uV, max_uV); - -if (min_uV >= mc13783_regulators[id].voltages[0 ] && - max_uV <= mc13783_regulators[id].voltages[0 ]) -return 0 ; -else -return -EINVAL ; -} - -static int mc13783_fixed_regulator_get_voltage (struct regulator_dev *rdev) -{ -int id =rdev_get_id (rdev); - -dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id); - -return mc13783_regulators[id].voltages[0 ]; -} - -static struct regulator_ops mc13783_fixed_regulator_ops = { - .enable = mc13783_regulator_enable, - .disable = mc13783_regulator_disable, - .is_enabled = mc13783_regulator_is_enabled, - .list_voltage = mc13783_regulator_list_voltage, - .set_voltage = mc13783_fixed_regulator_set_voltage, - .get_voltage = mc13783_fixed_regulator_get_voltage, -}; - -int mc13783_powermisc_rmw (struct mc13783_regulator_priv *priv,u32 mask, +int mc13783_powermisc_rmw (struct mc13xxx_regulator_priv *priv,u32 mask,u32 val) { -struct mc13783 *mc13783 = priv->mc13783; +struct mc13xxx *mc13783 = priv->mc13xxx;int ret;u32 valread;BUG_ON (val & ~mask); - ret =mc13783_reg_read (mc13783,MC13783_REG_POWERMISC , &valread); + ret =mc13xxx_reg_read (mc13783,MC13783_REG_POWERMISC , &valread);if (ret)return ret;
drivers/regulator/mc13783-regulator.c int mc13783_powermisc_rmw(struct · line 272
Quoted 1 line
drivers/regulator/mc13783-regulator.c +0
-0@@ -489,34 +272,36 @@ int mc13783_powermisc_rmw(struct mc13783_regulator_priv *priv, u32 mask,
Here git apply get an error...
Please send a clean patch and then I will get it a try!
Quoted 150 lines
drivers/regulator/mc13783-regulator.c +11
-9valread = (valread & ~MC13783_REG_POWERMISC_PWGTSPI_M ) | priv->powermisc_pwgt_state; -return mc13783_reg_write (mc13783,MC13783_REG_POWERMISC , valread); +return mc13xxx_reg_write (mc13783,MC13783_REG_POWERMISC , valread); }static int mc13783_gpo_regulator_enable (struct regulator_dev *rdev) { -struct mc13783_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators;int id =rdev_get_id (rdev);int ret; -u32 en_val = mc13783_regulators[id].enable_bit; +u32 en_val = mc13xxx_regulators[id].enable_bit;dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id);/* Power Gate enable value is 0 */ -if (id ==MC13783_REGU_PWGT1SPI || - id ==MC13783_REGU_PWGT2SPI ) +if (id ==MC13783_REG_PWGT1SPI || + id ==MC13783_REG_PWGT2SPI ) en_val =0 ; -mc13783_lock (priv->mc13783); - ret =mc13783_powermisc_rmw (priv, mc13783_regulators[id].enable_bit, +mc13xxx_lock (priv->mc13xxx); + ret =mc13783_powermisc_rmw (priv, mc13xxx_regulators[id].enable_bit, en_val); -mc13783_unlock (priv->mc13783); +mc13xxx_unlock (priv->mc13xxx);return ret; }static int mc13783_gpo_regulator_disable (struct regulator_dev *rdev) { -struct mc13783_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators;int id =rdev_get_id (rdev);int ret;drivers/regulator/mc13783-regulator.c +11
-10u32 dis_val =0 ;@@ -524,27 +309,28 @@ static int mc13783_gpo_regulator_disable(struct regulator_dev *rdev) dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);/* Power Gate disable value is 1 */ -if (id ==MC13783_REGU_PWGT1SPI || - id ==MC13783_REGU_PWGT2SPI ) - dis_val = mc13783_regulators[id].enable_bit; +if (id ==MC13783_REG_PWGT1SPI || + id ==MC13783_REG_PWGT2SPI ) + dis_val = mc13xxx_regulators[id].enable_bit; -mc13783_lock (priv->mc13783); - ret =mc13783_powermisc_rmw (priv, mc13783_regulators[id].enable_bit, +mc13xxx_lock (priv->mc13xxx); + ret =mc13783_powermisc_rmw (priv, mc13xxx_regulators[id].enable_bit, dis_val); -mc13783_unlock (priv->mc13783); +mc13xxx_unlock (priv->mc13xxx);return ret; }static int mc13783_gpo_regulator_is_enabled (struct regulator_dev *rdev) { -struct mc13783_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators;int ret, id =rdev_get_id (rdev);unsigned int val; -mc13783_lock (priv->mc13783); - ret =mc13783_reg_read (priv->mc13783, mc13783_regulators[id].reg, &val); -mc13783_unlock (priv->mc13783); +mc13xxx_lock (priv->mc13xxx); + ret =mc13xxx_reg_read (priv->mc13xxx, mc13xxx_regulators[id].reg, &val); +mc13xxx_unlock (priv->mc13xxx);if (ret)drivers/regulator/mc13783-regulator.c +6
-6return ret;@@ -554,22 +340,22 @@ static int mc13783_gpo_regulator_is_enabled(struct regulator_dev *rdev) val = (val & ~MC13783_REG_POWERMISC_PWGTSPI_M ) | (priv->powermisc_pwgt_state ^MC13783_REG_POWERMISC_PWGTSPI_M ); -return (val & mc13783_regulators[id].enable_bit) !=0 ; +return (val & mc13xxx_regulators[id].enable_bit) !=0 ; }static struct regulator_ops mc13783_gpo_regulator_ops = { .enable = mc13783_gpo_regulator_enable, .disable = mc13783_gpo_regulator_disable, .is_enabled = mc13783_gpo_regulator_is_enabled, - .list_voltage = mc13783_regulator_list_voltage, - .set_voltage = mc13783_fixed_regulator_set_voltage, - .get_voltage = mc13783_fixed_regulator_get_voltage, + .list_voltage = mc13xxx_regulator_list_voltage, + .set_voltage = mc13xxx_fixed_regulator_set_voltage, + .get_voltage = mc13xxx_fixed_regulator_get_voltage, };static int __devinit mc13783_regulator_probe (struct platform_device *pdev) { -struct mc13783_regulator_priv *priv; -struct mc13783 *mc13783 =dev_get_drvdata (pdev->dev.parent); +struct mc13xxx_regulator_priv *priv; +struct mc13xxx *mc13783 =dev_get_drvdata (pdev->dev.parent);struct mc13783_regulator_platform_data *pdata =dev_get_platdata (&pdev->dev);drivers/regulator/mc13783-regulator.c +2
-1struct mc13783_regulator_init_data *init_data;@@ -583,7 +369,8 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev) if (!priv) return -ENOMEM; - priv->mc13783 = mc13783; + priv->mc13xxx_regulators = mc13783_regulators; + priv->mc13xxx = mc13783; for (i = 0; i < pdata->num_regulators; i++) {drivers/regulator/mc13783-regulator.c +1
-1init_data = &pdata->regulators[i];@@ -613,7 +400,7 @@ err: static int __devexit mc13783_regulator_remove(struct platform_device *pdev) { -struct mc13783_regulator_priv *priv =platform_get_drvdata (pdev); +struct mc13xxx_regulator_priv *priv =platform_get_drvdata (pdev);struct mc13783_regulator_platform_data *pdata =dev_get_platdata (&pdev->dev);int i;drivers/regulator/mc13xxx-regulator-core.c new file +8
-0@@ -0,0 +1,241 @@ +/* +* Regulator Driver for Freescale MC13xxx PMIC +* +* Copyright 2010 Yong Shen <[email protected]> +* +* Based on mc13783 regulator driver : +* Copyright (C) 2008 Sascha Hauer, Pengutronix <[email protected]> +* Copyright 2009 Alberto Panizzo <[email protected]>
drivers/regulator/mc13xxx-regulator-core.c line 18
Quoted 10 lines
drivers/regulator/mc13xxx-regulator-core.c new file +10
-0+* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* Regs infos taken from mc13xxx drivers from freescale and mc13xxx.pdf file +* from freescale +*/ + +#define DEBUG
And debug enabled by default?
I'll wait for version 2..
Regards,
Alberto!
PS: ./scripts/get_maintainer.pl said to cc all these guys:
Liam Girdwood <[email protected]>
Mark Brown <[email protected]> Samuel Ortiz <[email protected]> Haojian Zhuang <[email protected]> Linus Walleij <[email protected]> Alberto Panizzo <[email protected]> "Uwe Kleine-K?nig" <[email protected]> Axel Lin <[email protected]>
Andrew Morton <[email protected]> "Philippe R?tornaz" <[email protected]> linux-kernel at vger.kernel.org
Please, use always this script to decide who have to be cc'ed by default sending patches.
Quoted 415 lines
drivers/regulator/mc13xxx-regulator-core.c new file +223
-0+ +#include <linux/mfd/mc13xxx.h> +#include <linux/regulator/mc13xxx.h> +#include <linux/regulator/machine.h> +#include <linux/regulator/driver.h> +#include <linux/platform_device.h> +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/init.h> +#include <linux/err.h> + +static int mc13xxx_regulator_enable (struct regulator_dev *rdev) +{ +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; +int id =rdev_get_id (rdev); +int ret; + +dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id); + +mc13xxx_lock (priv->mc13xxx); + ret =mc13xxx_reg_rmw (priv->mc13xxx, mc13xxx_regulators[id].reg, + mc13xxx_regulators[id].enable_bit, + mc13xxx_regulators[id].enable_bit); +mc13xxx_unlock (priv->mc13xxx); + +return ret; +} + +static int mc13xxx_regulator_disable (struct regulator_dev *rdev) +{ +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; +int id =rdev_get_id (rdev); +int ret; + +dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id); + +mc13xxx_lock (priv->mc13xxx); + ret =mc13xxx_reg_rmw (priv->mc13xxx, mc13xxx_regulators[id].reg, + mc13xxx_regulators[id].enable_bit,0 ); +mc13xxx_unlock (priv->mc13xxx); + +return ret; +} + +static int mc13xxx_regulator_is_enabled (struct regulator_dev *rdev) +{ +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; +int ret, id =rdev_get_id (rdev); +unsigned int val; + +mc13xxx_lock (priv->mc13xxx); + ret =mc13xxx_reg_read (priv->mc13xxx, mc13xxx_regulators[id].reg, &val); +mc13xxx_unlock (priv->mc13xxx); + +if (ret) +return ret; + +return (val & mc13xxx_regulators[id].enable_bit) !=0 ; +} + +int mc13xxx_regulator_list_voltage (struct regulator_dev *rdev, +unsigned selector) +{ +int id =rdev_get_id (rdev); +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + +if (selector >= mc13xxx_regulators[id].desc.n_voltages) +return -EINVAL ; + +return mc13xxx_regulators[id].voltages[selector]; +} + +int mc13xxx_get_best_voltage_index (struct regulator_dev *rdev, +int min_uV,int max_uV) +{ +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; +int reg_id =rdev_get_id (rdev); +int i; +int bestmatch; +int bestindex; + +/* +* Locate the minimum voltage fitting the criteria on +* this regulator. The switchable voltages are not +* in strict falling order so we need to check them +* all for the best match. +*/ + bestmatch =INT_MAX ; + bestindex =-1 ; +for (i =0 ; i < mc13xxx_regulators[reg_id].desc.n_voltages; i++) { +if (mc13xxx_regulators[reg_id].voltages[i] >= min_uV && + mc13xxx_regulators[reg_id].voltages[i] < bestmatch) { + bestmatch = mc13xxx_regulators[reg_id].voltages[i]; + bestindex = i; + } + } + +if (bestindex <0 || bestmatch > max_uV) { +dev_warn (&rdev->dev,"no possible value for %d<=x<=%d uV\n" , + min_uV, max_uV); +return -EINVAL ; + } +return bestindex; +} + +static int mc13xxx_regulator_set_voltage (struct regulator_dev *rdev, +int min_uV,int max_uV) +{ +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; +int value, id =rdev_get_id (rdev); +int ret; + +dev_dbg (rdev_get_dev (rdev),"%s id: %d min_uV: %d max_uV: %d\n" , + __func__, id, min_uV, max_uV); + +/* Find the best index */ + value =mc13xxx_get_best_voltage_index (rdev, min_uV, max_uV); +dev_dbg (rdev_get_dev (rdev),"%s best value: %d\n" , __func__, value); +if (value <0 ) +return value; + +mc13xxx_lock (priv->mc13xxx); + ret =mc13xxx_reg_rmw (priv->mc13xxx, mc13xxx_regulators[id].vsel_reg, + mc13xxx_regulators[id].vsel_mask, + value << mc13xxx_regulators[id].vsel_shift); +mc13xxx_unlock (priv->mc13xxx); + +return ret; +} + +static int mc13xxx_regulator_get_voltage (struct regulator_dev *rdev) +{ +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; +int ret, id =rdev_get_id (rdev); +unsigned int val; + +dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id); + +mc13xxx_lock (priv->mc13xxx); + ret =mc13xxx_reg_read (priv->mc13xxx, + mc13xxx_regulators[id].vsel_reg, &val); +mc13xxx_unlock (priv->mc13xxx); + +if (ret) +return ret; + + val = (val & mc13xxx_regulators[id].vsel_mask) + >> mc13xxx_regulators[id].vsel_shift; + +dev_dbg (rdev_get_dev (rdev),"%s id: %d val: %d\n" , __func__, id, val); + +BUG_ON (val <0 || val > mc13xxx_regulators[id].desc.n_voltages); + +return mc13xxx_regulators[id].voltages[val]; +} + +struct regulator_ops mc13xxx_regulator_ops = { + .enable = mc13xxx_regulator_enable, + .disable = mc13xxx_regulator_disable, + .is_enabled = mc13xxx_regulator_is_enabled, + .list_voltage = mc13xxx_regulator_list_voltage, + .set_voltage = mc13xxx_regulator_set_voltage, + .get_voltage = mc13xxx_regulator_get_voltage, +}; + +int mc13xxx_fixed_regulator_set_voltage (struct regulator_dev *rdev, +int min_uV,int max_uV) +{ +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; +int id =rdev_get_id (rdev); + +dev_dbg (rdev_get_dev (rdev),"%s id: %d min_uV: %d max_uV: %d\n" , + __func__, id, min_uV, max_uV); + +if (min_uV >= mc13xxx_regulators[id].voltages[0 ] && + max_uV <= mc13xxx_regulators[id].voltages[0 ]) +return 0 ; +else +return -EINVAL ; +} + +int mc13xxx_fixed_regulator_get_voltage (struct regulator_dev *rdev) +{ +struct mc13xxx_regulator_priv *priv =rdev_get_drvdata (rdev); +struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; +int id =rdev_get_id (rdev); + +dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id); + +return mc13xxx_regulators[id].voltages[0 ]; +} + +struct regulator_ops mc13xxx_fixed_regulator_ops = { + .enable = mc13xxx_regulator_enable, + .disable = mc13xxx_regulator_disable, + .is_enabled = mc13xxx_regulator_is_enabled, + .list_voltage = mc13xxx_regulator_list_voltage, + .set_voltage = mc13xxx_fixed_regulator_set_voltage, + .get_voltage = mc13xxx_fixed_regulator_get_voltage, +}; + +int mc13xxx_sw_regulator (struct regulator_dev *rdev) +{ +return 0 ; +} + +int mc13xxx_sw_regulator_is_enabled (struct regulator_dev *rdev) +{ +return 1 ; +} + +MODULE_LICENSE ("GPL v2" ); +MODULE_AUTHOR ("Yong Shen <[email protected]>" ); +MODULE_DESCRIPTION ("Regulator Driver for Freescale MC13xxx PMIC" ); +MODULE_ALIAS ("platform:mc13xxx-regulator-core" );include/linux/mfd/mc13783.h +34
-33@@ -1,4 +1,5 @@/* +* Copyright 2010 Yong Shen <[email protected]> * Copyright 2009-2010 Pengutronix * Uwe Kleine-Koenig <[email protected]> * @@ -122,39 +123,39 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode, unsigned int channel, unsigned int *sample); -#define MC13783_SW_SW1A 0 -#define MC13783_SW_SW1B 1 -#define MC13783_SW_SW2A 2 -#define MC13783_SW_SW2B 3 -#define MC13783_SW_SW3 4 -#define MC13783_SW_PLL 5 -#define MC13783_REGU_VAUDIO 6 -#define MC13783_REGU_VIOHI 7 -#define MC13783_REGU_VIOLO 8 -#define MC13783_REGU_VDIG 9 -#define MC13783_REGU_VGEN 10 -#define MC13783_REGU_VRFDIG 11 -#define MC13783_REGU_VRFREF 12 -#define MC13783_REGU_VRFCP 13 -#define MC13783_REGU_VSIM 14 -#define MC13783_REGU_VESIM 15 -#define MC13783_REGU_VCAM 16 -#define MC13783_REGU_VRFBG 17 -#define MC13783_REGU_VVIB 18 -#define MC13783_REGU_VRF1 19 -#define MC13783_REGU_VRF2 20 -#define MC13783_REGU_VMMC1 21 -#define MC13783_REGU_VMMC2 22 -#define MC13783_REGU_GPO1 23 -#define MC13783_REGU_GPO2 24 -#define MC13783_REGU_GPO3 25 -#define MC13783_REGU_GPO4 26 -#define MC13783_REGU_V1 27 -#define MC13783_REGU_V2 28 -#define MC13783_REGU_V3 29 -#define MC13783_REGU_V4 30 -#define MC13783_REGU_PWGT1SPI 31 -#define MC13783_REGU_PWGT2SPI 32 +#define MC13783_REG_SW1A 0 +#define MC13783_REG_SW1B 1 +#define MC13783_REG_SW2A 2 +#define MC13783_REG_SW2B 3 +#define MC13783_REG_SW3 4 +#define MC13783_REG_PLL 5 +#define MC13783_REG_VAUDIO 6 +#define MC13783_REG_VIOHI 7 +#define MC13783_REG_VIOLO 8 +#define MC13783_REG_VDIG 9 +#define MC13783_REG_VGEN 10 +#define MC13783_REG_VRFDIG 11 +#define MC13783_REG_VRFREF 12 +#define MC13783_REG_VRFCP 13 +#define MC13783_REG_VSIM 14 +#define MC13783_REG_VESIM 15 +#define MC13783_REG_VCAM 16 +#define MC13783_REG_VRFBG 17 +#define MC13783_REG_VVIB 18 +#define MC13783_REG_VRF1 19 +#define MC13783_REG_VRF2 20 +#define MC13783_REG_VMMC1 21 +#define MC13783_REG_VMMC2 22 +#define MC13783_REG_GPO1 23 +#define MC13783_REG_GPO2 24 +#define MC13783_REG_GPO3 25 +#define MC13783_REG_GPO4 26 +#define MC13783_REG_V1 27 +#define MC13783_REG_V2 28 +#define MC13783_REG_V3 29 +#define MC13783_REG_V4 30 +#define MC13783_REG_PWGT1SPI 31 +#define MC13783_REG_PWGT2SPI 32#define MC13783_IRQ_ADCDONE MC13XXX_IRQ_ADCDONE#define
MC13783_IRQ_ADCBISDONEMC13XXX_IRQ_ADCBISDONEinclude/linux/regulator/mc13xxx.h new file +101
-0@@ -0,0 +1,101 @@ +/* +* mc13xxx.h - regulators for the Freescale mc13xxx PMIC +* +* Copyright (C) 2010 Yong Shen <[email protected]> +* +* 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. +*/ + +#ifndef __LINUX_REGULATOR_MC13XXX_H +#define __LINUX_REGULATOR_MC13XXX_H + +#include <linux/regulator/driver.h> + +struct mc13xxx_regulator { +struct regulator_desc desc; +int reg; +int enable_bit; +int vsel_reg; +int vsel_shift; +int vsel_mask; +int hi_bit; +int const *voltages; +}; + +struct mc13xxx_regulator_priv { +struct mc13xxx *mc13xxx; +u32 powermisc_pwgt_state; +struct mc13xxx_regulator *mc13xxx_regulators; +struct regulator_dev *regulators[]; +}; + +extern int mc13xxx_sw_regulator (struct regulator_dev *rdev); +extern int mc13xxx_sw_regulator_is_enabled (struct regulator_dev *rdev); +extern int mc13xxx_get_best_voltage_index (struct regulator_dev *rdev, +int min_uV,int max_uV); +extern int mc13xxx_regulator_list_voltage (struct regulator_dev *rdev, +unsigned selector); +extern int mc13xxx_fixed_regulator_set_voltage (struct regulator_dev *rdev, +int min_uV,int max_uV); +extern int mc13xxx_fixed_regulator_get_voltage (struct regulator_dev *rdev); + +extern struct regulator_ops mc13xxx_regulator_ops; +extern struct regulator_ops mc13xxx_fixed_regulator_ops; + +#define MC13xxx_DEFINE (prefix, _name, _reg, _vsel_reg, _voltages, _ops) \ + [prefix ## _name] = { \ + .desc = { \ + .name = #prefix "_" #_name, \ + .n_voltages = ARRAY_SIZE(_voltages), \ + .ops = &_ops, \ + .type = REGULATOR_VOLTAGE, \ + .id = prefix ## _name, \ + .owner = THIS_MODULE, \ + }, \ + .reg = prefix ## _reg, \ + .enable_bit = prefix ## _reg ## _ ## _name ## EN, \ + .vsel_reg = prefix ## _vsel_reg, \ + .vsel_shift = prefix ## _vsel_reg ## _ ## _name ## VSEL,\ + .vsel_mask = prefix ## _vsel_reg ## _ ## _name ## VSEL_M,\ + .voltages = _voltages, \ + } + +#define MC13xxx_FIXED_DEFINE (prefix, _name, _reg, _voltages, _ops) \ + [prefix ## _name] = { \ + .desc = { \ + .name = #prefix "_" #_name, \ + .n_voltages = ARRAY_SIZE(_voltages), \ + .ops = &_ops, \ + .type = REGULATOR_VOLTAGE, \ + .id = prefix ## _name, \ + .owner = THIS_MODULE, \ + }, \ + .reg = prefix ## _reg, \ + .enable_bit = prefix ## _reg ## _ ## _name ## EN, \ + .voltages = _voltages, \ + } + +#define MC13xxx_GPO_DEFINE (prefix, _name, _reg, _voltages, _ops) \ + [prefix ## _name] = { \ + .desc = { \ + .name = #prefix "_" #_name, \ + .n_voltages = ARRAY_SIZE(_voltages), \ + .ops = &_ops, \ + .type = REGULATOR_VOLTAGE, \ + .id = prefix ## _name, \ + .owner = THIS_MODULE, \ + }, \ + .reg = prefix ## _reg, \ + .enable_bit = prefix ## _reg ## _ ## _name ## EN, \ + .voltages = _voltages, \ + } + +#define MC13xxx_DEFINE_SW (_name, _reg, _vsel_reg, _voltages, ops) \ + MC13xxx_DEFINE(SW, _name, _reg, _vsel_reg, _voltages, ops) +#define MC13xxx_DEFINE_REGU (_name, _reg, _vsel_reg, _voltages, ops) \ + MC13xxx_DEFINE(REGU, _name, _reg, _vsel_reg, _voltages, ops) + +#endif
PATCH 1/1 make mc13783 code generic
Thanks, Alberto. Version 2 will come out soon.
Quoted 973 lines · Alberto Panizzo
Hi Yong,
some comments inline..Quoted 92 lines · Yong Shen
Hi there,
For better code share between mc13783 and mc13892, I did some clean up and move some common code to a separated file. And mc13892 code will come after this patch.
Thanks
YongFrom
98e187834085624c3651587da56da48bec958e05Mon Sep 17 00:00:00 2001
From: Yong Shen <[email protected]>
Date: Tue, 30 Nov 2010 14:11:34 +0800
Subject: [PATCH] make mc13783 code genericmove some common functions and micros to a seperate file, which makes it possible for mc13892 to share code
Signed-off-by Yong Shen <[email protected]>---
?drivers/regulator/Makefile ? ? ? ? ? ? ? ? | ? ?2 +- ?drivers/regulator/mc13783-regulator.c ? ? ?| ?311 +++++----------------------- ?drivers/regulator/mc13xxx-regulator-core.c | ?241 +++++++++++++++++++++ ?include/linux/mfd/mc13783.h ? ? ? ? ? ? ? ?| ? 67 +++--- ?include/linux/regulator/mc13xxx.h ? ? ? ? ?| ?101 +++++++++?5 files changed, 426 insertions(+), 296 deletions(-) ?create mode 100644
drivers/regulator/mc13xxx-regulator-core.c?create mode 100644include/linux/regulator/mc13xxx.hdrivers/regulator/Makefile +0
-0@@ -29,7 +29,7 @@ obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o?obj-$(CONFIG_REGULATOR_DA903X) ? ? ? += da903x.o ?obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o ?obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
drivers/regulator/Makefile +1
-1-obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o +obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o mc13xxx-regulator-core.o?obj-$(CONFIG_REGULATOR_AB3100) += ab3100.o
?obj-$(CONFIG_REGULATOR_TPS65023) += tps65023-regulator.o
drivers/regulator/mc13783-regulator.c +0
-0@@ -1,6 +1,7 @@?/*
? * Regulator Driver for Freescale MC13783 PMIC
? *
+ * Copyright 2010 Yong Shen <[email protected]>
? * Copyright (C) 2008 Sascha Hauer, Pengutronix <[email protected]> ? * Copyright 2009 Alberto Panizzo <[email protected]> ? *drivers/regulator/mc13783-regulator.c +0
-0@@ -10,6 +11,7 @@? */
?#include <
linux/mfd/mc13783.h>
+#include <linux/regulator/mc13xxx.h>
?#include <linux/regulator/machine.h>
?#include <linux/regulator/driver.h>
?#include <linux/platform_device.h>drivers/regulator/mc13783-regulator.c +0
-10@@ -89,16 +91,6 @@ ?#define MC13783_REG_POWERMISC_PWGTSPI_M ? ? ? ? ? ? ? ? ? ? ?(3 << 15) -struct mc13783_regulator { - ? ? struct regulator_desc desc; - ? ? int reg; - ? ? int enable_bit; - ? ? int vsel_reg; - ? ? int vsel_shift; - ? ? int vsel_mask; - ? ? int const *voltages; -}; -?/* Voltage Values */
?static const int const mc13783_sw3_val[] = {
? ? ? 5000000, 5000000, 5000000, 5500000,drivers/regulator/mc13783-regulator.c +1
-2@@ -175,10 +167,9 @@ static const int const mc13783_pwgtdrv_val[] = { ? ? ? 5500000, ?}; -static struct regulator_ops mc13783_regulator_ops; -static struct regulator_ops mc13783_fixed_regulator_ops; ?static struct regulator_ops mc13783_gpo_regulator_ops; +/* ?#define MC13783_DEFINE(prefix, _name, _reg, _vsel_reg, _voltages) ? ?\ ? ? ? [MC13783_ ## prefix ## _ ## _name] = { ? ? ? ? ? ? ? ? ? ? ? ? ?\ ? ? ? ? ? ? ? .desc = { ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \ drivers/regulator/mc13783-regulator.c static struct regulator_ops mc13783_gpo_regulator_ops; · line 190
Quoted 4 lines
drivers/regulator/mc13783-regulator.c +1
-0@@ -196,43 +187,26 @@ static struct regulator_ops mc13783_gpo_regulator_ops;? ? ? ? ? ? ? .vsel_mask = MC13783_REG_ ## _vsel_reg ## _ ## _name ## VSEL_M,\ ? ? ? ? ? ? ? .voltages = ?_voltages, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \ ? ? ? } +? ? */ Is this really meant to be commented?
Quoted 263 lines
drivers/regulator/mc13783-regulator.c +14
-223-#define MC13783_FIXED_DEFINE (prefix, _name, _reg, _voltages) ? ? ? ? \ - ? ? [MC13783_ ## prefix ## _ ## _name] = { ? ? ? ? ? ? ? ? ? ? ? ? ?\ - ? ? ? ? ? ? .desc = { ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \ - ? ? ? ? ? ? ? ? ? ? .name = #prefix "_" #_name, ? ? ? ? ? ? ? ? ? ? \ - ? ? ? ? ? ? ? ? ? ? .n_voltages = ARRAY_SIZE(_voltages), ? ? ? ? ? ?\ - ? ? ? ? ? ? ? ? ? ? .ops = &mc13783_fixed_regulator_ops, ? ? ? ? ? ?\ - ? ? ? ? ? ? ? ? ? ? .type = REGULATOR_VOLTAGE, ? ? ? ? ? ? ? ? ? ? ?\ - ? ? ? ? ? ? ? ? ? ? .id = MC13783_ ## prefix ## _ ## _name, ? ? ? ? \ - ? ? ? ? ? ? ? ? ? ? .owner = THIS_MODULE, ? ? ? ? ? ? ? ? ? ? ? ? ? \ - ? ? ? ? ? ? }, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?\ - ? ? ? ? ? ? .reg = MC13783_REG_ ## _reg, ? ? ? ? ? ? ? ? ? ? ? ? ? ?\ - ? ? ? ? ? ? .enable_bit = MC13783_REG_ ## _reg ## _ ## _name ## EN, \ - ? ? ? ? ? ? .voltages = ?_voltages, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \ - ? ? } +#define MC13783_DEFINE (prefix, name, reg, vsel_reg, voltages) ? ? ? ?\ + ? ? MC13xxx_DEFINE(MC13783_REG_, name, reg, vsel_reg, voltages, \ + ? ? ? ? ? ? ? ? ? ? mc13xxx_regulator_ops) -#define MC13783_GPO_DEFINE(prefix, _name, _reg, ?_voltages) ? ? ? ? ?\ - ? ? [MC13783_ ## prefix ## _ ## _name] = { ? ? ? ? ? ? ? ? ? ? ? ? ?\ - ? ? ? ? ? ? .desc = { ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \ - ? ? ? ? ? ? ? ? ? ? .name = #prefix "_" #_name, ? ? ? ? ? ? ? ? ? ? \ - ? ? ? ? ? ? ? ? ? ? .n_voltages = ARRAY_SIZE(_voltages), ? ? ? ? ? ?\ - ? ? ? ? ? ? ? ? ? ? .ops = &mc13783_gpo_regulator_ops, ? ? ? ? ? ? ?\ - ? ? ? ? ? ? ? ? ? ? .type = REGULATOR_VOLTAGE, ? ? ? ? ? ? ? ? ? ? ?\ - ? ? ? ? ? ? ? ? ? ? .id = MC13783_ ## prefix ## _ ## _name, ? ? ? ? \ - ? ? ? ? ? ? ? ? ? ? .owner = THIS_MODULE, ? ? ? ? ? ? ? ? ? ? ? ? ? \ - ? ? ? ? ? ? }, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?\ - ? ? ? ? ? ? .reg = MC13783_REG_ ## _reg, ? ? ? ? ? ? ? ? ? ? ? ? ? ?\ - ? ? ? ? ? ? .enable_bit = MC13783_REG_ ## _reg ## _ ## _name ## EN, \ - ? ? ? ? ? ? .voltages = ?_voltages, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \ - ? ? } +#define MC13783_FIXED_DEFINE (prefix, name, reg, voltages) ? ? ? ? ? ?\ + ? ? MC13xxx_FIXED_DEFINE(MC13783_REG_, name, reg, voltages, \ + ? ? ? ? ? ? ? ? ? ? mc13xxx_fixed_regulator_ops) + +#define MC13783_GPO_DEFINE (prefix, name, reg, voltages) ? ? ? ? ? ? ?\ + ? ? MC13xxx_GPO_DEFINE(MC13783_REG_, name, reg, voltages, \ + ? ? ? ? ? ? ? ? ? ? mc13783_gpo_regulator_ops) ?#define MC13783_DEFINE_SW(_name, _reg, _vsel_reg, _voltages) ? ? ? ? \ ? ? ? MC13783_DEFINE(SW, _name, _reg, _vsel_reg, _voltages) ?#define MC13783_DEFINE_REGU(_name, _reg, _vsel_reg, _voltages) ? ? ? ? ? ? ? \ ? ? ? MC13783_DEFINE(REGU, _name, _reg, _vsel_reg, _voltages) -static struct mc13783_regulator mc13783_regulators[] = { +static struct mc13xxx_regulator mc13783_regulators[] = { ? ? ? MC13783_DEFINE_SW(SW3, SWITCHERS5, SWITCHERS5, mc13783_sw3_val), ? ? ? MC13783_FIXED_DEFINE(REGU, VAUDIO, REGULATORMODE0, mc13783_vaudio_val),@@ -274,207 +248,16 @@ static struct mc13783_regulator mc13783_regulators[] = { ? ? ? MC13783_GPO_DEFINE(REGU, PWGT2SPI, POWERMISC, mc13783_pwgtdrv_val), ?}; -struct mc13783_regulator_priv { - ? ? struct mc13783 *mc13783; - ? ? u32 powermisc_pwgt_state; - ? ? struct regulator_dev *regulators[]; -}; - -static int mc13783_regulator_enable (struct regulator_dev *rdev) -{ - ? ? struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev); - ? ? int id = rdev_get_id(rdev); - ? ? int ret; - - ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); - - ? ? mc13783_lock(priv->mc13783); - ? ? ret = mc13783_reg_rmw(priv->mc13783, mc13783_regulators[id].reg, - ? ? ? ? ? ? ? ? ? ? mc13783_regulators[id].enable_bit, - ? ? ? ? ? ? ? ? ? ? mc13783_regulators[id].enable_bit); - ? ? mc13783_unlock(priv->mc13783); - - ? ? return ret; -} - -static int mc13783_regulator_disable (struct regulator_dev *rdev) -{ - ? ? struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev); - ? ? int id = rdev_get_id(rdev); - ? ? int ret; - - ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); - - ? ? mc13783_lock(priv->mc13783); - ? ? ret = mc13783_reg_rmw(priv->mc13783, mc13783_regulators[id].reg, - ? ? ? ? ? ? ? ? ? ? mc13783_regulators[id].enable_bit, 0); - ? ? mc13783_unlock(priv->mc13783); - - ? ? return ret; -} - -static int mc13783_regulator_is_enabled (struct regulator_dev *rdev) -{ - ? ? struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev); - ? ? int ret, id = rdev_get_id(rdev); - ? ? unsigned int val; - - ? ? mc13783_lock(priv->mc13783); - ? ? ret = mc13783_reg_read(priv->mc13783, mc13783_regulators[id].reg, &val); - ? ? mc13783_unlock(priv->mc13783); - - ? ? if (ret) - ? ? ? ? ? ? return ret; - - ? ? return (val & mc13783_regulators[id].enable_bit) != 0; -} - -static int mc13783_regulator_list_voltage (struct regulator_dev *rdev, - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? unsigned selector) -{ - ? ? int id = rdev_get_id(rdev); - - ? ? if (selector >= mc13783_regulators[id].desc.n_voltages) - ? ? ? ? ? ? return -EINVAL; - - ? ? return mc13783_regulators[id].voltages[selector]; -} - -static int mc13783_get_best_voltage_index (struct regulator_dev *rdev, - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int min_uV, int max_uV) -{ - ? ? int reg_id = rdev_get_id(rdev); - ? ? int i; - ? ? int bestmatch; - ? ? int bestindex; - - ? ? /* - ? ? ?* Locate the minimum voltage fitting the criteria on - ? ? ?* this regulator. The switchable voltages are not - ? ? ?* in strict falling order so we need to check them - ? ? ?* all for the best match. - ? ? ?*/ - ? ? bestmatch = INT_MAX; - ? ? bestindex = -1; - ? ? for (i = 0; i < mc13783_regulators[reg_id].desc.n_voltages; i++) { - ? ? ? ? ? ? if (mc13783_regulators[reg_id].voltages[i] >= min_uV && - ? ? ? ? ? ? ? ? mc13783_regulators[reg_id].voltages[i] < bestmatch) { - ? ? ? ? ? ? ? ? ? ? bestmatch = mc13783_regulators[reg_id].voltages[i]; - ? ? ? ? ? ? ? ? ? ? bestindex = i; - ? ? ? ? ? ? } - ? ? } - - ? ? if (bestindex < 0 || bestmatch > max_uV) { - ? ? ? ? ? ? dev_warn(&rdev->dev, "no possible value for %d<=x<=%d uV\n", - ? ? ? ? ? ? ? ? ? ? ? ? ? ? min_uV, max_uV); - ? ? ? ? ? ? return -EINVAL; - ? ? } - ? ? return bestindex; -} - -static int mc13783_regulator_set_voltage (struct regulator_dev *rdev, - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int min_uV, int max_uV) -{ - ? ? struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev); - ? ? int value, id = rdev_get_id(rdev); - ? ? int ret; - - ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d min_uV: %d max_uV: %d\n", - ? ? ? ? ? ? __func__, id, min_uV, max_uV); - - ? ? /* Find the best index */ - ? ? value = mc13783_get_best_voltage_index(rdev, min_uV, max_uV); - ? ? dev_dbg(rdev_get_dev(rdev), "%s best value: %d \n", __func__, value); - ? ? if (value < 0) - ? ? ? ? ? ? return value; - - ? ? mc13783_lock(priv->mc13783); - ? ? ret = mc13783_reg_rmw(priv->mc13783, mc13783_regulators[id].vsel_reg, - ? ? ? ? ? ? ? ? ? ? mc13783_regulators[id].vsel_mask, - ? ? ? ? ? ? ? ? ? ? value << mc13783_regulators[id].vsel_shift); - ? ? mc13783_unlock(priv->mc13783); - - ? ? return ret; -} - -static int mc13783_regulator_get_voltage (struct regulator_dev *rdev) -{ - ? ? struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev); - ? ? int ret, id = rdev_get_id(rdev); - ? ? unsigned int val; - - ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); - - ? ? mc13783_lock(priv->mc13783); - ? ? ret = mc13783_reg_read(priv->mc13783, - ? ? ? ? ? ? ? ? ? ? ? ? ? ? mc13783_regulators[id].vsel_reg, &val); - ? ? mc13783_unlock(priv->mc13783); - - ? ? if (ret) - ? ? ? ? ? ? return ret; - - ? ? val = (val & mc13783_regulators[id].vsel_mask) - ? ? ? ? ? ? >> mc13783_regulators[id].vsel_shift; - - ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d val: %d\n", __func__, id, val); - - ? ? BUG_ON(val < 0 || val > mc13783_regulators[id].desc.n_voltages); - - ? ? return mc13783_regulators[id].voltages[val]; -} - -static struct regulator_ops mc13783_regulator_ops = { - ? ? .enable = mc13783_regulator_enable, - ? ? .disable = mc13783_regulator_disable, - ? ? .is_enabled = mc13783_regulator_is_enabled, - ? ? .list_voltage = mc13783_regulator_list_voltage, - ? ? .set_voltage = mc13783_regulator_set_voltage, - ? ? .get_voltage = mc13783_regulator_get_voltage, -}; - -static int mc13783_fixed_regulator_set_voltage (struct regulator_dev *rdev, - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int min_uV, int max_uV) -{ - ? ? int id = rdev_get_id(rdev); - - ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d min_uV: %d max_uV: %d\n", - ? ? ? ? ? ? __func__, id, min_uV, max_uV); - - ? ? if (min_uV >= mc13783_regulators[id].voltages[0] && - ? ? ? ? max_uV <= mc13783_regulators[id].voltages[0]) - ? ? ? ? ? ? return 0; - ? ? else - ? ? ? ? ? ? return -EINVAL; -} - -static int mc13783_fixed_regulator_get_voltage (struct regulator_dev *rdev) -{ - ? ? int id = rdev_get_id(rdev); - - ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); - - ? ? return mc13783_regulators[id].voltages[0]; -} - -static struct regulator_ops mc13783_fixed_regulator_ops = { - ? ? .enable = mc13783_regulator_enable, - ? ? .disable = mc13783_regulator_disable, - ? ? .is_enabled = mc13783_regulator_is_enabled, - ? ? .list_voltage = mc13783_regulator_list_voltage, - ? ? .set_voltage = mc13783_fixed_regulator_set_voltage, - ? ? .get_voltage = mc13783_fixed_regulator_get_voltage, -}; - -int mc13783_powermisc_rmw (struct mc13783_regulator_priv *priv,u32 mask, +int mc13783_powermisc_rmw (struct mc13xxx_regulator_priv *priv,u32 mask, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? u32 val) ?{ - ? ? struct mc13783 *mc13783 = priv->mc13783; + ? ? struct mc13xxx *mc13783 = priv->mc13xxx; ? ? ? int ret; ? ? ? u32 valread; ? ? ? BUG_ON(val & ~mask); - ? ? ret = mc13783_reg_read(mc13783, MC13783_REG_POWERMISC, &valread); + ? ? ret = mc13xxx_reg_read(mc13783, MC13783_REG_POWERMISC, &valread); ? ? ? if (ret) ? ? ? ? ? ? ? return ret;drivers/regulator/mc13783-regulator.c int mc13783_powermisc_rmw(struct · line 272
Quoted 1 line
drivers/regulator/mc13783-regulator.c +0
-0@@ -489,34 +272,36 @@ int mc13783_powermisc_rmw(struct mc13783_regulator_priv *priv, u32 mask,Here git apply get an error...
Please send a clean patch and then I will get it a try!Quoted 150 lines
? ? ? valread = (valread & ~MC13783_REG_POWERMISC_PWGTSPI_M) | ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?
priv->powermisc_pwgt_state;- ? ? return
mc13783_reg_write(mc13783, MC13783_REG_POWERMISC, valread);
+ ? ? returnmc13xxx_reg_write(mc13783, MC13783_REG_POWERMISC, valread); ?}?static int
mc13783_gpo_regulator_enable(struct regulator_dev *rdev)?{
- ? ? structmc13783_regulator_priv*priv =rdev_get_drvdata(rdev);
+ ? ? structmc13xxx_regulator_priv*priv =rdev_get_drvdata(rdev);
+ ? ? structmc13xxx_regulator*mc13xxx_regulators=priv->mc13xxx_regulators; ? ? ? int id =rdev_get_id(rdev);
? ? ? int ret;
- ? ? u32en_val= mc13783_regulators[id].enable_bit;
+ ? ? u32en_val= mc13xxx_regulators[id].enable_bit;? ? ?
dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);? ? ? /* Power Gate enable value is 0 */
- ? ? if (id ==MC13783_REGU_PWGT1SPI||
- ? ? ? ? id ==MC13783_REGU_PWGT2SPI)
+ ? ? if (id ==MC13783_REG_PWGT1SPI||
+ ? ? ? ? id ==MC13783_REG_PWGT2SPI)
? ? ? ? ? ? ?en_val= 0;- ? ?
mc13783_lock(priv->mc13783);
- ? ? ret = mc13783_powermisc_rmw(priv, mc13783_regulators[id].enable_bit,
+ ? ?mc13xxx_lock(priv->mc13xxx);
+ ? ? ret =mc13783_powermisc_rmw(priv, mc13xxx_regulators[id].enable_bit, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? en_val);
- ? ?mc13783_unlock(priv->mc13783);
+ ? ?mc13xxx_unlock(priv->mc13xxx);? ? ? return ret;
?}?static int
mc13783_gpo_regulator_disable(struct regulator_dev *rdev)?{
- ? ? structmc13783_regulator_priv*priv =rdev_get_drvdata(rdev);
+ ? ? structmc13xxx_regulator_priv*priv =rdev_get_drvdata(rdev);
+ ? ? structmc13xxx_regulator*mc13xxx_regulators=priv->mc13xxx_regulators; ? ? ? int id =rdev_get_id(rdev);
? ? ? int ret;
? ? ? u32dis_val= 0;drivers/regulator/mc13783-regulator.c +0
-0@@ -524,27 +309,28 @@ static int mc13783_gpo_regulator_disable(struct regulator_dev *rdev) ? ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);? ? ? /* Power Gate disable value is 1 */
- ? ? if (id ==MC13783_REGU_PWGT1SPI||
- ? ? ? ? id ==MC13783_REGU_PWGT2SPI)
- ? ? ? ? ? ?dis_val= mc13783_regulators[id].enable_bit;
+ ? ? if (id ==MC13783_REG_PWGT1SPI||
+ ? ? ? ? id ==MC13783_REG_PWGT2SPI)
+ ? ? ? ? ? ?dis_val= mc13xxx_regulators[id].enable_bit;- ? ?
mc13783_lock(priv->mc13783);
- ? ? ret = mc13783_powermisc_rmw(priv, mc13783_regulators[id].enable_bit,
+ ? ?mc13xxx_lock(priv->mc13xxx);
+ ? ? ret =mc13783_powermisc_rmw(priv, mc13xxx_regulators[id].enable_bit, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? dis_val);
- ? ?mc13783_unlock(priv->mc13783);
+ ? ?mc13xxx_unlock(priv->mc13xxx);? ? ? return ret;
?}?static int
mc13783_gpo_regulator_is_enabled(struct regulator_dev *rdev)?{
- ? ? structmc13783_regulator_priv*priv =rdev_get_drvdata(rdev);
+ ? ? structmc13xxx_regulator_priv*priv =rdev_get_drvdata(rdev);
+ ? ? structmc13xxx_regulator*mc13xxx_regulators=priv->mc13xxx_regulators; ? ? ? int ret, id =rdev_get_id(rdev);
? ? ? unsigned int val;- ? ?
mc13783_lock(priv->mc13783);
- ? ? ret =mc13783_reg_read(priv->mc13783, mc13783_regulators[id].reg, &val);
- ? ?mc13783_unlock(priv->mc13783);
+ ? ?mc13xxx_lock(priv->mc13xxx);
+ ? ? ret =mc13xxx_reg_read(priv->mc13xxx, mc13xxx_regulators[id].reg, &val);
+ ? ?mc13xxx_unlock(priv->mc13xxx);? ? ? if (ret)
? ? ? ? ? ? ? return ret;drivers/regulator/mc13783-regulator.c +0
-0@@ -554,22 +340,22 @@ static int mc13783_gpo_regulator_is_enabled(struct regulator_dev *rdev)? ? ? val = (val & ~MC13783_REG_POWERMISC_PWGTSPI_M) |
? ? ? ? ? ? (priv->powermisc_pwgt_state^MC13783_REG_POWERMISC_PWGTSPI_M);- ? ? return (val & mc13783_regulators[id].enable_bit) != 0;
+ ? ? return (val & mc13xxx_regulators[id].enable_bit) != 0; ?}?static struct
regulator_opsmc13783_gpo_regulator_ops= { ? ? ? .enable =mc13783_gpo_regulator_enable,
? ? ? .disable =mc13783_gpo_regulator_disable,
? ? ? .is_enabled =mc13783_gpo_regulator_is_enabled,
- ? ? .list_voltage =mc13783_regulator_list_voltage,
- ? ? .set_voltage =mc13783_fixed_regulator_set_voltage,
- ? ? .get_voltage =mc13783_fixed_regulator_get_voltage,
+ ? ? .list_voltage =mc13xxx_regulator_list_voltage,
+ ? ? .set_voltage =mc13xxx_fixed_regulator_set_voltage,
+ ? ? .get_voltage =mc13xxx_fixed_regulator_get_voltage, ?};?static int
__devinitmc13783_regulator_probe(struct platform_device *pdev)?{
- ? ? structmc13783_regulator_priv*priv;
- ? ? struct mc13783 *mc13783 =dev_get_drvdata(pdev->dev.parent);
+ ? ? structmc13xxx_regulator_priv*priv;
+ ? ? struct mc13xxx *mc13783 =dev_get_drvdata(pdev->dev.parent); ? ? ? structmc13783_regulator_platform_data*pdata =
? ? ? ? ? ? ?dev_get_platdata(&pdev->dev);
? ? ? structmc13783_regulator_init_data*init_data;drivers/regulator/mc13783-regulator.c +2
-1@@ -583,7 +369,8 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev) ? ? ? if (!priv) ? ? ? ? ? ? ? return -ENOMEM; - ? ? priv->mc13783 = mc13783; + ? ? priv->mc13xxx_regulators = mc13783_regulators; + ? ? priv->mc13xxx = mc13783; ? ? ? for (i = 0; i < pdata->num_regulators; i++) {? ? ? ? ? ? ?
init_data= &pdata->regulators[i];drivers/regulator/mc13783-regulator.c +1
-1@@ -613,7 +400,7 @@ err: ?static int __devexit mc13783_regulator_remove(struct platform_device *pdev) ?{ - ? ? struct mc13783_regulator_priv *priv = platform_get_drvdata(pdev); + ? ? struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);? ? ? struct
mc13783_regulator_platform_data*pdata = ? ? ? ? ? ? ?dev_get_platdata(&pdev->dev);
? ? ? int i;drivers/regulator/mc13xxx-regulator-core.c new file +8
-0@@ -0,0 +1,241 @@ +/* +* Regulator Driver for Freescale MC13xxx PMIC +* +* Copyright 2010 Yong Shen <[email protected]> +* +* Based on mc13783 regulator driver : +* Copyright (C) 2008 Sascha Hauer, Pengutronix <[email protected]> +* Copyright 2009 Alberto Panizzo <[email protected]> drivers/regulator/mc13xxx-regulator-core.c line 18
Quoted 10 lines
drivers/regulator/mc13xxx-regulator-core.c new file +10
-0+* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* Regs infos taken from mc13xxx drivers from freescale and mc13xxx.pdf file +* from freescale +*/ + +#define DEBUG And debug enabled by default?
I'll wait for version 2..
Regards,
Alberto!PS:
./scripts/get_maintainer.plsaid to cc all these guys:Liam Girdwood <[email protected]>
Mark Brown <[email protected]> Samuel Ortiz <[email protected]> Haojian Zhuang <[email protected]> Linus Walleij <[email protected]> Alberto Panizzo <[email protected]> "Uwe Kleine-K?nig" <[email protected]> Axel Lin <[email protected]>
Andrew Morton <[email protected]> "Philippe R?tornaz" <[email protected]> linux-kernel at vger.kernel.orgPlease, use always this script to decide who have to be cc'ed by default sending patches.
Quoted 415 lines
drivers/regulator/mc13xxx-regulator-core.c new file +223
-0+ +#include <linux/mfd/mc13xxx.h> +#include <linux/regulator/mc13xxx.h> +#include <linux/regulator/machine.h> +#include <linux/regulator/driver.h> +#include <linux/platform_device.h> +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/init.h> +#include <linux/err.h> + +static int mc13xxx_regulator_enable (struct regulator_dev *rdev) +{ + ? ? struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); + ? ? struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + ? ? int id = rdev_get_id(rdev); + ? ? int ret; + + ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); + + ? ? mc13xxx_lock(priv->mc13xxx); + ? ? ret = mc13xxx_reg_rmw(priv->mc13xxx, mc13xxx_regulators[id].reg, + ? ? ? ? ? ? ? ? ? ? mc13xxx_regulators[id].enable_bit, + ? ? ? ? ? ? ? ? ? ? mc13xxx_regulators[id].enable_bit); + ? ? mc13xxx_unlock(priv->mc13xxx); + + ? ? return ret; +} + +static int mc13xxx_regulator_disable (struct regulator_dev *rdev) +{ + ? ? struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); + ? ? struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + ? ? int id = rdev_get_id(rdev); + ? ? int ret; + + ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); + + ? ? mc13xxx_lock(priv->mc13xxx); + ? ? ret = mc13xxx_reg_rmw(priv->mc13xxx, mc13xxx_regulators[id].reg, + ? ? ? ? ? ? ? ? ? ? mc13xxx_regulators[id].enable_bit, 0); + ? ? mc13xxx_unlock(priv->mc13xxx); + + ? ? return ret; +} + +static int mc13xxx_regulator_is_enabled (struct regulator_dev *rdev) +{ + ? ? struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); + ? ? struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + ? ? int ret, id = rdev_get_id(rdev); + ? ? unsigned int val; + + ? ? mc13xxx_lock(priv->mc13xxx); + ? ? ret = mc13xxx_reg_read(priv->mc13xxx, mc13xxx_regulators[id].reg, &val); + ? ? mc13xxx_unlock(priv->mc13xxx); + + ? ? if (ret) + ? ? ? ? ? ? return ret; + + ? ? return (val & mc13xxx_regulators[id].enable_bit) != 0; +} + +int mc13xxx_regulator_list_voltage (struct regulator_dev *rdev, + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? unsigned selector) +{ + ? ? int id = rdev_get_id(rdev); + ? ? struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); + ? ? struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + + ? ? if (selector >= mc13xxx_regulators[id].desc.n_voltages) + ? ? ? ? ? ? return -EINVAL; + + ? ? return mc13xxx_regulators[id].voltages[selector]; +} + +int mc13xxx_get_best_voltage_index (struct regulator_dev *rdev, + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int min_uV, int max_uV) +{ + ? ? struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); + ? ? struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + ? ? int reg_id = rdev_get_id(rdev); + ? ? int i; + ? ? int bestmatch; + ? ? int bestindex; + + ? ? /* + ? ? ?* Locate the minimum voltage fitting the criteria on + ? ? ?* this regulator. The switchable voltages are not + ? ? ?* in strict falling order so we need to check them + ? ? ?* all for the best match. + ? ? ?*/ + ? ? bestmatch = INT_MAX; + ? ? bestindex = -1; + ? ? for (i = 0; i < mc13xxx_regulators[reg_id].desc.n_voltages; i++) { + ? ? ? ? ? ? if (mc13xxx_regulators[reg_id].voltages[i] >= min_uV && + ? ? ? ? ? ? ? ? mc13xxx_regulators[reg_id].voltages[i] < bestmatch) { + ? ? ? ? ? ? ? ? ? ? bestmatch = mc13xxx_regulators[reg_id].voltages[i]; + ? ? ? ? ? ? ? ? ? ? bestindex = i; + ? ? ? ? ? ? } + ? ? } + + ? ? if (bestindex < 0 || bestmatch > max_uV) { + ? ? ? ? ? ? dev_warn(&rdev->dev, "no possible value for %d<=x<=%d uV\n", + ? ? ? ? ? ? ? ? ? ? ? ? ? ? min_uV, max_uV); + ? ? ? ? ? ? return -EINVAL; + ? ? } + ? ? return bestindex; +} + +static int mc13xxx_regulator_set_voltage (struct regulator_dev *rdev, + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int min_uV, int max_uV) +{ + ? ? struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); + ? ? struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + ? ? int value, id = rdev_get_id(rdev); + ? ? int ret; + + ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d min_uV: %d max_uV: %d\n", + ? ? ? ? ? ? __func__, id, min_uV, max_uV); + + ? ? /* Find the best index */ + ? ? value = mc13xxx_get_best_voltage_index(rdev, min_uV, max_uV); + ? ? dev_dbg(rdev_get_dev(rdev), "%s best value: %d\n", __func__, value); + ? ? if (value < 0) + ? ? ? ? ? ? return value; + + ? ? mc13xxx_lock(priv->mc13xxx); + ? ? ret = mc13xxx_reg_rmw(priv->mc13xxx, mc13xxx_regulators[id].vsel_reg, + ? ? ? ? ? ? ? ? ? ? mc13xxx_regulators[id].vsel_mask, + ? ? ? ? ? ? ? ? ? ? value << mc13xxx_regulators[id].vsel_shift); + ? ? mc13xxx_unlock(priv->mc13xxx); + + ? ? return ret; +} + +static int mc13xxx_regulator_get_voltage (struct regulator_dev *rdev) +{ + ? ? struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); + ? ? struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + ? ? int ret, id = rdev_get_id(rdev); + ? ? unsigned int val; + + ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); + + ? ? mc13xxx_lock(priv->mc13xxx); + ? ? ret = mc13xxx_reg_read(priv->mc13xxx, + ? ? ? ? ? ? ? ? ? ? ? ? ? ? mc13xxx_regulators[id].vsel_reg, &val); + ? ? mc13xxx_unlock(priv->mc13xxx); + + ? ? if (ret) + ? ? ? ? ? ? return ret; + + ? ? val = (val & mc13xxx_regulators[id].vsel_mask) + ? ? ? ? ? ? >> mc13xxx_regulators[id].vsel_shift; + + ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d val: %d\n", __func__, id, val); + + ? ? BUG_ON(val < 0 || val > mc13xxx_regulators[id].desc.n_voltages); + + ? ? return mc13xxx_regulators[id].voltages[val]; +} + +struct regulator_ops mc13xxx_regulator_ops = { + ? ? .enable = mc13xxx_regulator_enable, + ? ? .disable = mc13xxx_regulator_disable, + ? ? .is_enabled = mc13xxx_regulator_is_enabled, + ? ? .list_voltage = mc13xxx_regulator_list_voltage, + ? ? .set_voltage = mc13xxx_regulator_set_voltage, + ? ? .get_voltage = mc13xxx_regulator_get_voltage, +}; + +int mc13xxx_fixed_regulator_set_voltage (struct regulator_dev *rdev, + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int min_uV, int max_uV) +{ + ? ? struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); + ? ? struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + ? ? int id = rdev_get_id(rdev); + + ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d min_uV: %d max_uV: %d\n", + ? ? ? ? ? ? __func__, id, min_uV, max_uV); + + ? ? if (min_uV >= mc13xxx_regulators[id].voltages[0] && + ? ? ? ? max_uV <= mc13xxx_regulators[id].voltages[0]) + ? ? ? ? ? ? return 0; + ? ? else + ? ? ? ? ? ? return -EINVAL; +} + +int mc13xxx_fixed_regulator_get_voltage (struct regulator_dev *rdev) +{ + ? ? struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev); + ? ? struct mc13xxx_regulator *mc13xxx_regulators = priv->mc13xxx_regulators; + ? ? int id = rdev_get_id(rdev); + + ? ? dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); + + ? ? return mc13xxx_regulators[id].voltages[0]; +} + +struct regulator_ops mc13xxx_fixed_regulator_ops = { + ? ? .enable = mc13xxx_regulator_enable, + ? ? .disable = mc13xxx_regulator_disable, + ? ? .is_enabled = mc13xxx_regulator_is_enabled, + ? ? .list_voltage = mc13xxx_regulator_list_voltage, + ? ? .set_voltage = mc13xxx_fixed_regulator_set_voltage, + ? ? .get_voltage = mc13xxx_fixed_regulator_get_voltage, +}; + +int mc13xxx_sw_regulator (struct regulator_dev *rdev) +{ + ? ? return 0; +} + +int mc13xxx_sw_regulator_is_enabled (struct regulator_dev *rdev) +{ + ? ? return 1; +} + +MODULE_LICENSE ("GPL v2" ); +MODULE_AUTHOR ("Yong Shen <[email protected]>" ); +MODULE_DESCRIPTION ("Regulator Driver for Freescale MC13xxx PMIC" ); +MODULE_ALIAS ("platform:mc13xxx-regulator-core" );include/linux/mfd/mc13783.h +0
-0@@ -1,4 +1,5 @@?/*
+ * Copyright 2010 Yong Shen <[email protected]> ? * Copyright 2009-2010 Pengutronix
? * Uwe Kleine-Koenig <[email protected]> ? *include/linux/mfd/mc13783.h +33
-33@@ -122,39 +123,39 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode, ? ? ? ? ? ? ? unsigned int channel, unsigned int *sample); -#define ? ? ?MC13783_SW_SW1A ? ? ? ? 0 -#define ? ? ?MC13783_SW_SW1B ? ? ? ? 1 -#define ? ? ?MC13783_SW_SW2A ? ? ? ? 2 -#define ? ? ?MC13783_SW_SW2B ? ? ? ? 3 -#define ? ? ?MC13783_SW_SW3 ? ? ? ? ?4 -#define ? ? ?MC13783_SW_PLL ? ? ? ? ?5 -#define ? ? ?MC13783_REGU_VAUDIO ? ? 6 -#define ? ? ?MC13783_REGU_VIOHI ? ? ?7 -#define ? ? ?MC13783_REGU_VIOLO ? ? ?8 -#define ? ? ?MC13783_REGU_VDIG ? ? ? 9 -#define ? ? ?MC13783_REGU_VGEN ? ? ? 10 -#define ? ? ?MC13783_REGU_VRFDIG ? ? 11 -#define ? ? ?MC13783_REGU_VRFREF ? ? 12 -#define ? ? ?MC13783_REGU_VRFCP ? ? ?13 -#define ? ? ?MC13783_REGU_VSIM ? ? ? 14 -#define ? ? ?MC13783_REGU_VESIM ? ? ?15 -#define ? ? ?MC13783_REGU_VCAM ? ? ? 16 -#define ? ? ?MC13783_REGU_VRFBG ? ? ?17 -#define ? ? ?MC13783_REGU_VVIB ? ? ? 18 -#define ? ? ?MC13783_REGU_VRF1 ? ? ? 19 -#define ? ? ?MC13783_REGU_VRF2 ? ? ? 20 -#define ? ? ?MC13783_REGU_VMMC1 ? ? ?21 -#define ? ? ?MC13783_REGU_VMMC2 ? ? ?22 -#define ? ? ?MC13783_REGU_GPO1 ? ? ? 23 -#define ? ? ?MC13783_REGU_GPO2 ? ? ? 24 -#define ? ? ?MC13783_REGU_GPO3 ? ? ? 25 -#define ? ? ?MC13783_REGU_GPO4 ? ? ? 26 -#define ? ? ?MC13783_REGU_V1 ? ? ? ? 27 -#define ? ? ?MC13783_REGU_V2 ? ? ? ? 28 -#define ? ? ?MC13783_REGU_V3 ? ? ? ? 29 -#define ? ? ?MC13783_REGU_V4 ? ? ? ? 30 -#define ? ? ?MC13783_REGU_PWGT1SPI ? 31 -#define ? ? ?MC13783_REGU_PWGT2SPI ? 32 +#define ? ? ?MC13783_REG_SW1A ? ? ? ? ? ? ? ?0 +#define ? ? ?MC13783_REG_SW1B ? ? ? ? ? ? ? ?1 +#define ? ? ?MC13783_REG_SW2A ? ? ? ? ? ? ? ?2 +#define ? ? ?MC13783_REG_SW2B ? ? ? ? ? ? ? ?3 +#define ? ? ?MC13783_REG_SW3 ? ? ? ? 4 +#define ? ? ?MC13783_REG_PLL ? ? ? ? 5 +#define ? ? ?MC13783_REG_VAUDIO ? ? ?6 +#define ? ? ?MC13783_REG_VIOHI ? ? ? 7 +#define ? ? ?MC13783_REG_VIOLO ? ? ? 8 +#define ? ? ?MC13783_REG_VDIG ? ? ? ?9 +#define ? ? ?MC13783_REG_VGEN ? ? ? ?10 +#define ? ? ?MC13783_REG_VRFDIG ? ? ?11 +#define ? ? ?MC13783_REG_VRFREF ? ? ?12 +#define ? ? ?MC13783_REG_VRFCP ? ? ? 13 +#define ? ? ?MC13783_REG_VSIM ? ? ? ?14 +#define ? ? ?MC13783_REG_VESIM ? ? ? 15 +#define ? ? ?MC13783_REG_VCAM ? ? ? ?16 +#define ? ? ?MC13783_REG_VRFBG ? ? ? 17 +#define ? ? ?MC13783_REG_VVIB ? ? ? ?18 +#define ? ? ?MC13783_REG_VRF1 ? ? ? ?19 +#define ? ? ?MC13783_REG_VRF2 ? ? ? ?20 +#define ? ? ?MC13783_REG_VMMC1 ? ? ? 21 +#define ? ? ?MC13783_REG_VMMC2 ? ? ? 22 +#define ? ? ?MC13783_REG_GPO1 ? ? ? ?23 +#define ? ? ?MC13783_REG_GPO2 ? ? ? ?24 +#define ? ? ?MC13783_REG_GPO3 ? ? ? ?25 +#define ? ? ?MC13783_REG_GPO4 ? ? ? ?26 +#define ? ? ?MC13783_REG_V1 ? ? ? ? ?27 +#define ? ? ?MC13783_REG_V2 ? ? ? ? ?28 +#define ? ? ?MC13783_REG_V3 ? ? ? ? ?29 +#define ? ? ?MC13783_REG_V4 ? ? ? ? ?30 +#define ? ? ?MC13783_REG_PWGT1SPI ? ?31 +#define ? ? ?MC13783_REG_PWGT2SPI ? ?32?#define
MC13783_IRQ_ADCDONE?MC13XXX_IRQ_ADCDONE ?#defineMC13783_IRQ_ADCBISDONE? ? ?MC13XXX_IRQ_ADCBISDONEinclude/linux/regulator/mc13xxx.h new file +101
-0@@ -0,0 +1,101 @@ +/* +* mc13xxx.h - regulators for the Freescale mc13xxx PMIC +* +* ?Copyright (C) 2010 Yong Shen <[email protected]> +* +* 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. +*/ + +#ifndef __LINUX_REGULATOR_MC13XXX_H +#define __LINUX_REGULATOR_MC13XXX_H + +#include <linux/regulator/driver.h> + +struct mc13xxx_regulator { + ? ? struct regulator_desc desc; + ? ? int reg; + ? ? int enable_bit; + ? ? int vsel_reg; + ? ? int vsel_shift; + ? ? int vsel_mask; + ? ? int hi_bit; + ? ? int const *voltages; +}; + +struct mc13xxx_regulator_priv { + ? ? struct mc13xxx *mc13xxx; + ? ? u32 powermisc_pwgt_state; + ? ? struct mc13xxx_regulator *mc13xxx_regulators; + ? ? struct regulator_dev *regulators[]; +}; + +extern int mc13xxx_sw_regulator (struct regulator_dev *rdev); +extern int mc13xxx_sw_regulator_is_enabled (struct regulator_dev *rdev); +extern int mc13xxx_get_best_voltage_index (struct regulator_dev *rdev, + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int min_uV, int max_uV); +extern int mc13xxx_regulator_list_voltage (struct regulator_dev *rdev, + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? unsigned selector); +extern int mc13xxx_fixed_regulator_set_voltage (struct regulator_dev *rdev, + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int min_uV, int max_uV); +extern int mc13xxx_fixed_regulator_get_voltage (struct regulator_dev *rdev); + +extern struct regulator_ops mc13xxx_regulator_ops; +extern struct regulator_ops mc13xxx_fixed_regulator_ops; + +#define MC13xxx_DEFINE (prefix, _name, _reg, _vsel_reg, _voltages, _ops) ? ? ?\ + ? ? [prefix ## _name] = { ? ? ? ? ? ? ? ? ? ? ? ? ? \ + ? ? ? ? ? ? .desc = { ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \ + ? ? ? ? ? ? ? ? ? ? .name = #prefix "_" #_name, ? ? ? ? ? ? ? ? ? ? \ + ? ? ? ? ? ? ? ? ? ? .n_voltages = ARRAY_SIZE(_voltages), ? ? ? ? ? ?\ + ? ? ? ? ? ? ? ? ? ? .ops = &_ops, ? ? ? ? ? ? ? ? ? \ + ? ? ? ? ? ? ? ? ? ? .type = REGULATOR_VOLTAGE, ? ? ? ? ? ? ? ? ? ? ?\ + ? ? ? ? ? ? ? ? ? ? .id = prefix ## _name, ? ? ? ? ?\ + ? ? ? ? ? ? ? ? ? ? .owner = THIS_MODULE, ? ? ? ? ? ? ? ? ? ? ? ? ? \ + ? ? ? ? ? ? }, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?\ + ? ? ? ? ? ? .reg = prefix ## _reg, ? ? ? ? ? ? ? ? ? ? ? ? ?\ + ? ? ? ? ? ? .enable_bit = prefix ## _reg ## _ ## _name ## EN, ? ? ? \ + ? ? ? ? ? ? .vsel_reg = prefix ## _vsel_reg, ? ? ? ? ? ? ? ? ? ? ? ?\ + ? ? ? ? ? ? .vsel_shift = prefix ## _vsel_reg ## _ ## _name ## VSEL,\ + ? ? ? ? ? ? .vsel_mask = prefix ## _vsel_reg ## _ ## _name ## VSEL_M,\ + ? ? ? ? ? ? .voltages = ?_voltages, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \ + ? ? } + +#define MC13xxx_FIXED_DEFINE (prefix, _name, _reg, _voltages, _ops) ? \ + ? ? [prefix ## _name] = { ? ? ? ? ? ? ? ? ? ? ? ? ? \ + ? ? ? ? ? ? .desc = { ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \ + ? ? ? ? ? ? ? ? ? ? .name = #prefix "_" #_name, ? ? ? ? ? ? ? ? ? ? \ + ? ? ? ? ? ? ? ? ? ? .n_voltages = ARRAY_SIZE(_voltages), ? ? ? ? ? ?\ + ? ? ? ? ? ? ? ? ? ? .ops = &_ops, ? ? ? ? ? \ + ? ? ? ? ? ? ? ? ? ? .type = REGULATOR_VOLTAGE, ? ? ? ? ? ? ? ? ? ? ?\ + ? ? ? ? ? ? ? ? ? ? .id = prefix ## _name, ? ? ? ? ?\ + ? ? ? ? ? ? ? ? ? ? .owner = THIS_MODULE, ? ? ? ? ? ? ? ? ? ? ? ? ? \ + ? ? ? ? ? ? }, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?\ + ? ? ? ? ? ? .reg = prefix ## _reg, ? ? ? ? ? ? ? ? ? ? ? ? ?\ + ? ? ? ? ? ? .enable_bit = prefix ## _reg ## _ ## _name ## EN, ? ? ? \ + ? ? ? ? ? ? .voltages = ?_voltages, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \ + ? ? } + +#define MC13xxx_GPO_DEFINE(prefix, _name, _reg, ?_voltages, _ops) ? ?\ + ? ? [prefix ## _name] = { ? ? ? ? ? ? ? ? ? ? ? ? ? \ + ? ? ? ? ? ? .desc = { ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \ + ? ? ? ? ? ? ? ? ? ? .name = #prefix "_" #_name, ? ? ? ? ? ? ? ? ? ? \ + ? ? ? ? ? ? ? ? ? ? .n_voltages = ARRAY_SIZE(_voltages), ? ? ? ? ? ?\ + ? ? ? ? ? ? ? ? ? ? .ops = &_ops, ? ? ? ? ? \ + ? ? ? ? ? ? ? ? ? ? .type = REGULATOR_VOLTAGE, ? ? ? ? ? ? ? ? ? ? ?\ + ? ? ? ? ? ? ? ? ? ? .id = prefix ## _name, ? ? ? ? ?\ + ? ? ? ? ? ? ? ? ? ? .owner = THIS_MODULE, ? ? ? ? ? ? ? ? ? ? ? ? ? \ + ? ? ? ? ? ? }, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?\ + ? ? ? ? ? ? .reg = prefix ## _reg, ? ? ? ? ? ? ? ? ? ? ? ? ?\ + ? ? ? ? ? ? .enable_bit = prefix ## _reg ## _ ## _name ## EN, ? ? ? \ + ? ? ? ? ? ? .voltages = ?_voltages, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \ + ? ? } + +#define MC13xxx_DEFINE_SW (_name, _reg, _vsel_reg, _voltages, ops) ? ?\ + ? ? MC13xxx_DEFINE(SW, _name, _reg, _vsel_reg, _voltages, ops) +#define MC13xxx_DEFINE_REGU (_name, _reg, _vsel_reg, _voltages, ops) ?\ + ? ? MC13xxx_DEFINE(REGU, _name, _reg, _vsel_reg, _voltages, ops) + +#endif
PATCH 1/1 make mc13783 code generic
In reply to Alberto PanizzoHello Yong, hello Alberto,
Quoted 14 lines · Alberto Panizzo
PS:
./scripts/get_maintainer.plsaid to cc all these guys:Liam Girdwood <[email protected]>
Mark Brown <[email protected]> Samuel Ortiz <[email protected]> Haojian Zhuang <[email protected]> Linus Walleij <[email protected]> Alberto Panizzo <[email protected]> "Uwe Kleine-K?nig" <[email protected]> Axel Lin <[email protected]>
Andrew Morton <[email protected]> "Philippe R?tornaz" <[email protected]> linux-kernel at vger.kernel.org
Quoted 2 lines
Please, use always this script to decide who have to be cc'ed by default sending patches.
No, please don't. Better use your common sense. get_maintainer.pl is a hint at best. E.g. Axel Lin only shows up in the list, because he touched several other regulator drivers and drivers/regulator/Makefile. I doubt that this is enough to imply interest.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 1/1 make mc13783 code generic
Quoted 11 lines · Uwe Kleine-K?nig
Quoted 4 lines · Alberto Panizzo
PS:
./scripts/get_maintainer.plsaid to cc all these guys:Please, use always this script to decide who have to be cc'ed by default sending patches.
No, please don't. Better use your common sense. get_maintainer.pl is a hint at best. E.g. Axel Lin only shows up in the list, because he touched several other regulator drivers and
drivers/regulator/Makefile. I doubt that this is enough to imply interest.
Yeah, Axel is doing a lot of cleanups but he's not got an active interest in most of the code he's touching. If you use the --nogit option (which is the default with current -next) get_maintainer.pl is a bit safer but you then need to think about people who might be actively interested in the driver but not listed in MAINTAINERS, and you still need to make sure that everyone you're seeing is interested (especially with multi-level maintianance).
PATCH 1/1 make mc13783 code generic
Hello Mark,
Quoted 13 lines · Mark Brown
Quoted 11 lines · Uwe Kleine-K?nig
Quoted 4 lines · Alberto Panizzo
PS:
./scripts/get_maintainer.plsaid to cc all these guys:Please, use always this script to decide who have to be cc'ed by default sending patches.
No, please don't. Better use your common sense. get_maintainer.pl is a hint at best. E.g. Axel Lin only shows up in the list, because he touched several other regulator drivers and
drivers/regulator/Makefile. I doubt that this is enough to imply interest.
Quoted 7 lines
Yeah, Axel is doing a lot of cleanups but he's not got an active interest in most of the code he's touching. If you use the --nogit option (which is the default with current -next) get_maintainer.pl is a bit safer but you then need to think about people who might be actively interested in the driver but not listed in
MAINTAINERS, and you still need to make sure that everyone you're seeing is interested (especially with multi-level maintianance).
I tried --nogit some time ago, but it still used git. After looking again I probably should have passed --nogit-fallback, too.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 1/1 make mc13783 code generic
Quoted 8 lines · Uwe Kleine-K?nig
Quoted 3 lines · Mark Brown
interest in most of the code he's touching. If you use the --nogit option (which is the default with current -next) get_maintainer.pl is a bit safer but you then need to think about people who might be actively
I tried --nogit some time ago, but it still used git. After looking again I probably should have passed --nogit-fallback, too.
Oh, erk - hadn't noticed the fallback stuff. The general point we're both making does still stand, get_maintainer is a useful starting point but should never be considered gospel.
PATCH 1/1 make mc13783 code generic
good hints../scripts/get_maintainer.pl 0001-make-mc13783-code-generic.patch --nogit-fallback gives me below information which I am going to use next time.
Liam Girdwood <[email protected]>
Mark Brown <[email protected]>
linux-kernel at vger.kernel.org
2010/11/30 Mark Brown <[email protected]>:
Quoted 14 lines · Uwe Kleine-K?nig
Quoted 8 lines · Mark Brown
Quoted 4 lines
interest in most of the code he's touching. ?If you use the --nogit option (which is the default with current -next) get_maintainer.pl is a bit safer but you then need to think about people who might be actively
I tried --nogit some time ago, but it still used git. ?After looking again I probably should have passed --nogit-fallback, too.
Oh, erk - hadn't noticed the fallback stuff. ?The general point we're both making does still stand,
get_maintaineris a useful starting point but should never be considered gospel.