forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mfd: convert DS1WM to use MFD core

Browse source 
This patch converts the DS1WM driver into an MFD cell. It also
calculates the bus_shift parameter from the memory resource size.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@openedhand.com>
This commit is contained in:
Philipp Zabel 2009-02-17 10:06:41 +01:00 • committed by Samuel Ortiz
parent 3206450355
commit a23a175795
3 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
drivers/w1/masters/ds1wm.c
View file

@ -19,7 +19,8 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/ds1wm.h> #include <linux/mfd/core.h>
#include <linux/mfd/ds1wm.h>
#include <asm/io.h> #include <asm/io.h>
@ -89,7 +90,7 @@ struct ds1wm_data {
void __iomem *map; void __iomem *map;
int bus_shift; /* # of shifts to calc register offsets */ int bus_shift; /* # of shifts to calc register offsets */
struct platform_device *pdev; struct platform_device *pdev;
struct ds1wm_platform_data *pdata; struct mfd_cell *cell;
int irq; int irq;
int active_high; int active_high;
struct clk *clk; struct clk *clk;
@ -217,8 +218,8 @@ static void ds1wm_up(struct ds1wm_data *ds1wm_data)
{ {
int gclk, divisor; int gclk, divisor;
if (ds1wm_data->pdata->enable) if (ds1wm_data->cell->enable)
ds1wm_data->pdata->enable(ds1wm_data->pdev); ds1wm_data->cell->enable(ds1wm_data->pdev);
gclk = clk_get_rate(ds1wm_data->clk); gclk = clk_get_rate(ds1wm_data->clk);
clk_enable(ds1wm_data->clk); clk_enable(ds1wm_data->clk);
@ -244,8 +245,8 @@ static void ds1wm_down(struct ds1wm_data *ds1wm_data)
ds1wm_write_register(ds1wm_data, DS1WM_INT_EN, ds1wm_write_register(ds1wm_data, DS1WM_INT_EN,
ds1wm_data->active_high ? DS1WM_INTEN_IAS : 0); ds1wm_data->active_high ? DS1WM_INTEN_IAS : 0);
if (ds1wm_data->pdata->disable) if (ds1wm_data->cell->disable)
ds1wm_data->pdata->disable(ds1wm_data->pdev); ds1wm_data->cell->disable(ds1wm_data->pdev);
clk_disable(ds1wm_data->clk); clk_disable(ds1wm_data->clk);
} }
@ -330,13 +331,18 @@ static struct w1_bus_master ds1wm_master = {
static int ds1wm_probe(struct platform_device *pdev) static int ds1wm_probe(struct platform_device *pdev)
{ {
struct ds1wm_data *ds1wm_data; struct ds1wm_data *ds1wm_data;
struct ds1wm_platform_data *plat; struct ds1wm_driver_data *plat;
struct resource *res; struct resource *res;
struct mfd_cell *cell;
int ret; int ret;
if (!pdev) if (!pdev)
return -ENODEV; return -ENODEV;
cell = pdev->dev.platform_data;
if (!cell)
return -ENODEV;
ds1wm_data = kzalloc(sizeof(*ds1wm_data), GFP_KERNEL); ds1wm_data = kzalloc(sizeof(*ds1wm_data), GFP_KERNEL);
if (!ds1wm_data) if (!ds1wm_data)
return -ENOMEM; return -ENOMEM;
@ -348,15 +354,18 @@ static int ds1wm_probe(struct platform_device *pdev)
ret = -ENXIO; ret = -ENXIO;
goto err0; goto err0;
} }
ds1wm_data->map = ioremap(res->start, res->end - res->start + 1); ds1wm_data->map = ioremap(res->start, resource_size(res));
if (!ds1wm_data->map) { if (!ds1wm_data->map) {
ret = -ENOMEM; ret = -ENOMEM;
goto err0; goto err0;
} }
plat = pdev->dev.platform_data; plat = cell->driver_data;
ds1wm_data->bus_shift = plat->bus_shift;
/* calculate bus shift from mem resource */
ds1wm_data->bus_shift = resource_size(res) >> 3;
ds1wm_data->pdev = pdev; ds1wm_data->pdev = pdev;
ds1wm_data->pdata = plat; ds1wm_data->cell = cell;
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!res) { if (!res) {

12
include/linux/ds1wm.h
View file

@ -1,12 +0,0 @@
/* platform data for the DS1WM driver */
struct ds1wm_platform_data {
int bus_shift; /* number of shifts needed to calculate the
* offset between DS1WM registers;
* e.g. on h5xxx and h2200 this is 2
* (registers aligned to 4-byte boundaries),
* while on hx4700 this is 1 */
int active_high;
void (*enable)(struct platform_device *pdev);
void (*disable)(struct platform_device *pdev);
};

5
include/linux/mfd/ds1wm.h Normal file
View file

@ -0,0 +1,5 @@
/* MFD cell driver data for the DS1WM driver */
struct ds1wm_driver_data {
int active_high;
};