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

Commit 0703c680 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Include linux/io.h to jz4740-adc
  mfd: Use request_threaded_irq for twl4030-irq instead of irq_set_chained_handler
  mfd: Base interrupt for twl4030-irq must be one-shot
  mfd: Handle tps65910 clear-mask correctly
  mfd: add #ifdef CONFIG_DEBUG_FS guard for ab8500_debug_resources
  mfd: Fix twl-core oops while calling twl_i2c_* for unbound driver
  mfd: include linux/module.h for ab5500-debugfs
  mfd: Update wm8994 active device checks for WM1811
  mfd: Set tps6586x bits if new value is different from the old one
  mfd: Set da903x bits if new value is different from the old one
  mfd: Set adp5520 bits if new value is different from the old one
  mfd: Add missed free_irq in da903x_remove
parents e6f67b8c fa860403

drivers/mfd/ab5500-debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Debugfs support for the AB5500 MFD driver

 */



#include <linux/export.h>

#include <linux/module.h>

#include <linux/debugfs.h>

#include <linux/seq_file.h>

#include <linux/mfd/ab5500/ab5500.h>

drivers/mfd/ab8500-core.c

+2 −0
Original line number Diff line number Diff line
@@ -620,6 +620,7 @@ static struct resource __devinitdata ab8500_fg_resources[] = { 


static struct resource __devinitdata ab8500_chargalg_resources[] = {};



#ifdef CONFIG_DEBUG_FS

static struct resource __devinitdata ab8500_debug_resources[] = {

	{

		.name	= "IRQ_FIRST",
@@ -634,6 +635,7 @@ static struct resource __devinitdata ab8500_debug_resources[] = { 
		.flags	= IORESOURCE_IRQ,

	},

};

#endif



static struct resource __devinitdata ab8500_usb_resources[] = {

	{

drivers/mfd/adp5520.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ int adp5520_set_bits(struct device *dev, int reg, uint8_t bit_mask) 


	ret = __adp5520_read(chip->client, reg, &reg_val);



	if (!ret && ((reg_val & bit_mask) == 0)) {

	if (!ret && ((reg_val & bit_mask) != bit_mask)) {

		reg_val |= bit_mask;

		ret = __adp5520_write(chip->client, reg, reg_val);

	}

drivers/mfd/da903x.c

+2 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ int da903x_set_bits(struct device *dev, int reg, uint8_t bit_mask) 
	if (ret)

		goto out;



	if ((reg_val & bit_mask) == 0) {

	if ((reg_val & bit_mask) != bit_mask) {

		reg_val |= bit_mask;

		ret = __da903x_write(chip->client, reg, reg_val);

	}
@@ -549,6 +549,7 @@ static int __devexit da903x_remove(struct i2c_client *client) 
	struct da903x_chip *chip = i2c_get_clientdata(client);



	da903x_remove_subdevs(chip);

	free_irq(client->irq, chip);

	kfree(chip);

	return 0;

}

drivers/mfd/jz4740-adc.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 */



#include <linux/err.h>

#include <linux/io.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/kernel.h>