From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 Nov 2013 00:37:40 +0000 (-0800)
Subject: Merge tag 'mfd-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd... 
X-Git-Tag: v3.13-rc1~66
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=db0b2d01163cc3050eb52a979541e0d16553be48

Merge tag 'mfd-3.13-1' of git://git./linux/kernel/git/sameo/mfd-next

Pull MFD updates from Samuel Ortiz:
 "For the 3.13 merge window we have a couple of new drivers for the AMS
  AS3722 PMIC and for STMicroelectronics STw481x PMIC.

  Although this is a smaller update than usual, we also have:

   - Device tree support for the max77693 driver

   - linux/of.h inclusion for all DT compatible MFD drivers, to avoid
     build breakage in the future

   - Support for Intel Wildcat Point-LP PCH through the lpc_ich driver

   - A small arizona update for new wm5110 DSP registers and a few fixes

   - A small palmas update as well, including an of_device table
     addition and a few minor fixes

   - Two small mfd-core changes, one including a memory leak fix for
     when mfd_add_device() fails

   - Our usual round of minor cleanups and janitorial fixes"

* tag 'mfd-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next: (63 commits)
  Documentation: mfd: Update s2mps11.txt
  mfd: pm8921: Potential NULL dereference in pm8921_remove()
  mfd: Fix memory leak in mfd_add_devices()
  mfd: Stop setting refcounting pointers in original mfd_cell arrays
  mfd: wm5110: Enable micd clamp functionality
  mfd: lpc_ich: Add Device IDs for Intel Wildcat Point-LP PCH
  mfd: max77693: Fix up bug of wrong interrupt number
  mfd: as3722: Don't export the regmap config
  mfd: twl6040: Remove obsolete cleanup for i2c clientdata
  mfd: tps65910: Remove warning during dt node parsing
  mfd: lpc_sch: Ignore resource conflicts when adding mfd cells
  mfd: ti_am335x_tscadc: Avoid possible deadlock of reg_lock
  mfd: syscon: Return -ENOSYS if CONFIG_MFD_SYSCON is not enabled
  mfd: Add support for ams AS3722 PMIC
  mfd: max77693: Include linux/of.h header
  mfd: tc3589x: Detect the precise version
  mfd: omap-usb: prepare/unprepare clock while enable/disable
  mfd: max77686: Include linux/of.h header
  mfd: max8907: Include linux/of.h header
  mfd: max8997: Include linux/of.h header
  ...
---

db0b2d01163cc3050eb52a979541e0d16553be48
diff --cc drivers/mfd/mfd-core.c
index adc8ea36e7c4,968775da638a..267649244737
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@@ -120,12 -114,12 +122,12 @@@ static int mfd_add_device(struct devic
  		ret = platform_device_add_data(pdev,
  					cell->platform_data, cell->pdata_size);
  		if (ret)
 -			goto fail_res;
 +			goto fail_alias;
  	}
  
- 	ret = mfd_platform_add_cell(pdev, cell);
+ 	ret = mfd_platform_add_cell(pdev, cell, usage_count);
  	if (ret)
 -		goto fail_res;
 +		goto fail_alias;
  
  	for (r = 0; r < cell->num_resources; r++) {
  		res[r].name = cell->resources[r].name;
diff --cc include/linux/mfd/ti_am335x_tscadc.h
index 08cce7f96ab9,7b68a061cd60..d498d98f0c2c
--- a/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@@ -131,16 -123,20 +131,21 @@@
  #define ADC_CLK			3000000
  #define TOTAL_STEPS		16
  #define TOTAL_CHANNELS		8
 +#define FIFO1_THRESHOLD		19
  
  /*
- * ADC runs at 3MHz, and it takes
- * 15 cycles to latch one data output.
- * Hence the idle time for ADC to
- * process one sample data would be
- * around 5 micro seconds.
- */
- #define IDLE_TIMEOUT 5 /* microsec */
+  * time in us for processing a single channel, calculated as follows:
+  *
+  * num cycles = open delay + (sample delay + conv time) * averaging
+  *
+  * num cycles: 152 + (1 + 13) * 16 = 376
+  *
+  * clock frequency: 26MHz / 8 = 3.25MHz
+  * clock period: 1 / 3.25MHz = 308ns
+  *
+  * processing time: 376 * 308ns = 116us
+  */
+ #define IDLE_TIMEOUT 116 /* microsec */
  
  #define TSCADC_CELLS		2