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

Commit 325a86b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MFD fixes from Samuel Ortiz:
 "This is the first pull request for MFD fixes for 3.8

  We have some build failure fixes (twl4030, vexpress, abx500 and
  tps65910), some actual runtime oops and lockup fixes (rtsx, da9052),
  and some more hypothetical NULL pointers dereferences fixes for
  pcf50633 and max776xx.

  Then we also have additional rtsx fixes for a correct switch output
  voltage and clock divider correctness for rtl8411 (rtsx driver), and
  irqdomain fix for db8550-prcmu, and some more cosmetic fixes for
  arizona and wm5102."

* tag 'mfd-for-linus-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: rtsx: Fix oops when rtsx_pci_sdmmc is not probed
  mfd: wm5102: Fix definition of WM5102_MAX_REGISTER
  mfd: twl4030: Don't warn about uninitialized return code
  mfd: da9052/53 lockup fix
  mfd: rtsx: Add clock divider hook
  mmc: rtsx: Call MFD hook to switch output voltage
  mfd: rtsx: Add output voltage switch hook
  mfd: Fix compile errors and warnings when !CONFIG_AB8500_BM
  mfd: vexpress: Export global functions to fix build error
  mfd: arizona: Check errors from regcache_sync()
  mfd: tc3589x: Use simple irqdomain
  mfd: pcf50633: Init pcf->dev before using it
  mfd: max77693: Init max77693->dev before using it
  mfd: max77686: Init max77686->dev before using it
  mfd: db8500-prcmu: Fix irqdomain usage
  mfd: tps65910: Select REGMAP_IRQ in Kconfig to fix build error
  mfd: arizona: Disable control interface reporting for WM5102 and WM5110
parents 22f83798 2d1484f5

drivers/mfd/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ config MFD_TPS65910 
	depends on I2C=y && GPIOLIB

	select MFD_CORE

	select REGMAP_I2C

	select REGMAP_IRQ

	select IRQ_DOMAIN

	help

	  if you say yes here you get support for the TPS65910 series of

drivers/mfd/ab8500-core.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/mfd/core.h>

#include <linux/mfd/abx500.h>

#include <linux/mfd/abx500/ab8500.h>

#include <linux/mfd/abx500/ab8500-bm.h>

#include <linux/mfd/dbx500-prcmu.h>

#include <linux/regulator/ab8500.h>

#include <linux/of.h>

drivers/mfd/arizona-core.c

+6 −1
Original line number Diff line number Diff line
@@ -239,7 +239,12 @@ static int arizona_runtime_resume(struct device *dev) 
		return ret;

	}



	regcache_sync(arizona->regmap);

	ret = regcache_sync(arizona->regmap);

	if (ret != 0) {

		dev_err(arizona->dev, "Failed to restore register cache\n");

		regulator_disable(arizona->dcvdd);

		return ret;

	}



	return 0;

}

drivers/mfd/arizona-irq.c

+2 −16
Original line number Diff line number Diff line
@@ -176,30 +176,16 @@ int arizona_irq_init(struct arizona *arizona) 
		aod = &wm5102_aod;

		irq = &wm5102_irq;



		switch (arizona->rev) {

		case 0:

		case 1:

		ctrlif_error = false;

		break;

		default:

			break;

		}

		break;

#endif

#ifdef CONFIG_MFD_WM5110

	case WM5110:

		aod = &wm5110_aod;

		irq = &wm5110_irq;



		switch (arizona->rev) {

		case 0:

		case 1:

		ctrlif_error = false;

		break;

		default:

			break;

		}

		break;

#endif

	default:

		BUG_ON("Unknown Arizona class device" == NULL);

drivers/mfd/da9052-i2c.c

+61 −0
Original line number Diff line number Diff line
@@ -27,6 +27,66 @@ 
#include <linux/of_device.h>

#endif



/* I2C safe register check */

static inline bool i2c_safe_reg(unsigned char reg)

{

	switch (reg) {

	case DA9052_STATUS_A_REG:

	case DA9052_STATUS_B_REG:

	case DA9052_STATUS_C_REG:

	case DA9052_STATUS_D_REG:

	case DA9052_ADC_RES_L_REG:

	case DA9052_ADC_RES_H_REG:

	case DA9052_VDD_RES_REG:

	case DA9052_ICHG_AV_REG:

	case DA9052_TBAT_RES_REG:

	case DA9052_ADCIN4_RES_REG:

	case DA9052_ADCIN5_RES_REG:

	case DA9052_ADCIN6_RES_REG:

	case DA9052_TJUNC_RES_REG:

	case DA9052_TSI_X_MSB_REG:

	case DA9052_TSI_Y_MSB_REG:

	case DA9052_TSI_LSB_REG:

	case DA9052_TSI_Z_MSB_REG:

		return true;

	default:

		return false;

	}

}



/*

 * There is an issue with DA9052 and DA9053_AA/BA/BB PMIC where the PMIC

 * gets lockup up or fails to respond following a system reset.

 * This fix is to follow any read or write with a dummy read to a safe

 * register.

 */

int da9052_i2c_fix(struct da9052 *da9052, unsigned char reg)

{

	int val;



	switch (da9052->chip_id) {

	case DA9052:

	case DA9053_AA:

	case DA9053_BA:

	case DA9053_BB:

		/* A dummy read to a safe register address. */

	if (!i2c_safe_reg(reg))

			return regmap_read(da9052->regmap,

					   DA9052_PARK_REGISTER,

					   &val);

		break;

	default:

		/*

		 * For other chips parking of I2C register

		 * to a safe place is not required.

		 */

		break;

	}



	return 0;

}

EXPORT_SYMBOL(da9052_i2c_fix);



static int da9052_i2c_enable_multiwrite(struct da9052 *da9052)

{

	int reg_val, ret;
@@ -83,6 +143,7 @@ static int da9052_i2c_probe(struct i2c_client *client, 


	da9052->dev = &client->dev;

	da9052->chip_irq = client->irq;

	da9052->fix_io = da9052_i2c_fix;



	i2c_set_clientdata(client, da9052);