Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp262940pxj; Tue, 18 May 2021 02:49:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBBrxHUeNKcVMRdo1D1bqTni5bCs01EaxMVpT5LeBvttP70gCmSS9SDwVbUgCaR47opk5l X-Received: by 2002:a17:906:a451:: with SMTP id cb17mr4923557ejb.510.1621331381104; Tue, 18 May 2021 02:49:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621331381; cv=none; d=google.com; s=arc-20160816; b=RWDt6Nl6FD2fVUKWCAY/9HcKCFHbD2J1Q2IpgIBWa/DKFzZe7t0MBi2+RXd/7nXc0P A3/T98HWfFGRZDeB3xpEBo0FFUkUhshC2/e4iXaplPlpuc6IkkHIRF6QRn6qe/fWxovK Vfv23r0KaQH4CtJ7tkh/zQBO68YzdD+jA2AOQ/9UaiKK60F2eQGYha07d+YlglhCY9Hn x+GUW0HOUQ3DpOgf1Iup326MBs/pFBN5+/7ofzHe/L9CIAF4V0ljUOZMkqqOYnMBkcMT IfgwgIKsm4RZPA0+3iWQj7pYr9c2XD4yvd+ipysngoLNUFHlj1JQU4b987CA/e0Y4lRj bCHQ== 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=c9Gx6wpmVvgy70YuG7rw/UhDt2DMCMnI/+9PdCCvv3Q=; b=msCS9jvAAEPazzfWUgB2LycDcOiIHPtwmwa53IGwnD17HHrSW+swfB/z9d9LxOGBLY Sdb+io4OAX2f0GjsmgqSiC0tMVBaKQHQgb17D/zhOcR8Mn4efmnq+egKNLyYSoehjrLd +TiCoEKdxY4hMBz+MixxGAw4Sxt/3u0BV4v3Vcp7OLFVSf79cmQZwGoQq/yCyC/XodfW 1e0v8/0htE5qRm+BAfipP8s7GOY6r0a/Uzt0WMgtgVvyF1lSzKvBl1ByyqZD2rgBhKl3 bANSNpApZTI4WEWXayPSvBHfhMCfNzwfPxYjKn8ex2UyQY2b0kYj3FFmKe7lTWqbrK06 +wFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NDg85qS2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u19si14594845edo.180.2021.05.18.02.49.17; Tue, 18 May 2021 02:49:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NDg85qS2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S243454AbhEQPKH (ORCPT + 99 others); Mon, 17 May 2021 11:10:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:59930 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241330AbhEQPAf (ORCPT ); Mon, 17 May 2021 11:00:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6815C619D4; Mon, 17 May 2021 14:26:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621261609; bh=dy/HUqn33uyjwkK/I4/+L9Yi7udlXE/KlqDEKweD/Ec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NDg85qS2opYcOJ6SLSeCgEBGFYrebF2f6022eFtW7LumOP1jG9QMdaUhBw013AoFl IvxaWcS0I5CYTU9ee/Lg443XhZZVweuwM6OItyrU5yOGl8gzh3xx/wr3IxDhhuxKZg wwpn6pDRlbN2ak9fn4OSLCaeNpyX/Y3q+9wZKYXM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nobuhiro Iwamatsu , Alexandre Belloni , Sasha Levin Subject: [PATCH 5.4 065/141] rtc: ds1307: Fix wday settings for rx8130 Date: Mon, 17 May 2021 16:01:57 +0200 Message-Id: <20210517140244.957688030@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517140242.729269392@linuxfoundation.org> References: <20210517140242.729269392@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nobuhiro Iwamatsu [ Upstream commit 204756f016726a380bafe619438ed979088bd04a ] rx8130 wday specifies the bit position, not BCD. Fixes: ee0981be7704 ("rtc: ds1307: Add support for Epson RX8130CE") Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Alexandre Belloni Link: https://lore.kernel.org/r/20210420023917.1949066-1-nobuhiro1.iwamatsu@toshiba.co.jp Signed-off-by: Sasha Levin --- drivers/rtc/rtc-ds1307.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index 1f7e8aefc1eb..99b93f56a2d5 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -265,7 +265,11 @@ static int ds1307_get_time(struct device *dev, struct rtc_time *t) t->tm_min = bcd2bin(regs[DS1307_REG_MIN] & 0x7f); tmp = regs[DS1307_REG_HOUR] & 0x3f; t->tm_hour = bcd2bin(tmp); - t->tm_wday = bcd2bin(regs[DS1307_REG_WDAY] & 0x07) - 1; + /* rx8130 is bit position, not BCD */ + if (ds1307->type == rx_8130) + t->tm_wday = fls(regs[DS1307_REG_WDAY] & 0x7f); + else + t->tm_wday = bcd2bin(regs[DS1307_REG_WDAY] & 0x07) - 1; t->tm_mday = bcd2bin(regs[DS1307_REG_MDAY] & 0x3f); tmp = regs[DS1307_REG_MONTH] & 0x1f; t->tm_mon = bcd2bin(tmp) - 1; @@ -312,7 +316,11 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t) regs[DS1307_REG_SECS] = bin2bcd(t->tm_sec); regs[DS1307_REG_MIN] = bin2bcd(t->tm_min); regs[DS1307_REG_HOUR] = bin2bcd(t->tm_hour); - regs[DS1307_REG_WDAY] = bin2bcd(t->tm_wday + 1); + /* rx8130 is bit position, not BCD */ + if (ds1307->type == rx_8130) + regs[DS1307_REG_WDAY] = 1 << t->tm_wday; + else + regs[DS1307_REG_WDAY] = bin2bcd(t->tm_wday + 1); regs[DS1307_REG_MDAY] = bin2bcd(t->tm_mday); regs[DS1307_REG_MONTH] = bin2bcd(t->tm_mon + 1); -- 2.30.2