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

Pull MFD updates from Lee Jones:
 "Changes to existing drivers:
   - increase DT coverage: arizona, mc13xxx, stmpe-i2c, syscon,
     sun6i-prcm
   - regmap use of and/or clean-up: tps65090, twl6040
   - basic renaming: max14577
   - use new cpufreq helpers: db8500-prcmu
   - increase regulator support: stmpe, arizona, wm5102
   - reduce legacy GPIO overhead: stmpe
   - provide necessary remove path: bcm590xx
   - expand sysfs presence: kempld
   - move driver specific code out to drivers: rtc-s5m, arizona
   - clk handling: twl6040
   - use managed (devm_*) resources: ipaq-micro
   - clean-up/remove unused/duplicated code: tps65218, sec, pm8921,
     abx500-core, db8500-prcmu, menelaus
   - build/boot/sematic bug fixes: rtsx_usb, stmpe, bcm590xx, abx500,
     mc13xxx, rdc321x-southbridge, mfd-core, sec, max14577, syscon,
     cros_ec_spi
   - constify stuff: sm501, tps65910, tps6507x, tps6586x, max77686,
     max8997, kempld, max77693, max8907, rtsx_usb, db8500-prcmu,
     max8998, wm8400, sec, lp3943, max14577, as3711, omap-usb-host,
     ipaq-micro

  Support for new devices:
   - add support for max77836 into max14577
   - add support for tps658640 into tps6586x
   - add support for cros-ec-i2c-tunnel into cros_ec
   - add new driver for rtsx_usb_sdmmc and rtsx_usb_ms
   - add new driver for axp20x
   - add new driver for sun6i-prcm
   - add new driver for ipaq-micro"

* tag 'mfd-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (77 commits)
  mfd: wm5102: Correct default for LDO Control 2 register
  mfd: menelaus: Use module_i2c_driver
  mfd: tps65218: Terminate of match table
  mfd: db8500-prcmu: Remove check for CONFIG_DBX500_PRCMU_DEBUG
  mfd: ti-keystone-devctrl: Add bindings for device state control
  mfd: palmas: Format the header file
  mfd: abx500-core: Remove unused function abx500_dump_all_banks()
  mfd: arizona: Correct addresses of always-on trigger registers
  mfd: max14577: Cast to architecture agnostic data type
  i2c: ChromeOS EC tunnel driver
  mfd: cros_ec: Sync to the latest cros_ec_commands.h from EC sources
  mfd: cros_ec: spi: Increase cros_ec_spi deadline from 5ms to 100ms
  mfd: cros_ec: spi: Make the cros_ec_spi timeout more reliable
  mfd: cros_ec: spi: Add mutex to cros_ec_spi
  mfd: cros_ec: spi: Calculate delay between transfers correctly
  mfd: arizona: Correct error message for addition of main IRQ chip
  mfd: wm8997: Add registers for high power mode
  mfd: arizona: Add MICVDD to mapped regulators
  mfd: ipaq-micro: Make mfd_cell array const
  mfd: ipaq-micro: Use devm_ioremap_resource()
  ...

1 files changed, 70 insertions, 5 deletions

diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c
index 476af93543f6..8ec2d6a1dbe1 100644
--- a/drivers/rtc/rtc-s5m.c
+++ b/drivers/rtc/rtc-s5m.c
@@ -40,6 +40,7 @@
 
 struct s5m_rtc_info {
         struct device *dev;
+        struct i2c_client *i2c;
         struct sec_pmic_dev *s5m87xx;
         struct regmap *regmap;
         struct rtc_device *rtc_dev;
@@ -49,6 +50,20 @@ struct s5m_rtc_info {
         bool wtsr_smpl;
 };
 
+static const struct regmap_config s5m_rtc_regmap_config = {
+        .reg_bits = 8,
+        .val_bits = 8,
+
+        .max_register = SEC_RTC_REG_MAX,
+};
+
+static const struct regmap_config s2mps14_rtc_regmap_config = {
+        .reg_bits = 8,
+        .val_bits = 8,
+
+        .max_register = S2MPS_RTC_REG_MAX,
+};
+
 static void s5m8767_data_to_tm(u8 *data, struct rtc_time *tm,
                                int rtc_24hr_mode)
 {
@@ -554,6 +569,7 @@ static int s5m_rtc_probe(struct platform_device *pdev)
         struct sec_pmic_dev *s5m87xx = dev_get_drvdata(pdev->dev.parent);
         struct sec_platform_data *pdata = s5m87xx->pdata;
         struct s5m_rtc_info *info;
+        const struct regmap_config *regmap_cfg;
         int ret;
 
         if (!pdata) {
@@ -565,9 +581,37 @@ static int s5m_rtc_probe(struct platform_device *pdev)
         if (!info)
                 return -ENOMEM;
 
+        switch (pdata->device_type) {
+        case S2MPS14X:
+                regmap_cfg = &s2mps14_rtc_regmap_config;
+                break;
+        case S5M8763X:
+                regmap_cfg = &s5m_rtc_regmap_config;
+                break;
+        case S5M8767X:
+                regmap_cfg = &s5m_rtc_regmap_config;
+                break;
+        default:
+                dev_err(&pdev->dev, "Device type is not supported by RTC driver\n");
+                return -ENODEV;
+        }
+
+        info->i2c = i2c_new_dummy(s5m87xx->i2c->adapter, RTC_I2C_ADDR);
+        if (!info->i2c) {
+                dev_err(&pdev->dev, "Failed to allocate I2C for RTC\n");
+                return -ENODEV;
+        }
+
+        info->regmap = devm_regmap_init_i2c(info->i2c, regmap_cfg);
+        if (IS_ERR(info->regmap)) {
+                ret = PTR_ERR(info->regmap);
+                dev_err(&pdev->dev, "Failed to allocate RTC register map: %d\n",
+                                ret);
+                goto err;
+        }
+
         info->dev = &pdev->dev;
         info->s5m87xx = s5m87xx;
-        info->regmap = s5m87xx->regmap_rtc;
         info->device_type = s5m87xx->device_type;
         info->wtsr_smpl = s5m87xx->wtsr_smpl;
 
@@ -585,7 +629,7 @@ static int s5m_rtc_probe(struct platform_device *pdev)
         default:
                 ret = -EINVAL;
                 dev_err(&pdev->dev, "Unsupported device type: %d\n", ret);
-                return ret;
+                goto err;
         }
 
         platform_set_drvdata(pdev, info);
@@ -602,15 +646,24 @@ static int s5m_rtc_probe(struct platform_device *pdev)
         info->rtc_dev = devm_rtc_device_register(&pdev->dev, "s5m-rtc",
                                                  &s5m_rtc_ops, THIS_MODULE);
 
-        if (IS_ERR(info->rtc_dev))
-                return PTR_ERR(info->rtc_dev);
+        if (IS_ERR(info->rtc_dev)) {
+                ret = PTR_ERR(info->rtc_dev);
+                goto err;
+        }
 
         ret = devm_request_threaded_irq(&pdev->dev, info->irq, NULL,
                                         s5m_rtc_alarm_irq, 0, "rtc-alarm0",
                                         info);
-        if (ret < 0)
+        if (ret < 0) {
                 dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n",
                         info->irq, ret);
+                goto err;
+        }
+
+        return 0;
+
+err:
+        i2c_unregister_device(info->i2c);
 
         return ret;
 }
@@ -639,6 +692,17 @@ static void s5m_rtc_shutdown(struct platform_device *pdev)
         s5m_rtc_enable_smpl(info, false);
 }
 
+static int s5m_rtc_remove(struct platform_device *pdev)
+{
+        struct s5m_rtc_info *info = platform_get_drvdata(pdev);
+
+        /* Perform also all shutdown steps when removing */
+        s5m_rtc_shutdown(pdev);
+        i2c_unregister_device(info->i2c);
+
+        return 0;
+}
+
 #ifdef CONFIG_PM_SLEEP
 static int s5m_rtc_resume(struct device *dev)
 {
@@ -676,6 +740,7 @@ static struct platform_driver s5m_rtc_driver = {
                 .pm     = &s5m_rtc_pm_ops,
         },
         .probe          = s5m_rtc_probe,
+        .remove         = s5m_rtc_remove,
         .shutdown       = s5m_rtc_shutdown,
         .id_table       = s5m_rtc_id,
 };