Skip to content

Commit

Permalink
ARM: imx+mx3: convert to mc13xxx MFD
Browse files Browse the repository at this point in the history 
Signed-off-by: David Jander <david@protonic.nl>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
  • Loading branch information
David Jander authored and Sascha Hauer committed Feb 10, 2011
1 parent 0be9a19 commit 5836372
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions arch/arm/mach-imx/mach-mx27_3ds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ static struct regulator_init_data vgen_init = {
.consumer_supplies = vgen_consumers,
};

static struct mc13783_regulator_init_data mx27_3ds_regulators[] = {
static struct mc13xxx_regulator_init_data mx27_3ds_regulators[] = {
{
.id = MC13783_REG_VMMC1,
.init_data = &vmmc1_init,
Expand All @@ -227,10 +227,10 @@ static struct mc13783_regulator_init_data mx27_3ds_regulators[] = {
};

/* MC13783 */
static struct mc13783_platform_data mc13783_pdata __initdata = {
static struct mc13xxx_platform_data mc13783_pdata __initdata = {
.regulators = mx27_3ds_regulators,
.num_regulators = ARRAY_SIZE(mx27_3ds_regulators),
.flags = MC13783_USE_REGULATOR,
.flags = MC13XXX_USE_REGULATOR,
};

/* SPI */
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/mach-imx/mach-pcm038.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ static struct regulator_init_data cam_data = {
.consumer_supplies = cam_consumers,
};

static struct mc13783_regulator_init_data pcm038_regulators[] = {
static struct mc13xxx_regulator_init_data pcm038_regulators[] = {
{
.id = MC13783_REG_VCAM,
.init_data = &cam_data,
Expand All @@ -262,11 +262,11 @@ static struct mc13783_regulator_init_data pcm038_regulators[] = {
},
};

static struct mc13783_platform_data pcm038_pmic = {
static struct mc13xxx_platform_data pcm038_pmic = {
.regulators = pcm038_regulators,
.num_regulators = ARRAY_SIZE(pcm038_regulators),
.flags = MC13783_USE_ADC | MC13783_USE_REGULATOR |
MC13783_USE_TOUCHSCREEN,
.flags = MC13XXX_USE_ADC | MC13XXX_USE_REGULATOR |
MC13XXX_USE_TOUCHSCREEN,
};

static struct spi_board_info pcm038_spi_board_info[] __initdata = {
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/mach-mx3/mach-mx31_3ds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ static struct regulator_init_data gpo_init = {
}
};

static struct mc13783_regulator_init_data mx31_3ds_regulators[] = {
static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = {
{
.id = MC13783_REG_PWGT1SPI, /* Power Gate for ARM core. */
.init_data = &pwgtx_init,
Expand All @@ -156,10 +156,10 @@ static struct mc13783_regulator_init_data mx31_3ds_regulators[] = {
};

/* MC13783 */
static struct mc13783_platform_data mc13783_pdata __initdata = {
static struct mc13xxx_platform_data mc13783_pdata __initdata = {
.regulators = mx31_3ds_regulators,
.num_regulators = ARRAY_SIZE(mx31_3ds_regulators),
.flags = MC13783_USE_REGULATOR | MC13783_USE_TOUCHSCREEN,
.flags = MC13XXX_USE_REGULATOR | MC13XXX_USE_TOUCHSCREEN
};

/* SPI */
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-mx3/mach-mx31lilly.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,8 @@ static const struct spi_imx_master spi1_pdata __initconst = {
.num_chipselect = ARRAY_SIZE(spi_internal_chipselect),
};

static struct mc13783_platform_data mc13783_pdata __initdata = {
.flags = MC13783_USE_RTC | MC13783_USE_TOUCHSCREEN,
static struct mc13xxx_platform_data mc13783_pdata __initdata = {
.flags = MC13XXX_USE_RTC | MC13XXX_USE_TOUCHSCREEN,
};

static struct spi_board_info mc13783_dev __initdata = {
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/mach-mx3/mach-mx31lite.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ static const struct spi_imx_master spi1_pdata __initconst = {
.num_chipselect = ARRAY_SIZE(spi_internal_chipselect),
};

static struct mc13783_platform_data mc13783_pdata __initdata = {
.flags = MC13783_USE_RTC |
MC13783_USE_REGULATOR,
static struct mc13xxx_platform_data mc13783_pdata __initdata = {
.flags = MC13XXX_USE_RTC |
MC13XXX_USE_REGULATOR,
};

static struct spi_board_info mc13783_spi_dev __initdata = {
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/mach-mx3/mach-mx31moboard.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ static struct regulator_init_data cam_vreg_data = {
.consumer_supplies = cam_consumers,
};

static struct mc13783_regulator_init_data moboard_regulators[] = {
static struct mc13xxx_regulator_init_data moboard_regulators[] = {
{
.id = MC13783_REG_VMMC1,
.init_data = &sdhc_vreg_data,
Expand Down Expand Up @@ -267,12 +267,12 @@ static struct mc13783_leds_platform_data moboard_leds = {
.tc2_period = MC13783_LED_PERIOD_10MS,
};

static struct mc13783_platform_data moboard_pmic = {
static struct mc13xxx_platform_data moboard_pmic = {
.regulators = moboard_regulators,
.num_regulators = ARRAY_SIZE(moboard_regulators),
.leds = &moboard_leds,
.flags = MC13783_USE_REGULATOR | MC13783_USE_RTC |
MC13783_USE_ADC | MC13783_USE_LED,
.flags = MC13XXX_USE_REGULATOR | MC13XXX_USE_RTC |
MC13XXX_USE_ADC | MC13XXX_USE_LED,
};

static struct spi_board_info moboard_spi_board_info[] __initdata = {
Expand Down

0 comments on commit 5836372

Please sign in to comment.