Merge tag 'mfd-for-linus-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

Pull MFD updates from Lee Jones:
 "Changes to existing drivers:
  - DT clean-ups in da9055-core, max14577, rn5t618, arizona, hi6421, stmpe, twl4030
  - Export symbols for use in modules in max14577
  - Plenty of static code analysis/Coccinelle fixes throughout the SS
  - Regmap clean-ups in arizona, wm5102, wm5110, da9052, tps65217, rk808
  - Remove unused/duplicate code in da9052, 88pm860x, ti_ssp, lpc_sch, arizona
  - Bug fixes in ti_am335x_tscadc, da9052, ti_am335x_tscadc, rtsx_pcr
  - IRQ fixups in arizona, stmpe, max14577
  - Regulator related changes in axp20x
  - Pass DMA coherency information from parent => child in MFD core
  - Rename DT document files for consistency
  - Add ACPI support to the MFD core
  - Add Andreas Werner to MAINTAINERS for MEN F21BMC

 New drivers/supported devices:
  - New driver for MEN 14F021P00 Board Management Controller
  - New driver for Ricoh RN5T618 PMIC
  - New driver for Rockchip RK808
  - New driver for HiSilicon Hi6421 PMIC
  - New driver for Qualcomm SPMI PMICs
  - Add support for Intel Braswell in lpc_ich
  - Add support for Intel 9 Series PCH in lpc_ich
  - Add support for Intel Quark ILB in lpc_sch"

[ Delayed to after the poweer/reset pull due to Kconfig problems with
  recursive Kconfig select/depends-on chains.   - Linus ]

* tag 'mfd-for-linus-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (79 commits)
  mfd: cros_ec: wait for completion of commands that return IN_PROGRESS
  i2c: i2c-cros-ec-tunnel: Set retries to 3
  mfd: cros_ec: move locking into cros_ec_cmd_xfer
  mfd: cros_ec: stop calling ->cmd_xfer() directly
  mfd: cros_ec: Delay for 50ms when we see EC_CMD_REBOOT_EC
  MAINTAINERS: Adds Andreas Werner to maintainers list for MEN F21BMC
  mfd: arizona: Correct mask to allow setting micbias external cap
  mfd: Add ACPI support
  Revert "mfd: wm5102: Manually apply register patch"
  mfd: ti_am335x_tscadc: Update logic in CTRL register for 5-wire TS
  mfd: dt-bindings: atmel-gpbr: Rename doc file to conform to naming convention
  mfd: dt-bindings: qcom-pm8xxx: Rename doc file to conform to naming convention
  mfd: Inherit coherent_dma_mask from parent device
  mfd: Document DT bindings for Qualcomm SPMI PMICs
  mfd: Add support for Qualcomm SPMI PMICs
  mfd: dt-bindings: pm8xxx: Add new compatible string
  mfd: axp209x: Drop the parent supplies field
  mfd: twl4030-power: Use 'ti,system-power-controller' as alternative way to support system power off
  mfd: dt-bindings: twl4030-power: Use the standard property to mark power control
  mfd: syscon: Add Atmel GPBR DT bindings documention
  ...

1 files changed, 60 insertions, 1 deletions

diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
index d0e578fd7053..fc17d56581b2 100644
--- a/include/linux/mfd/max77693-private.h
+++ b/include/linux/mfd/max77693-private.h
@@ -46,7 +46,7 @@ enum max77693_pmic_reg {
         MAX77693_LED_REG_VOUT_FLASH2                    = 0x0C,
         MAX77693_LED_REG_FLASH_INT                      = 0x0E,
         MAX77693_LED_REG_FLASH_INT_MASK                 = 0x0F,
-        MAX77693_LED_REG_FLASH_INT_STATUS               = 0x10,
+        MAX77693_LED_REG_FLASH_STATUS                   = 0x10,
 
         MAX77693_PMIC_REG_PMIC_ID1                      = 0x20,
         MAX77693_PMIC_REG_PMIC_ID2                      = 0x21,
@@ -85,6 +85,65 @@ enum max77693_pmic_reg {
         MAX77693_PMIC_REG_END,
 };
 
+/* MAX77693 ITORCH register */
+#define TORCH_IOUT1_SHIFT       0
+#define TORCH_IOUT2_SHIFT       4
+#define TORCH_IOUT_MIN          15625
+#define TORCH_IOUT_MAX          250000
+#define TORCH_IOUT_STEP         15625
+
+/* MAX77693 IFLASH1 and IFLASH2 registers */
+#define FLASH_IOUT_MIN          15625
+#define FLASH_IOUT_MAX_1LED     1000000
+#define FLASH_IOUT_MAX_2LEDS    625000
+#define FLASH_IOUT_STEP         15625
+
+/* MAX77693 TORCH_TIMER register */
+#define TORCH_TMR_NO_TIMER      0x40
+#define TORCH_TIMEOUT_MIN       262000
+#define TORCH_TIMEOUT_MAX       15728000
+
+/* MAX77693 FLASH_TIMER register */
+#define FLASH_TMR_LEVEL         0x80
+#define FLASH_TIMEOUT_MIN       62500
+#define FLASH_TIMEOUT_MAX       1000000
+#define FLASH_TIMEOUT_STEP      62500
+
+/* MAX77693 FLASH_EN register */
+#define FLASH_EN_OFF            0x0
+#define FLASH_EN_FLASH          0x1
+#define FLASH_EN_TORCH          0x2
+#define FLASH_EN_ON             0x3
+#define FLASH_EN_SHIFT(x)       (6 - ((x) - 1) * 2)
+#define TORCH_EN_SHIFT(x)       (2 - ((x) - 1) * 2)
+
+/* MAX77693 MAX_FLASH1 register */
+#define MAX_FLASH1_MAX_FL_EN    0x80
+#define MAX_FLASH1_VSYS_MIN     2400
+#define MAX_FLASH1_VSYS_MAX     3400
+#define MAX_FLASH1_VSYS_STEP    33
+
+/* MAX77693 VOUT_CNTL register */
+#define FLASH_BOOST_FIXED       0x04
+#define FLASH_BOOST_LEDNUM_2    0x80
+
+/* MAX77693 VOUT_FLASH1 register */
+#define FLASH_VOUT_MIN          3300
+#define FLASH_VOUT_MAX          5500
+#define FLASH_VOUT_STEP         25
+#define FLASH_VOUT_RMIN         0x0c
+
+/* MAX77693 FLASH_STATUS register */
+#define FLASH_STATUS_FLASH_ON   BIT(3)
+#define FLASH_STATUS_TORCH_ON   BIT(2)
+
+/* MAX77693 FLASH_INT register */
+#define FLASH_INT_FLED2_OPEN    BIT(0)
+#define FLASH_INT_FLED2_SHORT   BIT(1)
+#define FLASH_INT_FLED1_OPEN    BIT(2)
+#define FLASH_INT_FLED1_SHORT   BIT(3)
+#define FLASH_INT_OVER_CURRENT  BIT(4)
+
 /* MAX77693 CHG_CNFG_00 register */
 #define CHG_CNFG_00_CHG_MASK            0x1
 #define CHG_CNFG_00_BUCK_MASK           0x4