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

Commit a0a4194c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 

* 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits)
  mfd: Fix missing abx500 header file updates
  mfd: Add missing <linux/io.h> include to intel_msic
  x86, mrst: add platform support for MSIC MFD driver
  mfd: Expose TurnOnStatus in ab8500 sysfs
  mfd: Remove support for early drop ab8500 chip
  mfd: Add support for ab8500 v3.3
  mfd: Add ab8500 interrupt disable hook
  mfd: Convert db8500-prcmu panic() into pr_crit()
  mfd: Refactor db8500-prcmu request_clock() function
  mfd: Rename db8500-prcmu init function
  mfd: Fix db5500-prcmu defines
  mfd: db8500-prcmu voltage domain consumers additions
  mfd: db8500-prcmu reset code retrieval
  mfd: db8500-prcmu tweak for modem wakeup
  mfd: Add db8500-pcmu watchdog accessor functions for watchdog
  mfd: hwacc power state db8500-prcmu accessor
  mfd: Add db8500-prcmu accessors for PLL and SGA clock
  mfd: Move to the new db500 PRCMU API
  mfd: Create a common interface for dbx500 PRCMU drivers
  mfd: Initialize DB8500 PRCMU regs
  ...

Fix up trivial conflicts in
	arch/arm/mach-imx/mach-mx31moboard.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-u300/include/mach/irqs.h
	drivers/mfd/wm831x-spi.c
parents cf022350 b958f7a7

arch/arm/mach-imx/mach-mx27_3ds.c

+1 −2
Original line number Diff line number Diff line
@@ -293,8 +293,7 @@ static struct mc13xxx_platform_data mc13783_pdata = { 
		.num_regulators = ARRAY_SIZE(mx27_3ds_regulators),



	},

	.flags  = MC13783_USE_REGULATOR | MC13783_USE_TOUCHSCREEN |

	MC13783_USE_RTC,

	.flags  = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC,

};



/* SPI */

arch/arm/mach-imx/mach-mx31_3ds.c

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static struct mc13xxx_platform_data mc13783_pdata = { 
		.regulators = mx31_3ds_regulators,

		.num_regulators = ARRAY_SIZE(mx31_3ds_regulators),

	},

	.flags  = MC13783_USE_REGULATOR | MC13783_USE_TOUCHSCREEN,

	.flags  = MC13XXX_USE_TOUCHSCREEN,

};



/* SPI */

arch/arm/mach-imx/mach-mx31lite.c

+1 −2
Original line number Diff line number Diff line
@@ -112,8 +112,7 @@ static const struct spi_imx_master spi1_pdata __initconst = { 
};



static struct mc13xxx_platform_data mc13783_pdata __initdata = {

	.flags  = MC13XXX_USE_RTC |

		  MC13XXX_USE_REGULATOR,

	.flags = MC13XXX_USE_RTC,

};



static struct spi_board_info mc13783_spi_dev __initdata = {

arch/arm/mach-imx/mach-mx31moboard.c

+11 −4
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/clk.h>

#include <linux/io.h>

#include <linux/err.h>

#include <linux/input.h>



#include <linux/usb/otg.h>

#include <linux/usb/ulpi.h>
@@ -225,7 +226,7 @@ static struct mc13xxx_regulator_init_data moboard_regulators[] = { 
	},

};



static struct mc13783_led_platform_data moboard_led[] = {

static struct mc13xxx_led_platform_data moboard_led[] = {

	{

		.id = MC13783_LED_R1,

		.name = "coreboard-led-4:red",
@@ -258,7 +259,7 @@ static struct mc13783_led_platform_data moboard_led[] = { 
	},

};



static struct mc13783_leds_platform_data moboard_leds = {

static struct mc13xxx_leds_platform_data moboard_leds = {

	.num_leds = ARRAY_SIZE(moboard_led),

	.led = moboard_led,

	.flags = MC13783_LED_SLEWLIMTC,
@@ -267,14 +268,20 @@ static struct mc13783_leds_platform_data moboard_leds = { 
	.tc2_period = MC13783_LED_PERIOD_10MS,

};



static struct mc13xxx_buttons_platform_data moboard_buttons = {

	.b1on_flags = MC13783_BUTTON_DBNC_750MS | MC13783_BUTTON_ENABLE |

			MC13783_BUTTON_POL_INVERT,

	.b1on_key = KEY_POWER,

};



static struct mc13xxx_platform_data moboard_pmic = {

	.regulators = {

		.regulators = moboard_regulators,

		.num_regulators = ARRAY_SIZE(moboard_regulators),

	},

	.leds = &moboard_leds,

	.flags = MC13XXX_USE_REGULATOR | MC13XXX_USE_RTC |

		MC13XXX_USE_ADC | MC13XXX_USE_LED,

	.buttons = &moboard_buttons,

	.flags = MC13XXX_USE_RTC | MC13XXX_USE_ADC,

};



static struct spi_board_info moboard_spi_board_info[] __initdata = {

arch/arm/mach-imx/mach-pcm038.c

+1 −2
Original line number Diff line number Diff line
@@ -268,8 +268,7 @@ 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_TOUCHSCREEN,

};



static struct spi_board_info pcm038_spi_board_info[] __initdata = {