lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mfd: Add regulator support for twl6040 VIO, V2V1 supplies

Browse Source 
twl6040 has three power supply source:
VBAT needs to be connected to VBAT, VIO, and V2V1.
Add regulator support for the VIO, V2V1 supplies.
Initially handle the two supply together with bulk commands.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Peter Ujfalusi
2012-05-02 16:54:42 +03:00
committed by Samuel Ortiz
parent 5a2f1b5fae
commit 5af7df6b83
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/mfd/twl6040-core.c
View File

@@ -27,6 +27,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/err.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/delay.h> #include <linux/delay.h>
@@ -35,8 +36,10 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/mfd/core.h> #include <linux/mfd/core.h>
#include <linux/mfd/twl6040.h> #include <linux/mfd/twl6040.h>
#include <linux/regulator/consumer.h>
#define VIBRACTRL_MEMBER(reg) ((reg == TWL6040_REG_VIBCTLL) ? 0 : 1) #define VIBRACTRL_MEMBER(reg) ((reg == TWL6040_REG_VIBCTLL) ? 0 : 1)
#define TWL6040_NUM_SUPPLIES (2)
int twl6040_reg_read(struct twl6040 *twl6040, unsigned int reg) int twl6040_reg_read(struct twl6040 *twl6040, unsigned int reg)
{ {
@@ -532,6 +535,21 @@ static int __devinit twl6040_probe(struct i2c_client *client,
i2c_set_clientdata(client, twl6040); i2c_set_clientdata(client, twl6040);
twl6040->supplies[0].supply = "vio";
twl6040->supplies[1].supply = "v2v1";
ret = regulator_bulk_get(&client->dev, TWL6040_NUM_SUPPLIES,
twl6040->supplies);
if (ret != 0) {
dev_err(&client->dev, "Failed to get supplies: %d\n", ret);
goto regulator_get_err;
}
ret = regulator_bulk_enable(TWL6040_NUM_SUPPLIES, twl6040->supplies);
if (ret != 0) {
dev_err(&client->dev, "Failed to enable supplies: %d\n", ret);
goto power_err;
}
twl6040->dev = &client->dev; twl6040->dev = &client->dev;
twl6040->irq = client->irq; twl6040->irq = client->irq;
twl6040->irq_base = pdata->irq_base; twl6040->irq_base = pdata->irq_base;
@@ -552,13 +570,13 @@ static int __devinit twl6040_probe(struct i2c_client *client,
ret = gpio_request_one(twl6040->audpwron, GPIOF_OUT_INIT_LOW, ret = gpio_request_one(twl6040->audpwron, GPIOF_OUT_INIT_LOW,
"audpwron"); "audpwron");
if (ret) if (ret)
goto gpio1_err; goto gpio_err;
} }
/* codec interrupt */ /* codec interrupt */
ret = twl6040_irq_init(twl6040); ret = twl6040_irq_init(twl6040);
if (ret) if (ret)
goto gpio2_err; goto irq_init_err;
ret = request_threaded_irq(twl6040->irq_base + TWL6040_IRQ_READY, ret = request_threaded_irq(twl6040->irq_base + TWL6040_IRQ_READY,
NULL, twl6040_naudint_handler, 0, NULL, twl6040_naudint_handler, 0,
@@ -618,10 +636,14 @@ mfd_err:
free_irq(twl6040->irq_base + TWL6040_IRQ_READY, twl6040); free_irq(twl6040->irq_base + TWL6040_IRQ_READY, twl6040);
irq_err: irq_err:
twl6040_irq_exit(twl6040); twl6040_irq_exit(twl6040);
gpio2_err: irq_init_err:
if (gpio_is_valid(twl6040->audpwron)) if (gpio_is_valid(twl6040->audpwron))
gpio_free(twl6040->audpwron); gpio_free(twl6040->audpwron);
gpio1_err: gpio_err:
regulator_bulk_disable(TWL6040_NUM_SUPPLIES, twl6040->supplies);
power_err:
regulator_bulk_free(TWL6040_NUM_SUPPLIES, twl6040->supplies);
regulator_get_err:
i2c_set_clientdata(client, NULL); i2c_set_clientdata(client, NULL);
err: err:
return ret; return ret;
@@ -643,6 +665,9 @@ static int __devexit twl6040_remove(struct i2c_client *client)
mfd_remove_devices(&client->dev); mfd_remove_devices(&client->dev);
i2c_set_clientdata(client, NULL); i2c_set_clientdata(client, NULL);
regulator_bulk_disable(TWL6040_NUM_SUPPLIES, twl6040->supplies);
regulator_bulk_free(TWL6040_NUM_SUPPLIES, twl6040->supplies);
return 0; return 0;
} }

2
include/linux/mfd/twl6040.h
View File

@@ -27,6 +27,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/mfd/core.h> #include <linux/mfd/core.h>
#include <linux/regulator/consumer.h>
#define TWL6040_REG_ASICID 0x01 #define TWL6040_REG_ASICID 0x01
#define TWL6040_REG_ASICREV 0x02 #define TWL6040_REG_ASICREV 0x02
@@ -203,6 +204,7 @@ struct regmap;
struct twl6040 { struct twl6040 {
struct device *dev; struct device *dev;
struct regmap *regmap; struct regmap *regmap;
struct regulator_bulk_data supplies[2]; /* supplies for vio, v2v1 */
struct mutex mutex; struct mutex mutex;
struct mutex io_mutex; struct mutex io_mutex;
struct mutex irq_mutex; struct mutex irq_mutex;