aboutsummaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/pcf50633-adc.c16
-rw-r--r--drivers/mfd/pcf50633-core.c101
2 files changed, 48 insertions, 69 deletions
diff --git a/drivers/mfd/pcf50633-adc.c b/drivers/mfd/pcf50633-adc.c
index aed0d2a9b03..bf77c8f9f6a 100644
--- a/drivers/mfd/pcf50633-adc.c
+++ b/drivers/mfd/pcf50633-adc.c
@@ -51,11 +51,6 @@ struct pcf50633_adc {
struct mutex queue_mutex;
};
-static inline struct pcf50633_adc *__to_adc(struct pcf50633 *pcf)
-{
- return platform_get_drvdata(pcf->adc_pdev);
-}
-
static void adc_setup(struct pcf50633 *pcf, int channel, int avg)
{
channel &= PCF50633_ADCC1_ADCMUX_MASK;
@@ -71,7 +66,7 @@ static void adc_setup(struct pcf50633 *pcf, int channel, int avg)
static void trigger_next_adc_job_if_any(struct pcf50633 *pcf)
{
- struct pcf50633_adc *adc = __to_adc(pcf);
+ struct pcf50633_adc *adc = pcf->adc;
int head;
head = adc->queue_head;
@@ -85,7 +80,7 @@ static void trigger_next_adc_job_if_any(struct pcf50633 *pcf)
static int
adc_enqueue_request(struct pcf50633 *pcf, struct pcf50633_adc_request *req)
{
- struct pcf50633_adc *adc = __to_adc(pcf);
+ struct pcf50633_adc *adc = pcf->adc;
int head, tail;
mutex_lock(&adc->queue_mutex);
@@ -201,13 +196,14 @@ static void pcf50633_adc_irq(int irq, void *data)
static int __devinit pcf50633_adc_probe(struct platform_device *pdev)
{
+ struct pcf50633 *pcf = dev_to_pcf50633(pdev->dev.parent);
struct pcf50633_adc *adc;
adc = kzalloc(sizeof(*adc), GFP_KERNEL);
if (!adc)
return -ENOMEM;
- adc->pcf = dev_to_pcf50633(pdev->dev.parent);
+ adc->pcf = pcf;
platform_set_drvdata(pdev, adc);
pcf50633_register_irq(adc->pcf, PCF50633_IRQ_ADCRDY,
@@ -215,6 +211,8 @@ static int __devinit pcf50633_adc_probe(struct platform_device *pdev)
mutex_init(&adc->queue_mutex);
+ pcf->adc = adc;
+
return 0;
}
@@ -223,6 +221,8 @@ static int __devexit pcf50633_adc_remove(struct platform_device *pdev)
struct pcf50633_adc *adc = platform_get_drvdata(pdev);
int i, head;
+ adc->pcf->adc = NULL;
+
pcf50633_free_irq(adc->pcf, PCF50633_IRQ_ADCRDY);
mutex_lock(&adc->queue_mutex);
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
index 9c14dbf02b0..dfb25583170 100644
--- a/drivers/mfd/pcf50633-core.c
+++ b/drivers/mfd/pcf50633-core.c
@@ -23,6 +23,8 @@
#include <linux/i2c.h>
#include <linux/slab.h>
+#include <linux/mfd/core.h>
+
#include <linux/mfd/pcf50633/core.h>
int pcf50633_irq_init(struct pcf50633 *pcf, int irq);
@@ -215,28 +217,6 @@ static struct attribute_group pcf_attr_group = {
.attrs = pcf_sysfs_entries,
};
-static void
-pcf50633_client_dev_register(struct pcf50633 *pcf, const char *name,
- struct platform_device **pdev)
-{
- int ret;
-
- *pdev = platform_device_alloc(name, -1);
- if (!*pdev) {
- dev_err(pcf->dev, "Falied to allocate %s\n", name);
- return;
- }
-
- (*pdev)->dev.parent = pcf->dev;
-
- ret = platform_device_add(*pdev);
- if (ret) {
- dev_err(pcf->dev, "Failed to register %s: %d\n", name, ret);
- platform_device_put(*pdev);
- *pdev = NULL;
- }
-}
-
#ifdef CONFIG_PM
static int pcf50633_suspend(struct i2c_client *client, pm_message_t state)
{
@@ -258,12 +238,43 @@ static int pcf50633_resume(struct i2c_client *client)
#define pcf50633_resume NULL
#endif
+#define PCF50633_CELL(_name) \
+ { \
+ .name = _name, \
+ } \
+
+#define PCF50633_CELL_ID(_name, _id) \
+ { \
+ .name = _name, \
+ .id = _id, \
+ } \
+
+static struct mfd_cell pcf50633_cells[] = {
+ PCF50633_CELL("pcf50633-input"),
+ PCF50633_CELL("pcf50633-rtc"),
+ PCF50633_CELL("pcf50633-mbc"),
+ PCF50633_CELL("pcf50633-adc"),
+ PCF50633_CELL("pcf50633-backlight"),
+ PCF50633_CELL("pcf50633-gpio"),
+ PCF50633_CELL_ID("pcf50633-regltr", 0),
+ PCF50633_CELL_ID("pcf50633-regltr", 1),
+ PCF50633_CELL_ID("pcf50633-regltr", 2),
+ PCF50633_CELL_ID("pcf50633-regltr", 3),
+ PCF50633_CELL_ID("pcf50633-regltr", 4),
+ PCF50633_CELL_ID("pcf50633-regltr", 5),
+ PCF50633_CELL_ID("pcf50633-regltr", 6),
+ PCF50633_CELL_ID("pcf50633-regltr", 7),
+ PCF50633_CELL_ID("pcf50633-regltr", 8),
+ PCF50633_CELL_ID("pcf50633-regltr", 9),
+ PCF50633_CELL_ID("pcf50633-regltr", 10),
+};
+
static int __devinit pcf50633_probe(struct i2c_client *client,
const struct i2c_device_id *ids)
{
struct pcf50633 *pcf;
struct pcf50633_platform_data *pdata = client->dev.platform_data;
- int i, ret;
+ int ret;
int version, variant;
if (!client->irq) {
@@ -296,35 +307,11 @@ static int __devinit pcf50633_probe(struct i2c_client *client,
pcf50633_irq_init(pcf, client->irq);
- /* Create sub devices */
- pcf50633_client_dev_register(pcf, "pcf50633-input",
- &pcf->input_pdev);
- pcf50633_client_dev_register(pcf, "pcf50633-rtc",
- &pcf->rtc_pdev);
- pcf50633_client_dev_register(pcf, "pcf50633-mbc",
- &pcf->mbc_pdev);
- pcf50633_client_dev_register(pcf, "pcf50633-adc",
- &pcf->adc_pdev);
- pcf50633_client_dev_register(pcf, "pcf50633-backlight",
- &pcf->bl_pdev);
- pcf50633_client_dev_register(pcf, "pcf50633-gpio",
- &pcf->gpio_pdev);
-
- for (i = 0; i < PCF50633_NUM_REGULATORS; i++) {
- struct platform_device *pdev;
-
- pdev = platform_device_alloc("pcf50633-regltr", i);
- if (!pdev) {
- dev_err(pcf->dev, "Cannot create regulator %d\n", i);
- continue;
- }
-
- pdev->dev.parent = pcf->dev;
- platform_device_add_data(pdev, &pdata->reg_init_data[i],
- sizeof(pdata->reg_init_data[i]));
- pcf->regulator_pdev[i] = pdev;
-
- platform_device_add(pdev);
+ ret = mfd_add_devices(pcf->dev, 0, pcf50633_cells,
+ ARRAY_SIZE(pcf50633_cells), NULL, 0);
+ if (ret) {
+ dev_err(pcf->dev, "Failed to add mfd cells.\n");
+ goto err_free;
}
ret = sysfs_create_group(&client->dev.kobj, &pcf_attr_group);
@@ -346,18 +333,10 @@ err_free:
static int __devexit pcf50633_remove(struct i2c_client *client)
{
struct pcf50633 *pcf = i2c_get_clientdata(client);
- int i;
pcf50633_irq_free(pcf);
- platform_device_unregister(pcf->gpio_pdev);
- platform_device_unregister(pcf->input_pdev);
- platform_device_unregister(pcf->rtc_pdev);
- platform_device_unregister(pcf->mbc_pdev);
- platform_device_unregister(pcf->adc_pdev);
-
- for (i = 0; i < PCF50633_NUM_REGULATORS; i++)
- platform_device_unregister(pcf->regulator_pdev[i]);
+ mfd_remove_devices(pcf->dev);
kfree(pcf);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 22:00:20 +0000