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

Commit 9f1912c4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (57 commits)
  regulator: Fix 88pm8607.c printk format warning
  input: Add support for Qualcomm PMIC8XXX power key
  input: Add Qualcomm pm8xxx keypad controller driver
  mfd: Add omap-usbhs runtime PM support
  mfd: Fix ASIC3 SD Host Controller Configuration size
  mfd: Fix omap_usbhs_alloc_children error handling
  mfd: Fix omap usbhs crash when rmmoding ehci or ohci
  mfd: Add ASIC3 LED support
  leds: Add ASIC3 LED support
  mfd: Update twl4030-code maintainer e-mail address
  mfd: Correct the name and bitmask for ab8500-gpadc BTempPullUp
  mfd: Add manual ab8500-gpadc batt temp activation for AB8500 3.0
  mfd: Provide ab8500-core enumerators for chip cuts
  mfd: Check twl4030-power remove script error condition after i2cwrite
  mfd: Fix twl6030 irq definitions
  mfd: Add phoenix lite (twl6025) support to twl6030
  mfd: Avoid to use constraint name in 88pm860x regulator driver
  mfd: Remove checking on max8925 regulator[0]
  mfd: Remove unused parameter from 88pm860x API
  mfd: Avoid to allocate 88pm860x static platform data
  ...
parents 4c171acc 09969108

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -931,6 +931,8 @@ F: drivers/mmc/host/msm_sdcc.h 
F:	drivers/tty/serial/msm_serial.h

F:	drivers/tty/serial/msm_serial.c

F:	drivers/platform/msm/

F:	drivers/*/pm8???-*

F:	include/linux/mfd/pm8xxx/

T:	git git://codeaurora.org/quic/kernel/davidb/linux-msm.git

S:	Maintained

arch/arm/mach-omap2/board-rx51-peripherals.c

+1 −1
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ static struct twl4030_resconfig twl4030_rconfig[] __initdata = { 
	{ .resource = RES_RESET, .devgroup = -1,

	  .type = 1, .type2 = -1, .remap_off = -1, .remap_sleep = -1

	},

	{ .resource = RES_Main_Ref, .devgroup = -1,

	{ .resource = RES_MAIN_REF, .devgroup = -1,

	  .type = 1, .type2 = -1, .remap_off = -1, .remap_sleep = -1

	},

	{ 0, 0},

drivers/dma/timb_dma.c

+1 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/io.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/mfd/core.h>

#include <linux/slab.h>



#include <linux/timb_dma.h>
@@ -685,7 +684,7 @@ static irqreturn_t td_irq(int irq, void *devid) 


static int __devinit td_probe(struct platform_device *pdev)

{

	struct timb_dma_platform_data *pdata = mfd_get_data(pdev);

	struct timb_dma_platform_data *pdata = pdev->dev.platform_data;

	struct timb_dma *td;

	struct resource *iomem;

	int irq;

drivers/gpio/janz-ttl.c

+1 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/interrupt.h>

#include <linux/delay.h>

#include <linux/platform_device.h>

#include <linux/mfd/core.h>

#include <linux/io.h>

#include <linux/gpio.h>

#include <linux/slab.h>
@@ -150,7 +149,7 @@ static int __devinit ttl_probe(struct platform_device *pdev) 
	struct resource *res;

	int ret;



	pdata = mfd_get_data(pdev);

	pdata = pdev->dev.platform_data;

	if (!pdata) {

		dev_err(dev, "no platform data\n");

		ret = -ENXIO;

drivers/gpio/rdc321x-gpio.c

+1 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/pci.h>

#include <linux/gpio.h>

#include <linux/mfd/rdc321x.h>

#include <linux/mfd/core.h>

#include <linux/slab.h>



struct rdc321x_gpio {
@@ -136,7 +135,7 @@ static int __devinit rdc321x_gpio_probe(struct platform_device *pdev) 
	struct rdc321x_gpio *rdc321x_gpio_dev;

	struct rdc321x_gpio_pdata *pdata;



	pdata = mfd_get_data(pdev);

	pdata = pdev->dev.platform_data;

	if (!pdata) {

		dev_err(&pdev->dev, "no platform data supplied\n");

		return -ENODEV;