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

Commit 6bf3b0dc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.infradead.org/users/sameo/mfd-2.6:
  mfd: Fix omap-usb-host build failure
  mfd: Make omap-usb-host TLL mode work again
  mfd: Set MAX8997 irq pointer
  mfd: Fix initialisation of tps65910 interrupts
  mfd: Check for twl4030-madc NULL pointer
  mfd: Copy the device pointer to the twl4030-madc structure
  mfd: Rename wm8350 static gpio_set_debounce()
  mfd: Fix value of WM8994_CONFIGURE_GPIO
parents b0e7031a 417e206b

drivers/mfd/max8997.c

+5 −0
Original line number Diff line number Diff line
@@ -135,10 +135,13 @@ static int max8997_i2c_probe(struct i2c_client *i2c, 
	max8997->dev = &i2c->dev;

	max8997->i2c = i2c;

	max8997->type = id->driver_data;

	max8997->irq = i2c->irq;



	if (!pdata)

		goto err;



	max8997->irq_base = pdata->irq_base;

	max8997->ono = pdata->ono;

	max8997->wakeup = pdata->wakeup;



	mutex_init(&max8997->iolock);
@@ -152,6 +155,8 @@ static int max8997_i2c_probe(struct i2c_client *i2c, 


	pm_runtime_set_active(max8997->dev);



	max8997_irq_init(max8997);



	mfd_add_devices(max8997->dev, -1, max8997_devs,

			ARRAY_SIZE(max8997_devs),

			NULL, 0);

drivers/mfd/omap-usb-host.c

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/types.h>

#include <linux/slab.h>

#include <linux/delay.h>
@@ -676,7 +677,6 @@ static void usbhs_omap_tll_init(struct device *dev, u8 tll_channel_count) 
				| OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF

				| OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE);



			reg |= (1 << (i + 1));

		} else

			continue;

drivers/mfd/tps65910-irq.c

+2 −0
Original line number Diff line number Diff line
@@ -178,8 +178,10 @@ int tps65910_irq_init(struct tps65910 *tps65910, int irq, 
	switch (tps65910_chip_id(tps65910)) {

	case TPS65910:

		tps65910->irq_num = TPS65910_NUM_IRQ;

		break;

	case TPS65911:

		tps65910->irq_num = TPS65911_NUM_IRQ;

		break;

	}



	/* Register with genirq */

drivers/mfd/twl4030-madc.c

+4 −1
Original line number Diff line number Diff line
@@ -510,8 +510,9 @@ int twl4030_madc_conversion(struct twl4030_madc_request *req) 
	u8 ch_msb, ch_lsb;

	int ret;



	if (!req)

	if (!req || !twl4030_madc)

		return -EINVAL;



	mutex_lock(&twl4030_madc->lock);

	if (req->method < TWL4030_MADC_RT || req->method > TWL4030_MADC_SW2) {

		ret = -EINVAL;
@@ -706,6 +707,8 @@ static int __devinit twl4030_madc_probe(struct platform_device *pdev) 
	if (!madc)

		return -ENOMEM;



	madc->dev = &pdev->dev;



	/*

	 * Phoenix provides 2 interrupt lines. The first one is connected to

	 * the OMAP. The other one can be connected to the other processor such

drivers/mfd/wm8350-gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int gpio_set_dir(struct wm8350 *wm8350, int gpio, int dir) 
	return ret;

}



static int gpio_set_debounce(struct wm8350 *wm8350, int gpio, int db)

static int wm8350_gpio_set_debounce(struct wm8350 *wm8350, int gpio, int db)

{

	if (db == WM8350_GPIO_DEBOUNCE_ON)

		return wm8350_set_bits(wm8350, WM8350_GPIO_DEBOUNCE,
@@ -210,7 +210,7 @@ int wm8350_gpio_config(struct wm8350 *wm8350, int gpio, int dir, int func, 
		goto err;

	if (gpio_set_polarity(wm8350, gpio, pol))

		goto err;

	if (gpio_set_debounce(wm8350, gpio, debounce))

	if (wm8350_gpio_set_debounce(wm8350, gpio, debounce))

		goto err;

	if (gpio_set_dir(wm8350, gpio, dir))

		goto err;