25 files changed, 244 insertions, 100 deletions

diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index cafb1dcadc48..9d984f2a8ba7 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -142,7 +142,10 @@ static void tiadc_step_config(struct iio_dev *indio_dev)
                         stepconfig |= STEPCONFIG_MODE_SWCNT;
 
                 tiadc_writel(adc_dev, REG_STEPCONFIG(steps),
-                                stepconfig | STEPCONFIG_INP(chan));
+                                stepconfig | STEPCONFIG_INP(chan) |
+                                STEPCONFIG_INM_ADCREFM |
+                                STEPCONFIG_RFP_VREFP |
+                                STEPCONFIG_RFM_VREFN);
 
                 if (adc_dev->open_delay[i] > STEPDELAY_OPEN_MASK) {
                         dev_warn(dev, "chan %d open delay truncating to 0x3FFFF\n",
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 8c5dfdce4326..f461460a2aeb 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -102,6 +102,7 @@ config MFD_AAT2870_CORE
 config MFD_AT91_USART
         tristate "AT91 USART Driver"
         select MFD_CORE
+        depends on ARCH_AT91 || COMPILE_TEST
         help
           Select this to get support for AT91 USART IP. This is a wrapper
           over at91-usart-serial driver and usart-spi-driver. Only one function
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index 30d09d177171..11ab17f64c64 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -261,7 +261,7 @@ static int get_register_interruptible(struct ab8500 *ab8500, u8 bank,
         mutex_unlock(&ab8500->lock);
         dev_vdbg(ab8500->dev, "rd: addr %#x => data %#x\n", addr, ret);
 
-        return ret;
+        return (ret < 0) ? ret : 0;
 }
 
 static int ab8500_get_register(struct device *dev, u8 bank,
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index e1450a56fc07..3c97f2c0fdfe 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -641,9 +641,9 @@ static const struct mfd_cell axp221_cells[] = {
 
 static const struct mfd_cell axp223_cells[] = {
         {
-                .name                   = "axp221-pek",
-                .num_resources          = ARRAY_SIZE(axp22x_pek_resources),
-                .resources              = axp22x_pek_resources,
+                .name           = "axp221-pek",
+                .num_resources  = ARRAY_SIZE(axp22x_pek_resources),
+                .resources      = axp22x_pek_resources,
         }, {
                 .name           = "axp22x-adc",
                 .of_compatible  = "x-powers,axp221-adc",
@@ -651,7 +651,7 @@ static const struct mfd_cell axp223_cells[] = {
                 .name           = "axp20x-battery-power-supply",
                 .of_compatible  = "x-powers,axp221-battery-power-supply",
         }, {
-                .name                   = "axp20x-regulator",
+                .name           = "axp20x-regulator",
         }, {
                 .name           = "axp20x-ac-power-supply",
                 .of_compatible  = "x-powers,axp221-ac-power-supply",
@@ -667,9 +667,9 @@ static const struct mfd_cell axp223_cells[] = {
 
 static const struct mfd_cell axp152_cells[] = {
         {
-                .name                   = "axp20x-pek",
-                .num_resources          = ARRAY_SIZE(axp152_pek_resources),
-                .resources              = axp152_pek_resources,
+                .name           = "axp20x-pek",
+                .num_resources  = ARRAY_SIZE(axp152_pek_resources),
+                .resources      = axp152_pek_resources,
         },
 };
 
@@ -698,87 +698,101 @@ static const struct resource axp288_charger_resources[] = {
 
 static const struct mfd_cell axp288_cells[] = {
         {
-                .name = "axp288_adc",
-                .num_resources = ARRAY_SIZE(axp288_adc_resources),
-                .resources = axp288_adc_resources,
-        },
-        {
-                .name = "axp288_extcon",
-                .num_resources = ARRAY_SIZE(axp288_extcon_resources),
-                .resources = axp288_extcon_resources,
-        },
-        {
-                .name = "axp288_charger",
-                .num_resources = ARRAY_SIZE(axp288_charger_resources),
-                .resources = axp288_charger_resources,
-        },
-        {
-                .name = "axp288_fuel_gauge",
-                .num_resources = ARRAY_SIZE(axp288_fuel_gauge_resources),
-                .resources = axp288_fuel_gauge_resources,
-        },
-        {
-                .name = "axp221-pek",
-                .num_resources = ARRAY_SIZE(axp288_power_button_resources),
-                .resources = axp288_power_button_resources,
-        },
-        {
-                .name = "axp288_pmic_acpi",
+                .name           = "axp288_adc",
+                .num_resources  = ARRAY_SIZE(axp288_adc_resources),
+                .resources      = axp288_adc_resources,
+        }, {
+                .name           = "axp288_extcon",
+                .num_resources  = ARRAY_SIZE(axp288_extcon_resources),
+                .resources      = axp288_extcon_resources,
+        }, {
+                .name           = "axp288_charger",
+                .num_resources  = ARRAY_SIZE(axp288_charger_resources),
+                .resources      = axp288_charger_resources,
+        }, {
+                .name           = "axp288_fuel_gauge",
+                .num_resources  = ARRAY_SIZE(axp288_fuel_gauge_resources),
+                .resources      = axp288_fuel_gauge_resources,
+        }, {
+                .name           = "axp221-pek",
+                .num_resources  = ARRAY_SIZE(axp288_power_button_resources),
+                .resources      = axp288_power_button_resources,
+        }, {
+                .name           = "axp288_pmic_acpi",
         },
 };
 
 static const struct mfd_cell axp803_cells[] = {
         {
-                .name                   = "axp221-pek",
-                .num_resources          = ARRAY_SIZE(axp803_pek_resources),
-                .resources              = axp803_pek_resources,
+                .name           = "axp221-pek",
+                .num_resources  = ARRAY_SIZE(axp803_pek_resources),
+                .resources      = axp803_pek_resources,
+        }, {
+                .name           = "axp20x-gpio",
+                .of_compatible  = "x-powers,axp813-gpio",
+        }, {
+                .name           = "axp813-adc",
+                .of_compatible  = "x-powers,axp813-adc",
+        }, {
+                .name           = "axp20x-battery-power-supply",
+                .of_compatible  = "x-powers,axp813-battery-power-supply",
+        }, {
+                .name           = "axp20x-ac-power-supply",
+                .of_compatible  = "x-powers,axp813-ac-power-supply",
+                .num_resources  = ARRAY_SIZE(axp20x_ac_power_supply_resources),
+                .resources      = axp20x_ac_power_supply_resources,
         },
-        {       .name                   = "axp20x-regulator" },
+        {       .name           = "axp20x-regulator" },
 };
 
 static const struct mfd_cell axp806_self_working_cells[] = {
         {
-                .name                   = "axp221-pek",
-                .num_resources          = ARRAY_SIZE(axp806_pek_resources),
-                .resources              = axp806_pek_resources,
+                .name           = "axp221-pek",
+                .num_resources  = ARRAY_SIZE(axp806_pek_resources),
+                .resources      = axp806_pek_resources,
         },
-        {       .name                   = "axp20x-regulator" },
+        {       .name           = "axp20x-regulator" },
 };
 
 static const struct mfd_cell axp806_cells[] = {
         {
-                .id                     = 2,
-                .name                   = "axp20x-regulator",
+                .id             = 2,
+                .name           = "axp20x-regulator",
         },
 };
 
 static const struct mfd_cell axp809_cells[] = {
         {
-                .name                   = "axp221-pek",
-                .num_resources          = ARRAY_SIZE(axp809_pek_resources),
-                .resources              = axp809_pek_resources,
+                .name           = "axp221-pek",
+                .num_resources  = ARRAY_SIZE(axp809_pek_resources),
+                .resources      = axp809_pek_resources,
         }, {
-                .id                     = 1,
-                .name                   = "axp20x-regulator",
+                .id             = 1,
+                .name           = "axp20x-regulator",
         },
 };
 
 static const struct mfd_cell axp813_cells[] = {
         {
-                .name                   = "axp221-pek",
-                .num_resources          = ARRAY_SIZE(axp803_pek_resources),
-                .resources              = axp803_pek_resources,
+                .name           = "axp221-pek",
+                .num_resources  = ARRAY_SIZE(axp803_pek_resources),
+                .resources      = axp803_pek_resources,
         }, {
-                .name                   = "axp20x-regulator",
+                .name           = "axp20x-regulator",
         }, {
-                .name                   = "axp20x-gpio",
-                .of_compatible          = "x-powers,axp813-gpio",
+                .name           = "axp20x-gpio",
+                .of_compatible  = "x-powers,axp813-gpio",
         }, {
-                .name                   = "axp813-adc",
-                .of_compatible          = "x-powers,axp813-adc",
+                .name           = "axp813-adc",
+                .of_compatible  = "x-powers,axp813-adc",
         }, {
                 .name           = "axp20x-battery-power-supply",
                 .of_compatible  = "x-powers,axp813-battery-power-supply",
+        }, {
+                .name           = "axp20x-ac-power-supply",
+                .of_compatible  = "x-powers,axp813-ac-power-supply",
+                .num_resources  = ARRAY_SIZE(axp20x_ac_power_supply_resources),
+                .resources      = axp20x_ac_power_supply_resources,
         },
 };
 
diff --git a/drivers/mfd/bd9571mwv.c b/drivers/mfd/bd9571mwv.c
index 503979c81dae..fab3cdc27ed6 100644
--- a/drivers/mfd/bd9571mwv.c
+++ b/drivers/mfd/bd9571mwv.c
@@ -59,6 +59,7 @@ static const struct regmap_access_table bd9571mwv_writable_table = {
 };
 
 static const struct regmap_range bd9571mwv_volatile_yes_ranges[] = {
+        regmap_reg_range(BD9571MWV_DVFS_MONIVDAC, BD9571MWV_DVFS_MONIVDAC),
         regmap_reg_range(BD9571MWV_GPIO_IN, BD9571MWV_GPIO_IN),
         regmap_reg_range(BD9571MWV_GPIO_INT, BD9571MWV_GPIO_INT),
         regmap_reg_range(BD9571MWV_INT_INTREQ, BD9571MWV_INT_INTREQ),
diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index b99a194ce5a4..2d0fee488c5a 100644
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -499,6 +499,7 @@ static int ec_device_remove(struct platform_device *pdev)
 
         cros_ec_debugfs_remove(ec);
 
+        mfd_remove_devices(ec->dev);
         cdev_del(&ec->cdev);
         device_unregister(&ec->class_dev);
         return 0;
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 5970b8def548..aec20e1c7d3d 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2584,7 +2584,7 @@ static struct irq_chip prcmu_irq_chip = {
         .irq_unmask     = prcmu_irq_unmask,
 };
 
-static __init char *fw_project_name(u32 project)
+static char *fw_project_name(u32 project)
 {
         switch (project) {
         case PRCMU_FW_PROJECT_U8500:
@@ -2732,7 +2732,7 @@ void __init db8500_prcmu_early_init(u32 phy_base, u32 size)
         INIT_WORK(&mb0_transfer.mask_work, prcmu_mask_work);
 }
 
-static void __init init_prcm_registers(void)
+static void init_prcm_registers(void)
 {
         u32 val;
 
diff --git a/drivers/mfd/exynos-lpass.c b/drivers/mfd/exynos-lpass.c
index ca829f85672f..2713de989f05 100644
--- a/drivers/mfd/exynos-lpass.c
+++ b/drivers/mfd/exynos-lpass.c
@@ -82,11 +82,13 @@ static void exynos_lpass_enable(struct exynos_lpass *lpass)
                      LPASS_INTR_SFR | LPASS_INTR_DMA | LPASS_INTR_I2S);
 
         regmap_write(lpass->top, SFR_LPASS_INTR_CPU_MASK,
-                     LPASS_INTR_SFR | LPASS_INTR_DMA | LPASS_INTR_I2S);
+                     LPASS_INTR_SFR | LPASS_INTR_DMA | LPASS_INTR_I2S |
+                     LPASS_INTR_UART);
 
         exynos_lpass_core_sw_reset(lpass, LPASS_I2S_SW_RESET);
         exynos_lpass_core_sw_reset(lpass, LPASS_DMA_SW_RESET);
         exynos_lpass_core_sw_reset(lpass, LPASS_MEM_SW_RESET);
+        exynos_lpass_core_sw_reset(lpass, LPASS_UART_SW_RESET);
 }
 
 static void exynos_lpass_disable(struct exynos_lpass *lpass)
diff --git a/drivers/mfd/madera-core.c b/drivers/mfd/madera-core.c
index 440030cecbbd..2a77988d0462 100644
--- a/drivers/mfd/madera-core.c
+++ b/drivers/mfd/madera-core.c
@@ -15,6 +15,7 @@
 #include <linux/gpio.h>
 #include <linux/mfd/core.h>
 #include <linux/module.h>
+#include <linux/mutex.h>
 #include <linux/notifier.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
@@ -155,7 +156,7 @@ static int madera_wait_for_boot(struct madera *madera)
                 usleep_range(MADERA_BOOT_POLL_INTERVAL_USEC / 2,
                              MADERA_BOOT_POLL_INTERVAL_USEC);
                 regmap_read(madera->regmap, MADERA_IRQ1_RAW_STATUS_1, &val);
-        };
+        }
 
         if (!(val & MADERA_BOOT_DONE_STS1)) {
                 dev_err(madera->dev, "Polling BOOT_DONE_STS timed out\n");
@@ -357,6 +358,8 @@ int madera_dev_init(struct madera *madera)
 
         dev_set_drvdata(madera->dev, madera);
         BLOCKING_INIT_NOTIFIER_HEAD(&madera->notifier);
+        mutex_init(&madera->dapm_ptr_lock);
+
         madera_set_micbias_info(madera);
 
         /*
diff --git a/drivers/mfd/max77620.c b/drivers/mfd/max77620.c
index d8217366ed36..d8ddd1a6f304 100644
--- a/drivers/mfd/max77620.c
+++ b/drivers/mfd/max77620.c
@@ -280,7 +280,7 @@ static int max77620_config_fps(struct max77620_chip *chip,
 
         for (fps_id = 0; fps_id < MAX77620_FPS_COUNT; fps_id++) {
                 sprintf(fps_name, "fps%d", fps_id);
-                if (!strcmp(fps_np->name, fps_name))
+                if (of_node_name_eq(fps_np, fps_name))
                         break;
         }
 
diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
index f475e848252f..d0bf50e3568d 100644
--- a/drivers/mfd/mc13xxx-core.c
+++ b/drivers/mfd/mc13xxx-core.c
@@ -274,7 +274,9 @@ int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx, unsigned int mode,
 
         mc13xxx->adcflags |= MC13XXX_ADC_WORKING;
 
-        mc13xxx_reg_read(mc13xxx, MC13XXX_ADC0, &old_adc0);
+        ret = mc13xxx_reg_read(mc13xxx, MC13XXX_ADC0, &old_adc0);
+        if (ret)
+                goto out;
 
         adc0 = MC13XXX_ADC0_ADINC1 | MC13XXX_ADC0_ADINC2 |
                MC13XXX_ADC0_CHRGRAWDIV;
diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
index 77b64bd64df3..ab24e176ef44 100644
--- a/drivers/mfd/mt6397-core.c
+++ b/drivers/mfd/mt6397-core.c
@@ -329,8 +329,7 @@ static int mt6397_probe(struct platform_device *pdev)
 
         default:
                 dev_err(&pdev->dev, "unsupported chip: %d\n", id);
-                ret = -ENODEV;
-                break;
+                return -ENODEV;
         }
 
         if (ret) {
diff --git a/drivers/mfd/qcom_rpm.c b/drivers/mfd/qcom_rpm.c
index 52fafea06067..8d420c37b2a6 100644
--- a/drivers/mfd/qcom_rpm.c
+++ b/drivers/mfd/qcom_rpm.c
@@ -638,6 +638,10 @@ static int qcom_rpm_probe(struct platform_device *pdev)
                 return -EFAULT;
         }
 
+        writel(fw_version[0], RPM_CTRL_REG(rpm, 0));
+        writel(fw_version[1], RPM_CTRL_REG(rpm, 1));
+        writel(fw_version[2], RPM_CTRL_REG(rpm, 2));
+
         dev_info(&pdev->dev, "RPM firmware %u.%u.%u\n", fw_version[0],
                                                         fw_version[1],
                                                         fw_version[2]);
diff --git a/drivers/mfd/rave-sp.c b/drivers/mfd/rave-sp.c
index 2a8369657e38..26c7b63e008a 100644
--- a/drivers/mfd/rave-sp.c
+++ b/drivers/mfd/rave-sp.c
@@ -109,7 +109,7 @@ struct rave_sp_reply {
 /**
  * struct rave_sp_checksum - Variant specific checksum implementation details
  *
- * @length:     Caculated checksum length
+ * @length:     Calculated checksum length
  * @subroutine: Utilized checksum algorithm implementation
  */
 struct rave_sp_checksum {
diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 566caca4efd8..7569a4be0608 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -1302,17 +1302,17 @@ static void stmpe_of_probe(struct stmpe_platform_data *pdata,
         pdata->autosleep = (pdata->autosleep_timeout) ? true : false;
 
         for_each_child_of_node(np, child) {
-                if (!strcmp(child->name, "stmpe_gpio")) {
+                if (of_node_name_eq(child, "stmpe_gpio")) {
                         pdata->blocks |= STMPE_BLOCK_GPIO;
-                } else if (!strcmp(child->name, "stmpe_keypad")) {
+                } else if (of_node_name_eq(child, "stmpe_keypad")) {
                         pdata->blocks |= STMPE_BLOCK_KEYPAD;
-                } else if (!strcmp(child->name, "stmpe_touchscreen")) {
+                } else if (of_node_name_eq(child, "stmpe_touchscreen")) {
                         pdata->blocks |= STMPE_BLOCK_TOUCHSCREEN;
-                } else if (!strcmp(child->name, "stmpe_adc")) {
+                } else if (of_node_name_eq(child, "stmpe_adc")) {
                         pdata->blocks |= STMPE_BLOCK_ADC;
-                } else if (!strcmp(child->name, "stmpe_pwm")) {
+                } else if (of_node_name_eq(child, "stmpe_pwm")) {
                         pdata->blocks |= STMPE_BLOCK_PWM;
-                } else if (!strcmp(child->name, "stmpe_rotator")) {
+                } else if (of_node_name_eq(child, "stmpe_rotator")) {
                         pdata->blocks |= STMPE_BLOCK_ROTATOR;
                 }
         }
diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index c2d47d78705b..fd111296b959 100644
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -264,8 +264,9 @@ static	int ti_tscadc_probe(struct platform_device *pdev)
                 cell->pdata_size = sizeof(tscadc);
         }
 
-        err = mfd_add_devices(&pdev->dev, pdev->id, tscadc->cells,
-                        tscadc->used_cells, NULL, 0, NULL);
+        err = mfd_add_devices(&pdev->dev, PLATFORM_DEVID_AUTO,
+                              tscadc->cells, tscadc->used_cells, NULL,
+                              0, NULL);
         if (err < 0)
                 goto err_disable_clk;
 
diff --git a/drivers/mfd/tps65218.c b/drivers/mfd/tps65218.c
index 910f569ff77c..8bcdecf494d0 100644
--- a/drivers/mfd/tps65218.c
+++ b/drivers/mfd/tps65218.c
@@ -235,9 +235,9 @@ static int tps65218_probe(struct i2c_client *client,
 
         mutex_init(&tps->tps_lock);
 
-        ret = regmap_add_irq_chip(tps->regmap, tps->irq,
-                        IRQF_ONESHOT, 0, &tps65218_irq_chip,
-                        &tps->irq_data);
+        ret = devm_regmap_add_irq_chip(&client->dev, tps->regmap, tps->irq,
+                                       IRQF_ONESHOT, 0, &tps65218_irq_chip,
+                                       &tps->irq_data);
         if (ret < 0)
                 return ret;
 
@@ -253,26 +253,9 @@ static int tps65218_probe(struct i2c_client *client,
                               ARRAY_SIZE(tps65218_cells), NULL, 0,
                               regmap_irq_get_domain(tps->irq_data));
 
-        if (ret < 0)
-                goto err_irq;
-
-        return 0;
-
-err_irq:
-        regmap_del_irq_chip(tps->irq, tps->irq_data);
-
         return ret;
 }
 
-static int tps65218_remove(struct i2c_client *client)
-{
-        struct tps65218 *tps = i2c_get_clientdata(client);
-
-        regmap_del_irq_chip(tps->irq, tps->irq_data);
-
-        return 0;
-}
-
 static const struct i2c_device_id tps65218_id_table[] = {
         { "tps65218", TPS65218 },
         { },
@@ -285,7 +268,6 @@ static struct i2c_driver tps65218_driver = {
                 .of_match_table = of_tps65218_match_table,
         },
         .probe          = tps65218_probe,
-        .remove         = tps65218_remove,
         .id_table       = tps65218_id_table,
 };
 
diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index b89379782741..9c7925ca13cf 100644
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -592,6 +592,29 @@ static int tps6586x_i2c_remove(struct i2c_client *client)
         return 0;
 }
 
+static int __maybe_unused tps6586x_i2c_suspend(struct device *dev)
+{
+        struct tps6586x *tps6586x = dev_get_drvdata(dev);
+
+        if (tps6586x->client->irq)
+                disable_irq(tps6586x->client->irq);
+
+        return 0;
+}
+
+static int __maybe_unused tps6586x_i2c_resume(struct device *dev)
+{
+        struct tps6586x *tps6586x = dev_get_drvdata(dev);
+
+        if (tps6586x->client->irq)
+                enable_irq(tps6586x->client->irq);
+
+        return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(tps6586x_pm_ops, tps6586x_i2c_suspend,
+                         tps6586x_i2c_resume);
+
 static const struct i2c_device_id tps6586x_id_table[] = {
         { "tps6586x", 0 },
         { },
@@ -602,6 +625,7 @@ static struct i2c_driver tps6586x_driver = {
         .driver = {
                 .name   = "tps6586x",
                 .of_match_table = of_match_ptr(tps6586x_of_match),
+                .pm     = &tps6586x_pm_ops,
         },
         .probe          = tps6586x_i2c_probe,
         .remove         = tps6586x_i2c_remove,
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 4be3d239da9e..299016bc46d9 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -979,7 +979,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
  * letting it generate the right frequencies for USB, MADC, and
  * other purposes.
  */
-static inline int __init protect_pm_master(void)
+static inline int protect_pm_master(void)
 {
         int e = 0;
 
@@ -988,7 +988,7 @@ static inline int __init protect_pm_master(void)
         return e;
 }
 
-static inline int __init unprotect_pm_master(void)
+static inline int unprotect_pm_master(void)
 {
         int e = 0;
 
diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
index 1ee68bd440fb..16c6e2accfaa 100644
--- a/drivers/mfd/wm5110-tables.c
+++ b/drivers/mfd/wm5110-tables.c
@@ -1618,6 +1618,7 @@ static const struct reg_default wm5110_reg_default[] = {
         { 0x00000ECD, 0x0000 },    /* R3789  - HPLPF4_2 */
         { 0x00000EE0, 0x0000 },    /* R3808  - ASRC_ENABLE */
         { 0x00000EE2, 0x0000 },    /* R3810  - ASRC_RATE1 */
+        { 0x00000EE3, 0x4000 },    /* R3811  - ASRC_RATE2 */
         { 0x00000EF0, 0x0000 },    /* R3824  - ISRC 1 CTRL 1 */
         { 0x00000EF1, 0x0000 },    /* R3825  - ISRC 1 CTRL 2 */
         { 0x00000EF2, 0x0000 },    /* R3826  - ISRC 1 CTRL 3 */
@@ -2869,6 +2870,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)
         case ARIZONA_ASRC_ENABLE:
         case ARIZONA_ASRC_STATUS:
         case ARIZONA_ASRC_RATE1:
+        case ARIZONA_ASRC_RATE2:
         case ARIZONA_ISRC_1_CTRL_1:
         case ARIZONA_ISRC_1_CTRL_2:
         case ARIZONA_ISRC_1_CTRL_3:
diff --git a/include/linux/mfd/cros_ec_commands.h b/include/linux/mfd/cros_ec_commands.h
index 9a9631f0559e..fc91082d4c35 100644
--- a/include/linux/mfd/cros_ec_commands.h
+++ b/include/linux/mfd/cros_ec_commands.h
@@ -2791,6 +2791,100 @@ struct ec_response_battery_vendor_param {
 } __packed;
 
 /*****************************************************************************/
+/* Commands for I2S recording on audio codec. */
+
+#define EC_CMD_CODEC_I2S 0x00BC
+
+enum ec_codec_i2s_subcmd {
+        EC_CODEC_SET_SAMPLE_DEPTH = 0x0,
+        EC_CODEC_SET_GAIN = 0x1,
+        EC_CODEC_GET_GAIN = 0x2,
+        EC_CODEC_I2S_ENABLE = 0x3,
+        EC_CODEC_I2S_SET_CONFIG = 0x4,
+        EC_CODEC_I2S_SET_TDM_CONFIG = 0x5,
+        EC_CODEC_I2S_SET_BCLK = 0x6,
+};
+
+enum ec_sample_depth_value {
+        EC_CODEC_SAMPLE_DEPTH_16 = 0,
+        EC_CODEC_SAMPLE_DEPTH_24 = 1,
+};
+
+enum ec_i2s_config {
+        EC_DAI_FMT_I2S = 0,
+        EC_DAI_FMT_RIGHT_J = 1,
+        EC_DAI_FMT_LEFT_J = 2,
+        EC_DAI_FMT_PCM_A = 3,
+        EC_DAI_FMT_PCM_B = 4,
+        EC_DAI_FMT_PCM_TDM = 5,
+};
+
+struct ec_param_codec_i2s {
+        /*
+         * enum ec_codec_i2s_subcmd
+         */
+        uint8_t cmd;
+        union {
+                /*
+                 * EC_CODEC_SET_SAMPLE_DEPTH
+                 * Value should be one of ec_sample_depth_value.
+                 */
+                uint8_t depth;
+
+                /*
+                 * EC_CODEC_SET_GAIN
+                 * Value should be 0~43 for both channels.
+                 */
+                struct ec_param_codec_i2s_set_gain {
+                        uint8_t left;
+                        uint8_t right;
+                } __packed gain;
+
+                /*
+                 * EC_CODEC_I2S_ENABLE
+                 * 1 to enable, 0 to disable.
+                 */
+                uint8_t i2s_enable;
+
+                /*
+                 * EC_CODEC_I2S_SET_COFNIG
+                 * Value should be one of ec_i2s_config.
+                 */
+                uint8_t i2s_config;
+
+                /*
+                 * EC_CODEC_I2S_SET_TDM_CONFIG
+                 * Value should be one of ec_i2s_config.
+                 */
+                struct ec_param_codec_i2s_tdm {
+                        /*
+                         * 0 to 496
+                         */
+                        int16_t ch0_delay;
+                        /*
+                         * -1 to 496
+                         */
+                        int16_t ch1_delay;
+                        uint8_t adjacent_to_ch0;
+                        uint8_t adjacent_to_ch1;
+                } __packed tdm_param;
+
+                /*
+                 * EC_CODEC_I2S_SET_BCLK
+                 */
+                uint32_t bclk;
+        };
+} __packed;
+
+/*
+ * For subcommand EC_CODEC_GET_GAIN.
+ */
+struct ec_response_codec_gain {
+        uint8_t left;
+        uint8_t right;
+} __packed;
+
+/*****************************************************************************/
 /* System commands */
 
 /*
diff --git a/include/linux/mfd/ingenic-tcu.h b/include/linux/mfd/ingenic-tcu.h
index ab16ad283def..2083fa20821d 100644
--- a/include/linux/mfd/ingenic-tcu.h
+++ b/include/linux/mfd/ingenic-tcu.h
@@ -41,7 +41,7 @@
 #define TCU_TCSR_PRESCALE_LSB           3
 #define TCU_TCSR_PRESCALE_MASK          0x38
 
-#define TCU_TCSR_PWM_SD         BIT(9)  /* 0: Shutdown abruptly 1: gracefully */
+#define TCU_TCSR_PWM_SD         BIT(9)  /* 0: Shutdown gracefully 1: abruptly */
 #define TCU_TCSR_PWM_INITL_HIGH BIT(8)  /* Sets the initial output level */
 #define TCU_TCSR_PWM_EN         BIT(7)  /* PWM pin output enable */
 
diff --git a/include/linux/mfd/madera/core.h b/include/linux/mfd/madera/core.h
index fe69c0f4398f..4d5d51a9c8a6 100644
--- a/include/linux/mfd/madera/core.h
+++ b/include/linux/mfd/madera/core.h
@@ -15,6 +15,7 @@
 #include <linux/gpio/consumer.h>
 #include <linux/interrupt.h>
 #include <linux/mfd/madera/pdata.h>
+#include <linux/mutex.h>
 #include <linux/notifier.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
@@ -37,6 +38,8 @@ enum madera_type {
 
 #define MADERA_MAX_MICBIAS              4
 
+#define MADERA_MAX_HP_OUTPUT            3
+
 /* Notifier events */
 #define MADERA_NOTIFY_VOICE_TRIGGER     0x1
 #define MADERA_NOTIFY_HPDET             0x2
@@ -183,6 +186,10 @@ struct madera {
         unsigned int num_childbias[MADERA_MAX_MICBIAS];
 
         struct snd_soc_dapm_context *dapm;
+        struct mutex dapm_ptr_lock;
+        unsigned int hp_ena;
+        bool out_clamp[MADERA_MAX_HP_OUTPUT];
+        bool out_shorted[MADERA_MAX_HP_OUTPUT];
 
         struct blocking_notifier_head notifier;
 };
diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h
index b9a53e013bff..483168403ae5 100644
--- a/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@ -78,6 +78,8 @@
 #define STEPCONFIG_YNN          BIT(8)
 #define STEPCONFIG_XNP          BIT(9)
 #define STEPCONFIG_YPN          BIT(10)
+#define STEPCONFIG_RFP(val)     ((val) << 12)
+#define STEPCONFIG_RFP_VREFP    (0x3 << 12)
 #define STEPCONFIG_INM_MASK     (0xF << 15)
 #define STEPCONFIG_INM(val)     ((val) << 15)
 #define STEPCONFIG_INM_ADCREFM  STEPCONFIG_INM(8)
@@ -86,6 +88,8 @@
 #define STEPCONFIG_INP_AN4      STEPCONFIG_INP(4)
 #define STEPCONFIG_INP_ADCREFM  STEPCONFIG_INP(8)
 #define STEPCONFIG_FIFO1        BIT(26)
+#define STEPCONFIG_RFM(val)     ((val) << 23)
+#define STEPCONFIG_RFM_VREFN    (0x3 << 23)
 
 /* Delay register */
 #define STEPDELAY_OPEN_MASK     (0x3FFFF << 0)
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index e2687a30e5a1..739b7bf37eaa 100644
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -79,7 +79,7 @@
 /* Some controllers have a CBSY bit */
 #define TMIO_MMC_HAVE_CBSY              BIT(11)
 
-/* Some controllers that support HS400 use use 4 taps while others use 8. */
+/* Some controllers that support HS400 use 4 taps while others use 8. */
 #define TMIO_MMC_HAVE_4TAP_HS400        BIT(13)
 
 int tmio_core_mmc_enable(void __iomem *cnf, int shift, unsigned long base);