From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Sep 2013 03:14:19 +0000 (-0700)
Subject: Merge tag 'mfd-3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd... 
X-Git-Tag: v3.12-rc1~100
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8de4651abe61c6b6a94a70a57ef163020fed05ee;p=profile%2Fcommon%2Fkernel-common.git

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

Pull MFD (multi-function device) updates from Samuel Ortiz:
 "For the 3.12 merge window we have one new driver for the DA9063 PMIC
  from Dialog Semiconductor.

  Besides that driver we also have:

   - Device tree support for the s2mps11 driver

   - More devm_* conversion for the pm8921, max89xx, menelaus, tps65010,
     wl1273 and pcf50633-adc drivers.

   - A conversion to threaded IRQ and IRQ domain for the twl6030 driver.

   - A fairly big update for the rtsx driver: Better power saving
     support, better vendor settings handling, and a few fixes.

   - Support for a couple more boards (COMe-bHL6 and COMe-cTH6) for the
     Kontron driver.

   - A conversion to the dev_get_platdata() API for all MFD drivers.

   - A removal of non-DT (legacy) support for the twl6040 driver.

   - A few fixes and additions (Mic detect level) to the wm5110 register
     tables.

   - Regmap support for the davinci_voicecodec driver.

   - The usual bunch of minor cleanups and janitorial fixes"

* tag 'mfd-3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next: (81 commits)
  mfd: ucb1x00-core: Rewrite ucb1x00_add_dev()
  mfd: ab8500-debugfs: Apply a check for -ENOMEM after allocating memory for event name
  mfd: ab8500-debugfs: Apply a check for -ENOMEM after allocating memory for sysfs
  mfd: timberdale: Use module_pci_driver
  mfd: timberdale: Remove redundant break
  mfd: timberdale: Staticize local variables
  mfd: ab8500-debugfs: Staticize local variables
  mfd: db8500-prcmu: Staticize clk_mgt
  mfd: db8500-prcmu: Use ANSI function declaration
  mfd: omap-usb-host: Staticize usbhs_driver_name
  mfd: 88pm805: Fix potential NULL pdata dereference
  mfd: 88pm800: Fix potential NULL pdata dereference
  mfd: twl6040: Use regmap for register cache
  mfd: davinci_voicecodec: Provide a regmap for register I/O
  mfd: davinci_voicecodec: Remove unused read and write functions
  mmc: memstick: rtsx: Modify copyright comments
  mmc: rtsx: Clear SD_CLK toggle enable bit if switching voltage fail
  mfd: mmc: rtsx: Change default tx phase
  mfd: pcf50633-adc: Use devm_*() functions
  mfd: rtsx: Copyright modifications
  ...
---

8de4651abe61c6b6a94a70a57ef163020fed05ee
diff --cc include/linux/mfd/samsung/s2mps11.h
index d0d52ea,179e10c..b3ddf98
--- a/include/linux/mfd/samsung/s2mps11.h
+++ b/include/linux/mfd/samsung/s2mps11.h
@@@ -191,18 -188,6 +188,17 @@@ enum s2mps11_regulators 
  #define S2MPS11_BUCK_N_VOLTAGES (S2MPS11_BUCK_VSEL_MASK + 1)
  #define S2MPS11_RAMP_DELAY	25000		/* uV/us */
  
 +
 +#define S2MPS11_BUCK2_RAMP_SHIFT	6
 +#define S2MPS11_BUCK34_RAMP_SHIFT	4
 +#define S2MPS11_BUCK5_RAMP_SHIFT	6
 +#define S2MPS11_BUCK16_RAMP_SHIFT	4
 +#define S2MPS11_BUCK7810_RAMP_SHIFT	2
 +#define S2MPS11_BUCK9_RAMP_SHIFT	0
 +#define S2MPS11_BUCK2_RAMP_EN_SHIFT	3
 +#define S2MPS11_BUCK3_RAMP_EN_SHIFT	2
 +#define S2MPS11_BUCK4_RAMP_EN_SHIFT	1
 +#define S2MPS11_BUCK6_RAMP_EN_SHIFT	0
  #define S2MPS11_PMIC_EN_SHIFT	6
- #define S2MPS11_REGULATOR_MAX (S2MPS11_REG_MAX - 3)
  
  #endif /*  __LINUX_MFD_S2MPS11_H */
diff --cc include/linux/mfd/ti_am335x_tscadc.h
index db1791b,71bb41c..25f2c61
--- a/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@@ -113,15 -113,7 +113,14 @@@
  #define CNTRLREG_8WIRE		CNTRLREG_AFE_CTRL(3)
  #define CNTRLREG_TSCENB		BIT(7)
  
 +/* FIFO READ Register */
 +#define FIFOREAD_DATA_MASK (0xfff << 0)
 +#define FIFOREAD_CHNLID_MASK (0xf << 16)
 +
 +/* Sequencer Status */
 +#define SEQ_STATUS BIT(5)
 +
  #define ADC_CLK			3000000
- #define	MAX_CLK_DIV		7
  #define TOTAL_STEPS		16
  #define TOTAL_CHANNELS		8