Merge tag 'mfd-next-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

Pull MFD updates from Lee Jones:
 "New drivers:
   - Add support for Cherry Trail Dollar Cove TI PMIC
   - Add support for Add Spreadtrum SC27xx series PMICs

  New device support:
   - Add support Regulator to axp20x

  New functionality:
   - Add DT support; aspeed-scu sc27xx-pmic
   - Add power saving support; rts5249

  Fix-ups:
   - DT clean-up/rework; tps65217, max77693, iproc-cdru, iproc-mhb, tps65218
   - Staticise/constify; stw481x
   - Use new succinct IRQ API; fsl-imx25-tsadc
   - Kconfig fix-ups; MFD_TPS65218
   - Identify SPI method; lpc_ich
   - Use managed resources (devm_*) calls; ssbi
   - Remove unused/obsolete code/documentation; mc13xxx

  Bug fixes:
   - Fix typo in MAINTAINERS
   - Fix error handling; mxs-lradc
   - Clean-up IRQs on .remove; fsl-imx25-tsadc"

* tag 'mfd-next-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (21 commits)
  dt-bindings: mfd: mc13xxx: Remove obsolete property
  mfd: axp20x: Add axp20x-regulator cell for AXP813
  mfd: Add Spreadtrum SC27xx series PMICs driver
  dt-bindings: mfd: Add Spreadtrum SC27xx PMIC documentation
  mfd: ssbi: Use devm_of_platform_populate()
  mfd: fsl-imx25: Clean up irq settings during removal
  mfd: mxs-lradc: Fix error handling in mxs_lradc_probe()
  mfd: lpc_ich: Avoton/Rangeley uses SPI_BYT method
  mfd: tps65218: Introduce dependency on CONFIG_OF
  mfd: tps65218: Correct the config description
  MAINTAINERS: Fix Dialog search term for watchdog binding file
  mfd: fsl-imx25: Set irq handler and data in one go
  mfd: rts5249: Add support for RTS5250S power saving
  ACPI / PMIC: Add opregion driver for Intel Dollar Cove TI PMIC
  mfd: Add support for Cherry Trail Dollar Cove TI PMIC
  syscon: dt-bindings: Add binding document for iProc MHB block
  syscon: dt-bindings: Add binding doc for Broadcom iProc CDRU
  mfd: max77693: Add muic of_compatible in mfd_cell
  mfd: stw481x: Make three arrays static const, reduces object code size
  mfd: tps65217: Introduce dependency on CONFIG_OF
  ...

3 files changed, 144 insertions, 0 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 91477d5ab422..46505396869e 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -527,6 +527,12 @@ config CHT_WC_PMIC_OPREGION
         help
           This config adds ACPI operation region support for CHT Whiskey Cove PMIC.
 
+config CHT_DC_TI_PMIC_OPREGION
+        bool "ACPI operation region support for Dollar Cove TI PMIC"
+        depends on INTEL_SOC_PMIC_CHTDC_TI
+        help
+          This config adds ACPI operation region support for Dollar Cove TI PMIC.
+
 endif
 
 config ACPI_CONFIGFS
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 31c15d84a8d0..41954a601989 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -106,6 +106,7 @@ obj-$(CONFIG_CRC_PMIC_OPREGION) += pmic/intel_pmic_crc.o
 obj-$(CONFIG_XPOWER_PMIC_OPREGION) += pmic/intel_pmic_xpower.o
 obj-$(CONFIG_BXT_WC_PMIC_OPREGION) += pmic/intel_pmic_bxtwc.o
 obj-$(CONFIG_CHT_WC_PMIC_OPREGION) += pmic/intel_pmic_chtwc.o
+obj-$(CONFIG_CHT_DC_TI_PMIC_OPREGION) += pmic/intel_pmic_chtdc_ti.o
 
 obj-$(CONFIG_ACPI_CONFIGFS)     += acpi_configfs.o
 
diff --git a/drivers/acpi/pmic/intel_pmic_chtdc_ti.c b/drivers/acpi/pmic/intel_pmic_chtdc_ti.c
new file mode 100644
index 000000000000..109c1e9c9c7a
--- /dev/null
+++ b/drivers/acpi/pmic/intel_pmic_chtdc_ti.c
@@ -0,0 +1,137 @@
+/*
+ * Dollar Cove TI PMIC operation region driver
+ * Copyright (C) 2014 Intel Corporation. All rights reserved.
+ *
+ * Rewritten and cleaned up
+ * Copyright (C) 2017 Takashi Iwai <tiwai@suse.de>
+ */
+
+#include <linux/acpi.h>
+#include <linux/init.h>
+#include <linux/mfd/intel_soc_pmic.h>
+#include <linux/platform_device.h>
+#include "intel_pmic.h"
+
+/* registers stored in 16bit BE (high:low, total 10bit) */
+#define CHTDC_TI_VBAT           0x54
+#define CHTDC_TI_DIETEMP        0x56
+#define CHTDC_TI_BPTHERM        0x58
+#define CHTDC_TI_GPADC          0x5a
+
+static struct pmic_table chtdc_ti_power_table[] = {
+        { .address = 0x00, .reg = 0x41 },
+        { .address = 0x04, .reg = 0x42 },
+        { .address = 0x08, .reg = 0x43 },
+        { .address = 0x0c, .reg = 0x45 },
+        { .address = 0x10, .reg = 0x46 },
+        { .address = 0x14, .reg = 0x47 },
+        { .address = 0x18, .reg = 0x48 },
+        { .address = 0x1c, .reg = 0x49 },
+        { .address = 0x20, .reg = 0x4a },
+        { .address = 0x24, .reg = 0x4b },
+        { .address = 0x28, .reg = 0x4c },
+        { .address = 0x2c, .reg = 0x4d },
+        { .address = 0x30, .reg = 0x4e },
+};
+
+static struct pmic_table chtdc_ti_thermal_table[] = {
+        {
+                .address = 0x00,
+                .reg = CHTDC_TI_GPADC
+        },
+        {
+                .address = 0x0c,
+                .reg = CHTDC_TI_GPADC
+        },
+        /* TMP2 -> SYSTEMP */
+        {
+                .address = 0x18,
+                .reg = CHTDC_TI_GPADC
+        },
+        /* TMP3 -> BPTHERM */
+        {
+                .address = 0x24,
+                .reg = CHTDC_TI_BPTHERM
+        },
+        {
+                .address = 0x30,
+                .reg = CHTDC_TI_GPADC
+        },
+        /* TMP5 -> DIETEMP */
+        {
+                .address = 0x3c,
+                .reg = CHTDC_TI_DIETEMP
+        },
+};
+
+static int chtdc_ti_pmic_get_power(struct regmap *regmap, int reg, int bit,
+                                   u64 *value)
+{
+        int data;
+
+        if (regmap_read(regmap, reg, &data))
+                return -EIO;
+
+        *value = data & 1;
+        return 0;
+}
+
+static int chtdc_ti_pmic_update_power(struct regmap *regmap, int reg, int bit,
+                                      bool on)
+{
+        return regmap_update_bits(regmap, reg, 1, on);
+}
+
+static int chtdc_ti_pmic_get_raw_temp(struct regmap *regmap, int reg)
+{
+        u8 buf[2];
+
+        if (regmap_bulk_read(regmap, reg, buf, 2))
+                return -EIO;
+
+        /* stored in big-endian */
+        return ((buf[0] & 0x03) << 8) | buf[1];
+}
+
+static struct intel_pmic_opregion_data chtdc_ti_pmic_opregion_data = {
+        .get_power = chtdc_ti_pmic_get_power,
+        .update_power = chtdc_ti_pmic_update_power,
+        .get_raw_temp = chtdc_ti_pmic_get_raw_temp,
+        .power_table = chtdc_ti_power_table,
+        .power_table_count = ARRAY_SIZE(chtdc_ti_power_table),
+        .thermal_table = chtdc_ti_thermal_table,
+        .thermal_table_count = ARRAY_SIZE(chtdc_ti_thermal_table),
+};
+
+static int chtdc_ti_pmic_opregion_probe(struct platform_device *pdev)
+{
+        struct intel_soc_pmic *pmic = dev_get_drvdata(pdev->dev.parent);
+        int err;
+
+        err = intel_pmic_install_opregion_handler(&pdev->dev,
+                        ACPI_HANDLE(pdev->dev.parent), pmic->regmap,
+                        &chtdc_ti_pmic_opregion_data);
+        if (err < 0)
+                return err;
+
+        /* Re-enumerate devices depending on PMIC */
+        acpi_walk_dep_device_list(ACPI_HANDLE(pdev->dev.parent));
+        return 0;
+}
+
+static const struct platform_device_id chtdc_ti_pmic_opregion_id_table[] = {
+        { .name = "chtdc_ti_region" },
+        {},
+};
+
+static struct platform_driver chtdc_ti_pmic_opregion_driver = {
+        .probe = chtdc_ti_pmic_opregion_probe,
+        .driver = {
+                .name = "cht_dollar_cove_ti_pmic",
+        },
+        .id_table = chtdc_ti_pmic_opregion_id_table,
+};
+module_platform_driver(chtdc_ti_pmic_opregion_driver);
+
+MODULE_DESCRIPTION("Dollar Cove TI PMIC opregion driver");
+MODULE_LICENSE("GPL v2");