Skip to content

Commit

Permalink
mfd: wm831x: Convert to IORESOURCE_REG
Browse files Browse the repository at this point in the history 
This was originally written by Russell King who unfortunately found
himself unable to take the patch futher.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Tested-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Mark Brown authored and Samuel Ortiz committed Sep 11, 2012
1 parent c04a9cb commit 5656098
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 60 deletions.
66 changes: 20 additions & 46 deletions drivers/mfd/wm831x-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -614,18 +614,11 @@ int wm831x_set_bits(struct wm831x *wm831x, unsigned short reg,
}
EXPORT_SYMBOL_GPL(wm831x_set_bits);

static struct resource wm831x_io_parent = {
.start = 0,
.end = 0xffffffff,
.flags = IORESOURCE_IO,
};

static struct resource wm831x_dcdc1_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_DC1_CONTROL_1,
.end = WM831X_DC1_DVS_CONTROL,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
{
.name = "UV",
Expand All @@ -644,10 +637,9 @@ static struct resource wm831x_dcdc1_resources[] = {

static struct resource wm831x_dcdc2_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_DC2_CONTROL_1,
.end = WM831X_DC2_DVS_CONTROL,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
{
.name = "UV",
Expand All @@ -665,10 +657,9 @@ static struct resource wm831x_dcdc2_resources[] = {

static struct resource wm831x_dcdc3_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_DC3_CONTROL_1,
.end = WM831X_DC3_SLEEP_CONTROL,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
{
.name = "UV",
Expand All @@ -680,10 +671,9 @@ static struct resource wm831x_dcdc3_resources[] = {

static struct resource wm831x_dcdc4_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_DC4_CONTROL,
.end = WM831X_DC4_SLEEP_CONTROL,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
{
.name = "UV",
Expand All @@ -695,10 +685,9 @@ static struct resource wm831x_dcdc4_resources[] = {

static struct resource wm8320_dcdc4_buck_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_DC4_CONTROL,
.end = WM832X_DC4_SLEEP_CONTROL,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
{
.name = "UV",
Expand All @@ -718,10 +707,9 @@ static struct resource wm831x_gpio_resources[] = {

static struct resource wm831x_isink1_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_CURRENT_SINK_1,
.end = WM831X_CURRENT_SINK_1,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
{
.start = WM831X_IRQ_CS1,
Expand All @@ -732,10 +720,9 @@ static struct resource wm831x_isink1_resources[] = {

static struct resource wm831x_isink2_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_CURRENT_SINK_2,
.end = WM831X_CURRENT_SINK_2,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
{
.start = WM831X_IRQ_CS2,
Expand All @@ -746,10 +733,9 @@ static struct resource wm831x_isink2_resources[] = {

static struct resource wm831x_ldo1_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_LDO1_CONTROL,
.end = WM831X_LDO1_SLEEP_CONTROL,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
{
.name = "UV",
Expand All @@ -761,10 +747,9 @@ static struct resource wm831x_ldo1_resources[] = {

static struct resource wm831x_ldo2_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_LDO2_CONTROL,
.end = WM831X_LDO2_SLEEP_CONTROL,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
{
.name = "UV",
Expand All @@ -776,10 +761,9 @@ static struct resource wm831x_ldo2_resources[] = {

static struct resource wm831x_ldo3_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_LDO3_CONTROL,
.end = WM831X_LDO3_SLEEP_CONTROL,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
{
.name = "UV",
Expand All @@ -791,10 +775,9 @@ static struct resource wm831x_ldo3_resources[] = {

static struct resource wm831x_ldo4_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_LDO4_CONTROL,
.end = WM831X_LDO4_SLEEP_CONTROL,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
{
.name = "UV",
Expand All @@ -806,10 +789,9 @@ static struct resource wm831x_ldo4_resources[] = {

static struct resource wm831x_ldo5_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_LDO5_CONTROL,
.end = WM831X_LDO5_SLEEP_CONTROL,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
{
.name = "UV",
Expand All @@ -821,10 +803,9 @@ static struct resource wm831x_ldo5_resources[] = {

static struct resource wm831x_ldo6_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_LDO6_CONTROL,
.end = WM831X_LDO6_SLEEP_CONTROL,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
{
.name = "UV",
Expand All @@ -836,10 +817,9 @@ static struct resource wm831x_ldo6_resources[] = {

static struct resource wm831x_ldo7_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_LDO7_CONTROL,
.end = WM831X_LDO7_SLEEP_CONTROL,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
{
.name = "UV",
Expand All @@ -851,10 +831,9 @@ static struct resource wm831x_ldo7_resources[] = {

static struct resource wm831x_ldo8_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_LDO8_CONTROL,
.end = WM831X_LDO8_SLEEP_CONTROL,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
{
.name = "UV",
Expand All @@ -866,10 +845,9 @@ static struct resource wm831x_ldo8_resources[] = {

static struct resource wm831x_ldo9_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_LDO9_CONTROL,
.end = WM831X_LDO9_SLEEP_CONTROL,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
{
.name = "UV",
Expand All @@ -881,10 +859,9 @@ static struct resource wm831x_ldo9_resources[] = {

static struct resource wm831x_ldo10_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_LDO10_CONTROL,
.end = WM831X_LDO10_SLEEP_CONTROL,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
{
.name = "UV",
Expand All @@ -896,10 +873,9 @@ static struct resource wm831x_ldo10_resources[] = {

static struct resource wm831x_ldo11_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_LDO11_ON_CONTROL,
.end = WM831X_LDO11_SLEEP_CONTROL,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
};

Expand Down Expand Up @@ -998,19 +974,17 @@ static struct resource wm831x_rtc_resources[] = {

static struct resource wm831x_status1_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_STATUS_LED_1,
.end = WM831X_STATUS_LED_1,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
};

static struct resource wm831x_status2_resources[] = {
{
.parent = &wm831x_io_parent,
.start = WM831X_STATUS_LED_2,
.end = WM831X_STATUS_LED_2,
.flags = IORESOURCE_IO,
.flags = IORESOURCE_REG,
},
};

Expand Down
12 changes: 6 additions & 6 deletions drivers/regulator/wm831x-dcdc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,9 +476,9 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)

dcdc->wm831x = wm831x;

res = platform_get_resource(pdev, IORESOURCE_IO, 0);
res = platform_get_resource(pdev, IORESOURCE_REG, 0);
if (res == NULL) {
dev_err(&pdev->dev, "No I/O resource\n");
dev_err(&pdev->dev, "No REG resource\n");
ret = -EINVAL;
goto err;
}
Expand Down Expand Up @@ -651,9 +651,9 @@ static __devinit int wm831x_buckp_probe(struct platform_device *pdev)

dcdc->wm831x = wm831x;

res = platform_get_resource(pdev, IORESOURCE_IO, 0);
res = platform_get_resource(pdev, IORESOURCE_REG, 0);
if (res == NULL) {
dev_err(&pdev->dev, "No I/O resource\n");
dev_err(&pdev->dev, "No REG resource\n");
ret = -EINVAL;
goto err;
}
Expand Down Expand Up @@ -795,9 +795,9 @@ static __devinit int wm831x_boostp_probe(struct platform_device *pdev)

dcdc->wm831x = wm831x;

res = platform_get_resource(pdev, IORESOURCE_IO, 0);
res = platform_get_resource(pdev, IORESOURCE_REG, 0);
if (res == NULL) {
dev_err(&pdev->dev, "No I/O resource\n");
dev_err(&pdev->dev, "No REG resource\n");
ret = -EINVAL;
goto err;
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/regulator/wm831x-isink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,9 @@ static __devinit int wm831x_isink_probe(struct platform_device *pdev)

isink->wm831x = wm831x;

res = platform_get_resource(pdev, IORESOURCE_IO, 0);
res = platform_get_resource(pdev, IORESOURCE_REG, 0);
if (res == NULL) {
dev_err(&pdev->dev, "No I/O resource\n");
dev_err(&pdev->dev, "No REG resource\n");
ret = -EINVAL;
goto err;
}
Expand Down
12 changes: 6 additions & 6 deletions drivers/regulator/wm831x-ldo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@ static __devinit int wm831x_gp_ldo_probe(struct platform_device *pdev)

ldo->wm831x = wm831x;

res = platform_get_resource(pdev, IORESOURCE_IO, 0);
res = platform_get_resource(pdev, IORESOURCE_REG, 0);
if (res == NULL) {
dev_err(&pdev->dev, "No I/O resource\n");
dev_err(&pdev->dev, "No REG resource\n");
ret = -EINVAL;
goto err;
}
Expand Down Expand Up @@ -520,9 +520,9 @@ static __devinit int wm831x_aldo_probe(struct platform_device *pdev)

ldo->wm831x = wm831x;

res = platform_get_resource(pdev, IORESOURCE_IO, 0);
res = platform_get_resource(pdev, IORESOURCE_REG, 0);
if (res == NULL) {
dev_err(&pdev->dev, "No I/O resource\n");
dev_err(&pdev->dev, "No REG resource\n");
ret = -EINVAL;
goto err;
}
Expand Down Expand Up @@ -675,9 +675,9 @@ static __devinit int wm831x_alive_ldo_probe(struct platform_device *pdev)

ldo->wm831x = wm831x;

res = platform_get_resource(pdev, IORESOURCE_IO, 0);
res = platform_get_resource(pdev, IORESOURCE_REG, 0);
if (res == NULL) {
dev_err(&pdev->dev, "No I/O resource\n");
dev_err(&pdev->dev, "No REG resource\n");
ret = -EINVAL;
goto err;
}
Expand Down

0 comments on commit 5656098

Please sign in to comment.