Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 015625a2 authored by Mark Brown's avatar Mark Brown Committed by Samuel Ortiz
Browse files

mfd: max8925: Convert to IORESOURCE_REG 



Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
Tested-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 02367029

drivers/mfd/max8925-core.c

+4 −14
Original line number Original line Diff line number Diff line
@@ -18,19 +18,12 @@ 
#include <linux/mfd/core.h>

#include <linux/mfd/core.h>

#include <linux/mfd/max8925.h>

#include <linux/mfd/max8925.h>





static struct resource io_parent = {

	.start = 0,

	.end   = 0xffffffff,

	.flags = IORESOURCE_IO,

};



static struct resource backlight_resources[] = {

static struct resource backlight_resources[] = {

	{

	{

		.name	= "max8925-backlight",

		.name	= "max8925-backlight",

		.start	= MAX8925_WLED_MODE_CNTL,

		.start	= MAX8925_WLED_MODE_CNTL,

		.end	= MAX8925_WLED_CNTL,

		.end	= MAX8925_WLED_CNTL,

		.flags	= IORESOURCE_IO,

		.flags	= IORESOURCE_REG,

		.parent = &io_parent,

	},

	},

};

};
@@ -48,8 +41,7 @@ static struct resource touch_resources[] = { 
		.name	= "max8925-tsc",

		.name	= "max8925-tsc",

		.start	= MAX8925_TSC_IRQ,

		.start	= MAX8925_TSC_IRQ,

		.end	= MAX8925_ADC_RES_END,

		.end	= MAX8925_ADC_RES_END,

		.flags	= IORESOURCE_IO,

		.flags	= IORESOURCE_REG,

		.parent = &io_parent,

	},

	},

};

};
@@ -67,8 +59,7 @@ static struct resource power_supply_resources[] = { 
		.name	= "max8925-power",

		.name	= "max8925-power",

		.start	= MAX8925_CHG_IRQ1,

		.start	= MAX8925_CHG_IRQ1,

		.end	= MAX8925_CHG_IRQ1_MASK,

		.end	= MAX8925_CHG_IRQ1_MASK,

		.flags	= IORESOURCE_IO,

		.flags	= IORESOURCE_REG,

		.parent = &io_parent,

	},

	},

};

};
@@ -126,8 +117,7 @@ static struct mfd_cell onkey_devs[] = { 
{						\

{						\

	.start	= MAX8925_##_start,		\

	.start	= MAX8925_##_start,		\

	.end	= MAX8925_##_end,		\

	.end	= MAX8925_##_end,		\

	.flags	= IORESOURCE_IO,		\

	.flags	= IORESOURCE_REG,		\

	.parent = &io_parent,			\

}

}





static struct resource regulator_resources[] = {

static struct resource regulator_resources[] = {

drivers/video/backlight/max8925_bl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -112,7 +112,7 @@ static int __devinit max8925_backlight_probe(struct platform_device *pdev) 
	unsigned char value;

	unsigned char value;

	int ret;

	int ret;





	res = platform_get_resource(pdev, IORESOURCE_IO, 0);

	res = platform_get_resource(pdev, IORESOURCE_REG, 0);

	if (res == NULL) {

	if (res == NULL) {

		dev_err(&pdev->dev, "No I/O resource!\n");

		dev_err(&pdev->dev, "No I/O resource!\n");

		return -EINVAL;

		return -EINVAL;