These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / mfd / da9063-core.c

diff --git a/kernel/drivers/mfd/da9063-core.c b/kernel/drivers/mfd/da9063-core.c
index facd361..af841c1 100644 (file)
--- a/kernel/drivers/mfd/da9063-core.c
+++ b/kernel/drivers/mfd/da9063-core.c
@@ -60,6 +60,7 @@ static struct resource da9063_rtc_resources[] = {
 
 static struct resource da9063_onkey_resources[] = {
        {
+               .name   = "ONKEY",
                .start  = DA9063_IRQ_ONKEY,
                .end    = DA9063_IRQ_ONKEY,
                .flags  = IORESOURCE_IRQ,
@@ -97,6 +98,7 @@ static const struct mfd_cell da9063_devs[] = {
                .name           = DA9063_DRVNAME_ONKEY,
                .num_resources  = ARRAY_SIZE(da9063_onkey_resources),
                .resources      = da9063_onkey_resources,
+               .of_compatible = "dlg,da9063-onkey",
        },
        {
                .name           = DA9063_DRVNAME_RTC,
@@ -109,12 +111,64 @@ static const struct mfd_cell da9063_devs[] = {
        },
 };
 
+static int da9063_clear_fault_log(struct da9063 *da9063)
+{
+       int ret = 0;
+       int fault_log = 0;
+
+       ret = regmap_read(da9063->regmap, DA9063_REG_FAULT_LOG, &fault_log);
+       if (ret < 0) {
+               dev_err(da9063->dev, "Cannot read FAULT_LOG.\n");
+               return -EIO;
+       }
+
+       if (fault_log) {
+               if (fault_log & DA9063_TWD_ERROR)
+                       dev_dbg(da9063->dev,
+                               "Fault log entry detected: DA9063_TWD_ERROR\n");
+               if (fault_log & DA9063_POR)
+                       dev_dbg(da9063->dev,
+                               "Fault log entry detected: DA9063_POR\n");
+               if (fault_log & DA9063_VDD_FAULT)
+                       dev_dbg(da9063->dev,
+                               "Fault log entry detected: DA9063_VDD_FAULT\n");
+               if (fault_log & DA9063_VDD_START)
+                       dev_dbg(da9063->dev,
+                               "Fault log entry detected: DA9063_VDD_START\n");
+               if (fault_log & DA9063_TEMP_CRIT)
+                       dev_dbg(da9063->dev,
+                               "Fault log entry detected: DA9063_TEMP_CRIT\n");
+               if (fault_log & DA9063_KEY_RESET)
+                       dev_dbg(da9063->dev,
+                               "Fault log entry detected: DA9063_KEY_RESET\n");
+               if (fault_log & DA9063_NSHUTDOWN)
+                       dev_dbg(da9063->dev,
+                               "Fault log entry detected: DA9063_NSHUTDOWN\n");
+               if (fault_log & DA9063_WAIT_SHUT)
+                       dev_dbg(da9063->dev,
+                               "Fault log entry detected: DA9063_WAIT_SHUT\n");
+       }
+
+       ret = regmap_write(da9063->regmap,
+                          DA9063_REG_FAULT_LOG,
+                          fault_log);
+       if (ret < 0)
+               dev_err(da9063->dev,
+                       "Cannot reset FAULT_LOG values %d\n", ret);
+
+       return ret;
+}
+
 int da9063_device_init(struct da9063 *da9063, unsigned int irq)
 {
        struct da9063_pdata *pdata = da9063->dev->platform_data;
        int model, variant_id, variant_code;
        int ret;
 
+       ret = da9063_clear_fault_log(da9063);
+       if (ret < 0)
+               dev_err(da9063->dev, "Cannot clear fault log\n");
+
        if (pdata) {
                da9063->flags = pdata->flags;
                da9063->irq_base = pdata->irq_base;