From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751907AbcLENMG (ORCPT ); Mon, 5 Dec 2016 08:12:06 -0500 Received: from mail-qt0-f193.google.com ([209.85.216.193]:35556 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751741AbcLENMA (ORCPT ); Mon, 5 Dec 2016 08:12:00 -0500 From: Emil Bartczak To: a.zummo@towertech.it Cc: alexandre.belloni@free-electrons.com, rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org, Emil Bartczak Subject: [PATCH 2/4] rtc: mcp795: fix time range difference between linux and RTC chip Date: Mon, 5 Dec 2016 14:11:51 +0100 Message-Id: <392135d01f90d405b3b5aceb6bcbb51ccf1be378.1480939487.git.emilbart@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In linux rtc_time struct, tm_mon range is 0~11, while in RTC HW REG, month range is 1~12. This patch adjusts difference of them. --- drivers/rtc/rtc-mcp795.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/rtc/rtc-mcp795.c b/drivers/rtc/rtc-mcp795.c index 266328b..d15072c 100644 --- a/drivers/rtc/rtc-mcp795.c +++ b/drivers/rtc/rtc-mcp795.c @@ -96,6 +96,7 @@ static int mcp795_rtcc_set_bits(struct device *dev, u8 addr, u8 mask, u8 state) static int mcp795_set_time(struct device *dev, struct rtc_time *tim) { + int month; int ret; u8 data[7]; @@ -109,8 +110,9 @@ static int mcp795_set_time(struct device *dev, struct rtc_time *tim) data[1] = (data[1] & 0x80) | ((tim->tm_min / 10) << 4) | (tim->tm_min % 10); data[2] = ((tim->tm_hour / 10) << 4) | (tim->tm_hour % 10); data[4] = ((tim->tm_mday / 10) << 4) | ((tim->tm_mday) % 10); + month = tim->tm_mon + 1; data[5] = (data[5] & MCP795_LP_BIT) | - ((tim->tm_mon / 10) << 4) | (tim->tm_mon % 10); + ((month / 10) << 4) | (month % 10); if (tim->tm_year > 100) tim->tm_year -= 100; @@ -143,7 +145,7 @@ static int mcp795_read_time(struct device *dev, struct rtc_time *tim) tim->tm_min = ((data[1] & 0x70) >> 4) * 10 + (data[1] & 0x0f); tim->tm_hour = ((data[2] & 0x30) >> 4) * 10 + (data[2] & 0x0f); tim->tm_mday = ((data[4] & 0x30) >> 4) * 10 + (data[4] & 0x0f); - tim->tm_mon = ((data[5] & 0x10) >> 4) * 10 + (data[5] & 0x0f); + tim->tm_mon = ((data[5] & 0x10) >> 4) * 10 + (data[5] & 0x0f) - 1; tim->tm_year = ((data[6] & 0xf0) >> 4) * 10 + (data[6] & 0x0f) + 100; /* Assume we are in 20xx */ dev_dbg(dev, "Read from mcp795: %04d-%02d-%02d %02d:%02d:%02d\n", -- 2.7.4