Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp2865403rwb; Mon, 15 Aug 2022 12:54:39 -0700 (PDT) X-Google-Smtp-Source: AA6agR4U3SI4n9+jGY+N09R3fv9BC0uz/xfcqHETa0Vnf5fNKx5qSBcmgQlMCTzsLBiDuCOTNXzB X-Received: by 2002:a17:90a:eb0f:b0:1f5:1017:5928 with SMTP id j15-20020a17090aeb0f00b001f510175928mr19803878pjz.62.1660593278847; Mon, 15 Aug 2022 12:54:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660593278; cv=none; d=google.com; s=arc-20160816; b=BghvYhhxVVJP0MVcVEZPvAW7QW06zwhAtsxE7wFAOUPrPkcOeMz9u+myXygGuu2G/L +Ueb03bhbEf0hpfF1qnECPkgNsQ/2zVUl1++9GhZYuDM+6vLn32aeOZrVwiR885jmAMO yxbZLwbCJDLL6ovXTLwLpJNQ0DMiG4spnaAMT83907YU3nPUZHHcrfPgdZTjskuJBUIT GJQwzsQdC5UsPfa2IQmakSKyhj6wr9EE1QrZiQFigPxB1KFNfWvrkeGWJXdGZGF0Y6nX x2gv6Onld/hxDaDVaY2N54hMXSvxqFztZIPpOOl+9sMRLg2Q/WKuqfkiOrF2mzEhoTT/ qkjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Rc8dzYPQLj+rK3eYuW6IikimOLO8YaFmmaq6PPP0jKU=; b=jtrEo4lwvP/vmDkJ2Aii0wQoHvFupC78THXJsUfpJezyR9V3hT7aMHBmi67sBgLXvA ZsxIfeC4xcYX4ksORzd+0bvkA49zgggHP0mnnPqsI52Cc4iNbEiCDAivY7Wf4doY5z0D 0aGEGPs1qv9qxDbnqtcSb7OwZSVMgeoI+zODRWUq57uxh2rWXWuuQiFnV3QI5Aeay547 4u2jCE/DMWuRqOWQjfOMfAWCqCZMuXoTVUsH/9Phoyg2l80L1Z92aXdTKAOgkbTNBtik I8pvbnuEwFeJZDfhapkdKOCxLGBJgutNoBpE4BCXClO3skDCGwv7cA5BpASiGVxHOhY6 XgRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hfAEZ3df; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n55-20020a056a000d7700b0052e57ed915asi10924286pfv.233.2022.08.15.12.54.27; Mon, 15 Aug 2022 12:54:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hfAEZ3df; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241326AbiHOSXn (ORCPT + 99 others); Mon, 15 Aug 2022 14:23:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241190AbiHOSXF (ORCPT ); Mon, 15 Aug 2022 14:23:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D7212E68F; Mon, 15 Aug 2022 11:17:36 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DB8756068B; Mon, 15 Aug 2022 18:17:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE4DAC43140; Mon, 15 Aug 2022 18:17:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660587449; bh=IhqksPl1KYAQAVAET5nDQDJCIw682MKRVpMsjDjajAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hfAEZ3dfGRI6de5SThAcQS6iNT1ThMOm2Q/SEby1WDKlMhlrIWN50bJVc8/K9yTk6 l7oRFEOI44uiqnjndnHAAVbFOxs4eZz1nXq3Pc1Hghw9AaTZtShdJfWzZeLJbeG//3 kV1b5NN6TyKFknvph6sdQggmJBFOGxgiBlca5aNU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mathew McBride , Alexandre Belloni Subject: [PATCH 5.15 059/779] rtc: rx8025: fix 12/24 hour mode detection on RX-8035 Date: Mon, 15 Aug 2022 19:55:03 +0200 Message-Id: <20220815180339.777547800@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180337.130757997@linuxfoundation.org> References: <20220815180337.130757997@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mathew McBride commit 71af91565052214ad86f288e0d8ffb165f790995 upstream. The 12/24hr flag in the RX-8035 can be found in the hour register, instead of the CTRL1 on the RX-8025. This was overlooked when support for the RX-8035 was added, and was causing read errors when the hour register 'overflowed'. To deal with the relevant register not always being visible in the relevant functions, determine the 12/24 mode at startup and store it in the driver state. Signed-off-by: Mathew McBride Fixes: f120e2e33ac8 ("rtc: rx8025: implement RX-8035 support") Cc: stable@vger.kernel.org Signed-off-by: Alexandre Belloni Link: https://lore.kernel.org/r/20220706074236.24011-1-matt@traverse.com.au Signed-off-by: Greg Kroah-Hartman --- drivers/rtc/rtc-rx8025.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) --- a/drivers/rtc/rtc-rx8025.c +++ b/drivers/rtc/rtc-rx8025.c @@ -55,6 +55,8 @@ #define RX8025_BIT_CTRL2_XST BIT(5) #define RX8025_BIT_CTRL2_VDET BIT(6) +#define RX8035_BIT_HOUR_1224 BIT(7) + /* Clock precision adjustment */ #define RX8025_ADJ_RESOLUTION 3050 /* in ppb */ #define RX8025_ADJ_DATA_MAX 62 @@ -78,6 +80,7 @@ struct rx8025_data { struct rtc_device *rtc; enum rx_model model; u8 ctrl1; + int is_24; }; static s32 rx8025_read_reg(const struct i2c_client *client, u8 number) @@ -226,7 +229,7 @@ static int rx8025_get_time(struct device dt->tm_sec = bcd2bin(date[RX8025_REG_SEC] & 0x7f); dt->tm_min = bcd2bin(date[RX8025_REG_MIN] & 0x7f); - if (rx8025->ctrl1 & RX8025_BIT_CTRL1_1224) + if (rx8025->is_24) dt->tm_hour = bcd2bin(date[RX8025_REG_HOUR] & 0x3f); else dt->tm_hour = bcd2bin(date[RX8025_REG_HOUR] & 0x1f) % 12 @@ -257,7 +260,7 @@ static int rx8025_set_time(struct device */ date[RX8025_REG_SEC] = bin2bcd(dt->tm_sec); date[RX8025_REG_MIN] = bin2bcd(dt->tm_min); - if (rx8025->ctrl1 & RX8025_BIT_CTRL1_1224) + if (rx8025->is_24) date[RX8025_REG_HOUR] = bin2bcd(dt->tm_hour); else date[RX8025_REG_HOUR] = (dt->tm_hour >= 12 ? 0x20 : 0) @@ -282,6 +285,7 @@ static int rx8025_init_client(struct i2c struct rx8025_data *rx8025 = i2c_get_clientdata(client); u8 ctrl[2], ctrl2; int need_clear = 0; + int hour_reg; int err; err = rx8025_read_regs(client, RX8025_REG_CTRL1, 2, ctrl); @@ -306,6 +310,16 @@ static int rx8025_init_client(struct i2c err = rx8025_write_reg(client, RX8025_REG_CTRL2, ctrl2); } + + if (rx8025->model == model_rx_8035) { + /* In RX-8035, 12/24 flag is in the hour register */ + hour_reg = rx8025_read_reg(client, RX8025_REG_HOUR); + if (hour_reg < 0) + return hour_reg; + rx8025->is_24 = (hour_reg & RX8035_BIT_HOUR_1224); + } else { + rx8025->is_24 = (ctrl[1] & RX8025_BIT_CTRL1_1224); + } out: return err; } @@ -335,7 +349,7 @@ static int rx8025_read_alarm(struct devi /* Hardware alarms precision is 1 minute! */ t->time.tm_sec = 0; t->time.tm_min = bcd2bin(ald[0] & 0x7f); - if (rx8025->ctrl1 & RX8025_BIT_CTRL1_1224) + if (rx8025->is_24) t->time.tm_hour = bcd2bin(ald[1] & 0x3f); else t->time.tm_hour = bcd2bin(ald[1] & 0x1f) % 12 @@ -370,7 +384,7 @@ static int rx8025_set_alarm(struct devic } ald[0] = bin2bcd(t->time.tm_min); - if (rx8025->ctrl1 & RX8025_BIT_CTRL1_1224) + if (rx8025->is_24) ald[1] = bin2bcd(t->time.tm_hour); else ald[1] = (t->time.tm_hour >= 12 ? 0x20 : 0)