Merge tag 'mfd-3.14-1' of git://git.linaro.org/people/ljones/mfd

Pull MFD changes from Lee Jones:
 "New drivers
   - Samsung Maxim 14577; Micro USB, Regulator, IRQ Controller and
     Battery Charger
   - TI/National Semiconductor LP3943 I2C GPIO Expander and PWM
     Generator

  Existing driver adaptions
   - Expansion of Wolfson Arizona DSP and High-Pass filter controls
   - TI TWL6040 default Regmap support and Regcache addition/bypass
   - Some nice Smatch catch fixes
   - Conversion of TI OMAP-USB and TI TWL6030 to endian neutralness
   - ChromeOS EC timing (delay) adaptions and added dependency on OF
   - Many constifications of 'struct {mfd_cell,regmap_irq,et.al}'
   - Watchdog support added for NVIDIA AS3722
   - Convert functions to static in TI AM335x
   - Realigned previously defeated functionality in TI AM335x
   - IIO ADC-TSC concurrency dead-lock/timeout resolution
   - Addition of Power Management and Clock support for Samsung core
   - DEFINE_PCI_DEVICE_TABLE macro removal from MFD Subsystem
   - Greater use of irqdomain functionality in ST-E AB8500
   - Removal of 'include/linux/mfd/abx500/ab8500-gpio.h'
   - Wolfson WM831x PMIC Power Management changes s/poweroff/shutdown/
   - Device Tree documentation added for TI/Nat Semi LP3943
   - Version detection and voltage tables for TI TPS6586x PMIC devices
   - Simplification of Freescale MC13XXX (de-)initialisation routines
   - Clean-up and simplification of the Realtek parent driver
   - Added support for RTL8402 Realtek PCI-Express card reader
   - Resource leak fix for Maxim 77686
   - Possible suspend BUG() fix in OMAP USB TLL
   - Support for new Wolfson WM5110 Revision (D)
   - Testing of automatic assignment of of_node in mfd_add_device()
   - Reversion of the above when it started to cause issues
   - Remove legacy Platform Data from;
              TI TWL Core, Qualcomm SSBI and ST-E ABx500 Pinctrl
   - Clean-ups; tabbing issues, function name changes, 'drvdata = NULL'
              removal, unused uninitialised warning mitigation, error
              message clarity, removal of redundant/duplicate checks,
              licensing (GPL -> GPL2), coding consistency, duplicate
              function declaration, ret checks, commit corrections,
              redundant of_match_ptr() helper removal, spelling,
              #if-deffery removal and header guards name changes"

* tag 'mfd-3.14-1' of git://git.linaro.org/people/ljones/mfd: (78 commits)
  mfd: wm5110: Add register patch for rev D chip
  mfd: omap-usb-tll: Don't hold lock during pm_runtime_get/put_sync()
  gpio: lp3943: Remove redundant of_match_ptr helper
  mfd: sta2x11-mfd: Use named constants for pci_power_t values
  Documentation: mfd: Fix LDO index in s2mps11.txt
  mfd: Cleanup mfd-mcp-sa11x0.h header
  mfd: max8997: Use "IS_ENABLED(CONFIG_OF)" for DT code.
  mfd: twl6030: Fix endianness problem in IRQ handler
  mfd: sec-core: Add cells for S5M8767-clocks
  mfd: max14577: Remove redundant of_match_ptr helper
  mfd: twl6040: Fix sparse non static symbol warning
  mfd: Revert "mfd: Always assign of_node in mfd_add_device()"
  mfd: rtsx: Fix sparse non static symbol warning
  mfd: max77693: Set proper maximum register for MUIC regmap
  mfd: max77686: Fix regmap resource leak on driver remove
  mfd: Represent correct filenames in file headers
  mfd: rtsx: Add support for card reader rtl8402
  mfd: rtsx: Add set pull control macro and simplify rtl8411
  mfd: max8997: Enforce mfd_add_devices() return value check
  mfd: mc13xxx: Simplify probe() & remove()
  ...

3 files changed, 325 insertions, 0 deletions

diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index eece329d7872..7acab93d5a47 100644
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -90,6 +90,16 @@ config PWM_JZ4740
           To compile this driver as a module, choose M here: the module
           will be called pwm-jz4740.
 
+config PWM_LP3943
+        tristate "TI/National Semiconductor LP3943 PWM support"
+        depends on MFD_LP3943
+        help
+          Generic PWM framework driver for LP3943 which supports two PWM
+          channels.
+
+          To compile this driver as a module, choose M here: the module
+          will be called pwm-lp3943.
+
 config PWM_LPC32XX
         tristate "LPC32XX PWM support"
         depends on ARCH_LPC32XX
diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile
index 8b754e4dba4a..4abf337dcd02 100644
--- a/drivers/pwm/Makefile
+++ b/drivers/pwm/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_PWM_BFIN)		+= pwm-bfin.o
 obj-$(CONFIG_PWM_EP93XX)        += pwm-ep93xx.o
 obj-$(CONFIG_PWM_IMX)           += pwm-imx.o
 obj-$(CONFIG_PWM_JZ4740)        += pwm-jz4740.o
+obj-$(CONFIG_PWM_LP3943)        += pwm-lp3943.o
 obj-$(CONFIG_PWM_LPC32XX)       += pwm-lpc32xx.o
 obj-$(CONFIG_PWM_MXS)           += pwm-mxs.o
 obj-$(CONFIG_PWM_PCA9685)       += pwm-pca9685.o
diff --git a/drivers/pwm/pwm-lp3943.c b/drivers/pwm/pwm-lp3943.c
new file mode 100644
index 000000000000..8a843a04c224
--- /dev/null
+++ b/drivers/pwm/pwm-lp3943.c
@@ -0,0 +1,314 @@
+/*
+ * TI/National Semiconductor LP3943 PWM driver
+ *
+ * Copyright 2013 Texas Instruments
+ *
+ * Author: Milo Kim <milo.kim@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2.
+ */
+
+#include <linux/err.h>
+#include <linux/i2c.h>
+#include <linux/mfd/lp3943.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/pwm.h>
+#include <linux/slab.h>
+
+#define LP3943_MAX_DUTY                 255
+#define LP3943_MIN_PERIOD               6250
+#define LP3943_MAX_PERIOD               1600000
+
+struct lp3943_pwm {
+        struct pwm_chip chip;
+        struct lp3943 *lp3943;
+        struct lp3943_platform_data *pdata;
+};
+
+static inline struct lp3943_pwm *to_lp3943_pwm(struct pwm_chip *_chip)
+{
+        return container_of(_chip, struct lp3943_pwm, chip);
+}
+
+static struct lp3943_pwm_map *
+lp3943_pwm_request_map(struct lp3943_pwm *lp3943_pwm, int hwpwm)
+{
+        struct lp3943_platform_data *pdata = lp3943_pwm->pdata;
+        struct lp3943 *lp3943 = lp3943_pwm->lp3943;
+        struct lp3943_pwm_map *pwm_map;
+        int i, offset;
+
+        pwm_map = kzalloc(sizeof(*pwm_map), GFP_KERNEL);
+        if (!pwm_map)
+                return ERR_PTR(-ENOMEM);
+
+        pwm_map->output = pdata->pwms[hwpwm]->output;
+        pwm_map->num_outputs = pdata->pwms[hwpwm]->num_outputs;
+
+        for (i = 0; i < pwm_map->num_outputs; i++) {
+                offset = pwm_map->output[i];
+
+                /* Return an error if the pin is already assigned */
+                if (test_and_set_bit(offset, &lp3943->pin_used))
+                        return ERR_PTR(-EBUSY);
+        }
+
+        return pwm_map;
+}
+
+static int lp3943_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm)
+{
+        struct lp3943_pwm *lp3943_pwm = to_lp3943_pwm(chip);
+        struct lp3943_pwm_map *pwm_map;
+
+        pwm_map = lp3943_pwm_request_map(lp3943_pwm, pwm->hwpwm);
+        if (IS_ERR(pwm_map))
+                return PTR_ERR(pwm_map);
+
+        return pwm_set_chip_data(pwm, pwm_map);
+}
+
+static void lp3943_pwm_free_map(struct lp3943_pwm *lp3943_pwm,
+                                struct lp3943_pwm_map *pwm_map)
+{
+        struct lp3943 *lp3943 = lp3943_pwm->lp3943;
+        int i, offset;
+
+        for (i = 0; i < pwm_map->num_outputs; i++) {
+                offset = pwm_map->output[i];
+                clear_bit(offset, &lp3943->pin_used);
+        }
+
+        kfree(pwm_map);
+}
+
+static void lp3943_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
+{
+        struct lp3943_pwm *lp3943_pwm = to_lp3943_pwm(chip);
+        struct lp3943_pwm_map *pwm_map = pwm_get_chip_data(pwm);
+
+        lp3943_pwm_free_map(lp3943_pwm, pwm_map);
+}
+
+static int lp3943_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
+                             int duty_ns, int period_ns)
+{
+        struct lp3943_pwm *lp3943_pwm = to_lp3943_pwm(chip);
+        struct lp3943 *lp3943 = lp3943_pwm->lp3943;
+        u8 val, reg_duty, reg_prescale;
+        int err;
+
+        /*
+         * How to configure the LP3943 PWMs
+         *
+         * 1) Period = 6250 ~ 1600000
+         * 2) Prescale = period / 6250 -1
+         * 3) Duty = input duty
+         *
+         * Prescale and duty are register values
+         */
+
+        if (pwm->hwpwm == 0) {
+                reg_prescale = LP3943_REG_PRESCALE0;
+                reg_duty     = LP3943_REG_PWM0;
+        } else {
+                reg_prescale = LP3943_REG_PRESCALE1;
+                reg_duty     = LP3943_REG_PWM1;
+        }
+
+        period_ns = clamp(period_ns, LP3943_MIN_PERIOD, LP3943_MAX_PERIOD);
+        val       = (u8)(period_ns / LP3943_MIN_PERIOD - 1);
+
+        err = lp3943_write_byte(lp3943, reg_prescale, val);
+        if (err)
+                return err;
+
+        val = (u8)(duty_ns * LP3943_MAX_DUTY / period_ns);
+
+        return lp3943_write_byte(lp3943, reg_duty, val);
+}
+
+static int lp3943_pwm_set_mode(struct lp3943_pwm *lp3943_pwm,
+                               struct lp3943_pwm_map *pwm_map,
+                               u8 val)
+{
+        struct lp3943 *lp3943 = lp3943_pwm->lp3943;
+        const struct lp3943_reg_cfg *mux = lp3943->mux_cfg;
+        int i, index, err;
+
+        for (i = 0; i < pwm_map->num_outputs; i++) {
+                index = pwm_map->output[i];
+                err = lp3943_update_bits(lp3943, mux[index].reg,
+                                         mux[index].mask,
+                                         val << mux[index].shift);
+                if (err)
+                        return err;
+        }
+
+        return 0;
+}
+
+static int lp3943_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
+{
+        struct lp3943_pwm *lp3943_pwm = to_lp3943_pwm(chip);
+        struct lp3943_pwm_map *pwm_map = pwm_get_chip_data(pwm);
+        u8 val;
+
+        if (pwm->hwpwm == 0)
+                val = LP3943_DIM_PWM0;
+        else
+                val = LP3943_DIM_PWM1;
+
+        /*
+         * Each PWM generator is set to control any of outputs of LP3943.
+         * To enable/disable the PWM, these output pins should be configured.
+         */
+
+        return lp3943_pwm_set_mode(lp3943_pwm, pwm_map, val);
+}
+
+static void lp3943_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
+{
+        struct lp3943_pwm *lp3943_pwm = to_lp3943_pwm(chip);
+        struct lp3943_pwm_map *pwm_map = pwm_get_chip_data(pwm);
+
+        /*
+         * LP3943 outputs are open-drain, so the pin should be configured
+         * when the PWM is disabled.
+         */
+
+        lp3943_pwm_set_mode(lp3943_pwm, pwm_map, LP3943_GPIO_OUT_HIGH);
+}
+
+static const struct pwm_ops lp3943_pwm_ops = {
+        .request        = lp3943_pwm_request,
+        .free           = lp3943_pwm_free,
+        .config         = lp3943_pwm_config,
+        .enable         = lp3943_pwm_enable,
+        .disable        = lp3943_pwm_disable,
+        .owner          = THIS_MODULE,
+};
+
+static int lp3943_pwm_parse_dt(struct device *dev,
+                               struct lp3943_pwm *lp3943_pwm)
+{
+        static const char * const name[] = { "ti,pwm0", "ti,pwm1", };
+        struct device_node *node = dev->of_node;
+        struct lp3943_platform_data *pdata;
+        struct lp3943_pwm_map *pwm_map;
+        enum lp3943_pwm_output *output;
+        int i, err, proplen, count = 0;
+        u32 num_outputs;
+
+        if (!node)
+                return -EINVAL;
+
+        pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
+        if (!pdata)
+                return -ENOMEM;
+
+        /*
+         * Read the output map configuration from the device tree.
+         * Each of the two PWM generators can drive zero or more outputs.
+         */
+
+        for (i = 0; i < LP3943_NUM_PWMS; i++) {
+                if (!of_get_property(node, name[i], &proplen))
+                        continue;
+
+                num_outputs = proplen / sizeof(u32);
+                if (num_outputs == 0)
+                        continue;
+
+                output = devm_kzalloc(dev, sizeof(*output) * num_outputs,
+                                      GFP_KERNEL);
+                if (!output)
+                        return -ENOMEM;
+
+                err = of_property_read_u32_array(node, name[i], output,
+                                                 num_outputs);
+                if (err)
+                        return err;
+
+                pwm_map = devm_kzalloc(dev, sizeof(*pwm_map), GFP_KERNEL);
+                if (!pwm_map)
+                        return -ENOMEM;
+
+                pwm_map->output = output;
+                pwm_map->num_outputs = num_outputs;
+                pdata->pwms[i] = pwm_map;
+
+                count++;
+        }
+
+        if (count == 0)
+                return -ENODATA;
+
+        lp3943_pwm->pdata = pdata;
+        return 0;
+}
+
+static int lp3943_pwm_probe(struct platform_device *pdev)
+{
+        struct lp3943 *lp3943 = dev_get_drvdata(pdev->dev.parent);
+        struct lp3943_pwm *lp3943_pwm;
+        int ret;
+
+        lp3943_pwm = devm_kzalloc(&pdev->dev, sizeof(*lp3943_pwm), GFP_KERNEL);
+        if (!lp3943_pwm)
+                return -ENOMEM;
+
+        lp3943_pwm->pdata = lp3943->pdata;
+        if (!lp3943_pwm->pdata) {
+                if (IS_ENABLED(CONFIG_OF))
+                        ret = lp3943_pwm_parse_dt(&pdev->dev, lp3943_pwm);
+                else
+                        ret = -ENODEV;
+
+                if (ret)
+                        return ret;
+        }
+
+        lp3943_pwm->lp3943 = lp3943;
+        lp3943_pwm->chip.dev = &pdev->dev;
+        lp3943_pwm->chip.ops = &lp3943_pwm_ops;
+        lp3943_pwm->chip.npwm = LP3943_NUM_PWMS;
+
+        platform_set_drvdata(pdev, lp3943_pwm);
+
+        return pwmchip_add(&lp3943_pwm->chip);
+}
+
+static int lp3943_pwm_remove(struct platform_device *pdev)
+{
+        struct lp3943_pwm *lp3943_pwm = platform_get_drvdata(pdev);
+
+        return pwmchip_remove(&lp3943_pwm->chip);
+}
+
+#ifdef CONFIG_OF
+static const struct of_device_id lp3943_pwm_of_match[] = {
+        { .compatible = "ti,lp3943-pwm", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, lp3943_pwm_of_match);
+#endif
+
+static struct platform_driver lp3943_pwm_driver = {
+        .probe = lp3943_pwm_probe,
+        .remove = lp3943_pwm_remove,
+        .driver = {
+                .name = "lp3943-pwm",
+                .owner = THIS_MODULE,
+                .of_match_table = of_match_ptr(lp3943_pwm_of_match),
+        },
+};
+module_platform_driver(lp3943_pwm_driver);
+
+MODULE_DESCRIPTION("LP3943 PWM driver");
+MODULE_ALIAS("platform:lp3943-pwm");
+MODULE_AUTHOR("Milo Kim");
+MODULE_LICENSE("GPL");