pinctrl: qcom-spmi-mpp: Fix input value report

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-s5m.c

diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c
index 4008b84246ca75abb50d1a7895081f39be0f9ac5..8c70d785ba739c314221fb98fe2533e160ee3180 100644 (file)
--- a/drivers/rtc/rtc-s5m.c
+++ b/drivers/rtc/rtc-s5m.c
@@ -15,6 +15,8 @@
  *  GNU General Public License for more details.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/bcd.h>
@@ -90,7 +92,7 @@ struct s5m_rtc_info {
        struct regmap *regmap;
        struct rtc_device *rtc_dev;
        int irq;
-       int device_type;
+       enum sec_device_type device_type;
        int rtc_24hr_mode;
        const struct s5m_rtc_reg_config *regs;
 };
@@ -146,7 +148,7 @@ static int s5m8767_tm_to_data(struct rtc_time *tm, u8 *data)
        data[RTC_YEAR1] = tm->tm_year > 100 ? (tm->tm_year - 100) : 0;
 
        if (tm->tm_year < 100) {
-               pr_err("s5m8767 RTC cannot handle the year %d.\n",
+               pr_err("RTC cannot handle the year %d\n",
                       1900 + tm->tm_year);
                return -EINVAL;
        } else {
@@ -187,6 +189,7 @@ static inline int s5m_check_peding_alarm_interrupt(struct s5m_rtc_info *info,
                val &= S5M_ALARM0_STATUS;
                break;
        case S2MPS14X:
+       case S2MPS13X:
                ret = regmap_read(info->s5m87xx->regmap_pmic, S2MPS14_REG_ST2,
                                &val);
                val &= S2MPS_ALARM0_STATUS;
@@ -252,6 +255,9 @@ static inline int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info)
        case S2MPS14X:
                data |= S2MPS_RTC_RUDR_MASK;
                break;
+       case S2MPS13X:
+               data |= S2MPS13_RTC_AUDR_MASK;
+               break;
        default:
                return -EINVAL;
        }
@@ -265,6 +271,11 @@ static inline int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info)
 
        ret = s5m8767_wait_for_udr_update(info);
 
+       /* On S2MPS13 the AUDR is not auto-cleared */
+       if (info->device_type == S2MPS13X)
+               regmap_update_bits(info->regmap, info->regs->rtc_udr_update,
+                                  S2MPS13_RTC_AUDR_MASK, 0);
+
        return ret;
 }
 
@@ -306,7 +317,7 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm)
        u8 data[info->regs->regs_count];
        int ret;
 
-       if (info->device_type == S2MPS14X) {
+       if (info->device_type == S2MPS14X || info->device_type == S2MPS13X) {
                ret = regmap_update_bits(info->regmap,
                                info->regs->rtc_udr_update,
                                S2MPS_RTC_RUDR_MASK, S2MPS_RTC_RUDR_MASK);
@@ -329,6 +340,7 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm)
 
        case S5M8767X:
        case S2MPS14X:
+       case S2MPS13X:
                s5m8767_data_to_tm(data, tm, info->rtc_24hr_mode);
                break;
 
@@ -355,6 +367,7 @@ static int s5m_rtc_set_time(struct device *dev, struct rtc_time *tm)
                break;
        case S5M8767X:
        case S2MPS14X:
+       case S2MPS13X:
                ret = s5m8767_tm_to_data(tm, data);
                break;
        default:
@@ -402,6 +415,7 @@ static int s5m_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 
        case S5M8767X:
        case S2MPS14X:
+       case S2MPS13X:
                s5m8767_data_to_tm(data, &alrm->time, info->rtc_24hr_mode);
                alrm->enabled = 0;
                for (i = 0; i < info->regs->regs_count; i++) {
@@ -450,6 +464,7 @@ static int s5m_rtc_stop_alarm(struct s5m_rtc_info *info)
 
        case S5M8767X:
        case S2MPS14X:
+       case S2MPS13X:
                for (i = 0; i < info->regs->regs_count; i++)
                        data[i] &= ~ALARM_ENABLE_MASK;
 
@@ -494,6 +509,7 @@ static int s5m_rtc_start_alarm(struct s5m_rtc_info *info)
 
        case S5M8767X:
        case S2MPS14X:
+       case S2MPS13X:
                data[RTC_SEC] |= ALARM_ENABLE_MASK;
                data[RTC_MIN] |= ALARM_ENABLE_MASK;
                data[RTC_HOUR] |= ALARM_ENABLE_MASK;
@@ -533,6 +549,7 @@ static int s5m_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 
        case S5M8767X:
        case S2MPS14X:
+       case S2MPS13X:
                s5m8767_tm_to_data(&alrm->time, data);
                break;
 
@@ -615,6 +632,7 @@ static int s5m8767_rtc_init_reg(struct s5m_rtc_info *info)
                break;
 
        case S2MPS14X:
+       case S2MPS13X:
                data[0] = (0 << BCD_EN_SHIFT) | (1 << MODEL24_SHIFT);
                ret = regmap_write(info->regmap, info->regs->ctrl, data[0]);
                break;
@@ -650,8 +668,9 @@ static int s5m_rtc_probe(struct platform_device *pdev)
        if (!info)
                return -ENOMEM;
 
-       switch (pdata->device_type) {
+       switch (platform_get_device_id(pdev)->driver_data) {
        case S2MPS14X:
+       case S2MPS13X:
                regmap_cfg = &s2mps14_rtc_regmap_config;
                info->regs = &s2mps_rtc_regs;
                alarm_irq = S2MPS14_IRQ_RTCA0;
@@ -667,7 +686,9 @@ static int s5m_rtc_probe(struct platform_device *pdev)
                alarm_irq = S5M8767_IRQ_RTCA1;
                break;
        default:
-               dev_err(&pdev->dev, "Device type is not supported by RTC driver\n");
+               dev_err(&pdev->dev,
+                               "Device type %lu is not supported by RTC driver\n",
+                               platform_get_device_id(pdev)->driver_data);
                return -ENODEV;
        }
 
@@ -687,7 +708,7 @@ static int s5m_rtc_probe(struct platform_device *pdev)
 
        info->dev = &pdev->dev;
        info->s5m87xx = s5m87xx;
-       info->device_type = s5m87xx->device_type;
+       info->device_type = platform_get_device_id(pdev)->driver_data;
 
        if (s5m87xx->irq_data) {
                info->irq = regmap_irq_get_virq(s5m87xx->irq_data, alarm_irq);
@@ -772,6 +793,7 @@ static SIMPLE_DEV_PM_OPS(s5m_rtc_pm_ops, s5m_rtc_suspend, s5m_rtc_resume);
 
 static const struct platform_device_id s5m_rtc_id[] = {
        { "s5m-rtc",            S5M8767X },
+       { "s2mps13-rtc",        S2MPS13X },
        { "s2mps14-rtc",        S2MPS14X },
        { },
 };