From patchwork Mon Feb 17 08:40:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 320880 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-yh0-x23b.google.com (mail-yh0-x23b.google.com [IPv6:2607:f8b0:4002:c01::23b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2BA452C00D0 for ; Mon, 17 Feb 2014 19:40:51 +1100 (EST) Received: by mail-yh0-f59.google.com with SMTP id f10sf4076111yha.4 for ; Mon, 17 Feb 2014 00:40:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :reply-to:precedence:mailing-list:list-id:list-post:list-help :list-archive:sender:list-subscribe:list-unsubscribe:content-type; bh=liLqfshm07U855Fx3qWUUfrykj5jnvIhzcgxyzNy+mo=; b=nrlySt6rH/W3RDjAVQ/nzhdSzIFxrPHHdk9XUYBkz3RTwvMAgZuFYrOtm1B2zwqOSK f5Z0t6Du/YIXWdIk37vvdBLuc1jcx1iQI3wPTQhqkWvTP+J9iVELm4NTvuOFi+rFZ24N 0kMeyZcPIO1GLUUECa5kfmTZpWirVJojY2FTs6Xv55rGU+XoUMtrB22bLVaVM+RK5Xr5 Ve+QAbAH2axbN/4tjTuU/x1ycfxHFMF+egFBws/HtXaOoLk+hHETVvXdxoh0DiD20yBB 4F5YrcWpmG2//PACeUoKq7nKAlszKrGVbHU3MTA2Fo8IaEkKCtkOKCYvrELmxjPZI5bv gBOQ== X-Received: by 10.140.108.180 with SMTP id j49mr19510qgf.21.1392626448482; Mon, 17 Feb 2014 00:40:48 -0800 (PST) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.140.47.9 with SMTP id l9ls900876qga.13.gmail; Mon, 17 Feb 2014 00:40:48 -0800 (PST) X-Received: by 10.52.29.16 with SMTP id f16mr8519235vdh.8.1392626448087; Mon, 17 Feb 2014 00:40:48 -0800 (PST) Received: from mailout4.w1.samsung.com (mailout4.w1.samsung.com. [210.118.77.14]) by gmr-mx.google.com with ESMTPS id ox2si2121288pbc.1.2014.02.17.00.40.47 for (version=TLSv1 cipher=RC4-MD5 bits=128/128); Mon, 17 Feb 2014 00:40:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of k.kozlowski@samsung.com designates 210.118.77.14 as permitted sender) client-ip=210.118.77.14; Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N14002NETFZZF50@mailout4.w1.samsung.com> for rtc-linux@googlegroups.com; Mon, 17 Feb 2014 08:40:47 +0000 (GMT) X-AuditID: cbfec7f5-b7fc96d000004885-de-5301cb0e0958 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 28.6D.18565.E0BC1035; Mon, 17 Feb 2014 08:40:46 +0000 (GMT) Received: from AMDC1943.digital.local ([106.116.151.171]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0N14007P7TFKT190@eusync2.samsung.com>; Mon, 17 Feb 2014 08:40:46 +0000 (GMT) From: Krzysztof Kozlowski To: Sangbeom Kim , Samuel Ortiz , Lee Jones , linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: Kyungmin Park , Marek Szyprowski , Bartlomiej Zolnierkiewicz , Tomasz Figa , Yadwinder Singh Brar , Krzysztof Kozlowski , Alessandro Zummo , rtc-linux@googlegroups.com Subject: [rtc-linux] [PATCH v3 13/13] rtc: s5m: Add support for S2MPS14 RTC Date: Mon, 17 Feb 2014 09:40:27 +0100 Message-id: <1392626427-4518-14-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1392626427-4518-1-git-send-email-k.kozlowski@samsung.com> References: <1392626427-4518-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprCLMWRmVeSWpSXmKPExsVy+t/xK7p8pxmDDZa2cVgsuXiV3WLjjPWs Fq9fGFqcbXrDbnH/61FGi8u75rBZzDi/j8li7ZG77Bb7OzsYLU53s1pcXPGFyWL9jNcsFnOm v2Ny4PXYM/Ekm8eda3vYPOadDPTo27KK0WP6vJ9MHp83yQWwRXHZpKTmZJalFunbJXBlXJ/X ylbw0qLi8YketgbG77pdjBwcEgImEt+XKHQxcgKZYhIX7q1n62Lk4hASWMoo0b9xNguE08ck cWH1TlaQKjYBY4nNy5eAVYkIbGaUWPz9KliCWeABk8T059UgtrCAvcSrK8fA4iwCqhJfJl0E s3kF3CWO9XxhgtisIDFnkg1ImBMo/LRvKitIWEjATWL/xrAJjLwLGBlWMYqmliYXFCel5xrp FSfmFpfmpesl5+duYoSE5NcdjEuPWR1iFOBgVOLhNahmDBZiTSwrrsw9xCjBwawkwmu7DijE m5JYWZValB9fVJqTWnyIkYmDU6qBcULSVtNXena7xNZUewX5rFO+s+9T1ZIdL9uuHWfrOKL4 7MTksnmvXhY6+ZioGD+Z9IJ9RYPgfPPkFV8OPKxfcsph5TvnBJ7TEtVzxY+dD/+pvyNhy7En 2/ZOqFXSf8hWLBipLLTS8nvazgpG1yOMrx9/TfvRE7jj9c1dr25/ennWn5HxpajXFDUlluKM REMt5qLiRAAubUY6JwIAAA== X-Original-Sender: k.kozlowski@samsung.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of k.kozlowski@samsung.com designates 210.118.77.14 as permitted sender) smtp.mail=k.kozlowski@samsung.com Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , Add support for S2MPS14 to the rtc-s5m driver. Differences in S2MPS14 (in comparison to S5M8767): - Layout of registers; - Lack of century support for time and alarms (7 registers used for storing time/alarm); - Two buffer control registers: WUDR and RUDR; - No register for enabling writing time; - RTC interrupts are reported in main PMIC I2C device; This patch also adds missing mfd_cell for RTC in the MFD core driver. Signed-off-by: Krzysztof Kozlowski Cc: Alessandro Zummo Cc: rtc-linux@googlegroups.com --- drivers/rtc/rtc-s5m.c | 89 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 78 insertions(+), 11 deletions(-) diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c index 6a1290f8709a..6e4faffe4b5b 100644 --- a/drivers/rtc/rtc-s5m.c +++ b/drivers/rtc/rtc-s5m.c @@ -17,16 +17,14 @@ #include #include -#include #include -#include #include #include -#include #include #include #include #include +#include /* * Maximum number of retries for checking changes in UDR field @@ -74,6 +72,21 @@ static const struct s5m_rtc_reg_config s5m_rtc_regs = { .rtc_udr_mask = S5M_RTC_UDR_MASK, }; +/* + * Register map for S2MPS14. + * It may be also suitable for S2MPS11 but this was not tested. + */ +static const struct s5m_rtc_reg_config s2mps_rtc_regs = { + .regs_count = 7, + .time = S2MPS_RTC_SEC, + .ctrl = S2MPS_RTC_CTRL, + .alarm0 = S2MPS_ALARM0_SEC, + .alarm1 = S2MPS_ALARM1_SEC, + .smpl_wtsr = S2MPS_WTSR_SMPL_CNTL, + .rtc_udr_update = S2MPS_RTC_UDR_CON, + .rtc_udr_mask = S2MPS_RTC_WUDR_MASK, +}; + struct s5m_rtc_info { struct device *dev; struct sec_pmic_dev *s5m87xx; @@ -163,6 +176,11 @@ static inline int s5m_check_peding_alarm_interrupt(struct s5m_rtc_info *info, ret = regmap_read(info->regmap, S5M_RTC_STATUS, &val); val &= S5M_ALARM0_STATUS; break; + case S2MPS14X: + ret = regmap_read(info->s5m87xx->regmap_pmic, S2MPS14_REG_ST2, + &val); + val &= S2MPS_ALARM0_STATUS; + break; default: return -EINVAL; } @@ -188,8 +206,9 @@ static inline int s5m8767_rtc_set_time_reg(struct s5m_rtc_info *info) return ret; } - data |= S5M_RTC_TIME_EN_MASK; data |= info->regs->rtc_udr_mask; + if (info->device_type == S5M8763X || info->device_type == S5M8767X) + data |= S5M_RTC_TIME_EN_MASK; ret = regmap_write(info->regmap, info->regs->rtc_udr_update, data); if (ret < 0) { @@ -214,8 +233,18 @@ static inline int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info) return ret; } - data &= ~S5M_RTC_TIME_EN_MASK; data |= info->regs->rtc_udr_mask; + switch (info->device_type) { + case S5M8763X: + case S5M8767X: + data &= ~S5M_RTC_TIME_EN_MASK; + break; + case S2MPS14X: + data |= S2MPS_RTC_RUDR_MASK; + break; + default: + return -EINVAL; + } ret = regmap_write(info->regmap, info->regs->rtc_udr_update, data); if (ret < 0) { @@ -267,6 +296,17 @@ 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) { + ret = regmap_update_bits(info->regmap, + info->regs->rtc_udr_update, + S2MPS_RTC_RUDR_MASK, S2MPS_RTC_RUDR_MASK); + if (ret) { + dev_err(dev, + "Failed to prepare registers for time reading: %d\n", + ret); + return ret; + } + } ret = regmap_bulk_read(info->regmap, info->regs->time, data, info->regs->regs_count); if (ret < 0) @@ -278,6 +318,7 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm) break; case S5M8767X: + case S2MPS14X: s5m8767_data_to_tm(data, tm, info->rtc_24hr_mode); break; @@ -303,6 +344,7 @@ static int s5m_rtc_set_time(struct device *dev, struct rtc_time *tm) s5m8763_tm_to_data(tm, data); break; case S5M8767X: + case S2MPS14X: ret = s5m8767_tm_to_data(tm, data); break; default: @@ -349,6 +391,7 @@ static int s5m_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) break; case S5M8767X: + case S2MPS14X: s5m8767_data_to_tm(data, &alrm->time, info->rtc_24hr_mode); alrm->enabled = 0; for (i = 0; i < info->regs->regs_count; i++) { @@ -396,6 +439,7 @@ static int s5m_rtc_stop_alarm(struct s5m_rtc_info *info) break; case S5M8767X: + case S2MPS14X: for (i = 0; i < info->regs->regs_count; i++) data[i] &= ~ALARM_ENABLE_MASK; @@ -439,6 +483,7 @@ static int s5m_rtc_start_alarm(struct s5m_rtc_info *info) break; case S5M8767X: + case S2MPS14X: data[RTC_SEC] |= ALARM_ENABLE_MASK; data[RTC_MIN] |= ALARM_ENABLE_MASK; data[RTC_HOUR] |= ALARM_ENABLE_MASK; @@ -477,6 +522,7 @@ static int s5m_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) break; case S5M8767X: + case S2MPS14X: s5m8767_tm_to_data(&alrm->time, data); break; @@ -563,12 +609,26 @@ static int s5m8767_rtc_init_reg(struct s5m_rtc_info *info) u8 data[2]; int ret; - /* Set RTC control register : Binary mode, 24hour mode */ - data[0] = (1 << BCD_EN_SHIFT) | (1 << MODEL24_SHIFT); - data[1] = (0 << BCD_EN_SHIFT) | (1 << MODEL24_SHIFT); + switch (info->device_type) { + case S5M8763X: + case S5M8767X: + /* Set RTC control register : Binary mode, 24hour mode */ + data[0] = (1 << BCD_EN_SHIFT) | (1 << MODEL24_SHIFT); + data[1] = (0 << BCD_EN_SHIFT) | (1 << MODEL24_SHIFT); + + ret = regmap_raw_write(info->regmap, S5M_ALARM0_CONF, data, 2); + break; + + case S2MPS14X: + data[0] = (0 << BCD_EN_SHIFT) | (1 << MODEL24_SHIFT); + ret = regmap_write(info->regmap, info->regs->ctrl, data[0]); + break; + + default: + return -EINVAL; + } info->rtc_24hr_mode = 1; - ret = regmap_raw_write(info->regmap, S5M_ALARM0_CONF, data, 2); if (ret < 0) { dev_err(info->dev, "%s: fail to write controlm reg(%d)\n", __func__, ret); @@ -613,6 +673,12 @@ static int s5m_rtc_probe(struct platform_device *pdev) info->regs = &s5m_rtc_regs; break; + case S2MPS14X: + info->irq = regmap_irq_get_virq(s5m87xx->irq_data, + S2MPS14_IRQ_RTCA0); + info->regs = &s2mps_rtc_regs; + break; + default: ret = -EINVAL; dev_err(&pdev->dev, "Unsupported device type: %d\n", ret); @@ -697,7 +763,8 @@ static int s5m_rtc_suspend(struct device *dev) 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", 0 }, + { "s5m-rtc", S5M8767X }, + { "s2mps14-rtc", S2MPS14X }, }; static struct platform_driver s5m_rtc_driver = { @@ -715,6 +782,6 @@ module_platform_driver(s5m_rtc_driver); /* Module information */ MODULE_AUTHOR("Sangbeom Kim "); -MODULE_DESCRIPTION("Samsung S5M RTC driver"); +MODULE_DESCRIPTION("Samsung S5M/S2MPS14 RTC driver"); MODULE_LICENSE("GPL"); MODULE_ALIAS("platform:s5m-rtc");