From patchwork Thu May 31 09:18:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 137340 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp6356230lji; Thu, 31 May 2018 02:19:15 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJgKhp1GNPNwy3aKLzMarVssfIM+RDn9h3yt46ZUi8+W90sgMMHyr0uQ32DwyDYxKU/lfA7 X-Received: by 2002:a17:902:8218:: with SMTP id x24-v6mr6193903pln.57.1527758354952; Thu, 31 May 2018 02:19:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527758354; cv=none; d=google.com; s=arc-20160816; b=km0ctT8p2KET+2GEKaAA/8dQCdDWZbNDknmwAgjvfXKYyxbLpFvKfsX+QybjBTD0E7 nMVFDJu9jP6B6qsSP16p9bhdqtqrKJka/C/Ymc2u9BAklzkErH4gkfKEu/IsSNfaoXjV EUSiI2UonMhXW3hkYycqTvp4WZWZGHxIiUDHW3WG7Pef5ft/VfbOWHUfLMgqkUNTcuzf cu0Vj7BOvforP0x0KAcwBPfYQXlQCLK9tSwgHQmhgixnKQgsNI8ecvDbPxkWLKwzRhVD 6v98aMLdp30UMDcUlHQdKYNqUWfzByvfU7WHZsSZjGfY7kOC+zPky95EF+PphI3lgwf3 rxjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=DuugH3attZcgEUZwkNXxIeOqfa+cV/W10npfM3UnnbM=; b=eRP8cieAl/Johckg1D9EeUqcHYRjLtdGdM4Cbz41tDZm/dZo83hxCyf6NZnAfMcNAz F26mVlBXbzUE0ud2RcRxm5CCQo2Aa2kD4uWZ6YsLiLpQ/R9v+Oxk1Hz0jhTRvVeCroAI 5Y0XO2i784I1+pjgciPppen+TxUM/rPfLdKm0fv7SVEh0DjwRut1Y3tTA4fPu6YprLau A2t4utPBGdYbSYqd+fjOKER+SNqU9ZnV1a/MTInopCU8yR88GrTAPHU44ALXi1x45cdH C4rF9rIikAvgnTLh6fzNYw71LXQGIr9DM9ePaoBF7eilXOCgVKPyU1oTsT5xVA8ohyMl B7gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cxPT7oQy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b18-v6si20979662pgs.668.2018.05.31.02.19.11; Thu, 31 May 2018 02:19:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cxPT7oQy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754233AbeEaJTI (ORCPT + 30 others); Thu, 31 May 2018 05:19:08 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:45894 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754093AbeEaJTD (ORCPT ); Thu, 31 May 2018 05:19:03 -0400 Received: by mail-pl0-f66.google.com with SMTP id c23-v6so1576044plz.12 for ; Thu, 31 May 2018 02:19:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=DuugH3attZcgEUZwkNXxIeOqfa+cV/W10npfM3UnnbM=; b=cxPT7oQysKnlRbEEYfPaYPTJcBK8yHUMUZDPViBK5kqHJ3eAETP0HTTRodkFX9TXiA pkO+cya/0mEBGbTVku9GRIwjc42tcD0qX3su8aZZQeSVZzy+n0XbR3FSMBHd+zlU+3Xq 3vQf5HhboTqga6mNwwG5SXL+t8dTcxTEu0m1I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DuugH3attZcgEUZwkNXxIeOqfa+cV/W10npfM3UnnbM=; b=OUhVmvnXOK/ax+zoiRwA+rD4g9LgmXxKVxLpS6YsrSPnswQffHusOTSLdAAx29K7kV UQh/Hud4lXt+YGQXwOiRftGf3N8nc1T1jAj6L5I/fKAAK56ES68oG//Latn524SbXQli Soz5YWlzkx/gCwCZOqPI5jPZPJ9bNjoJ4P71lEHGFPv0iP4of5KMs3TGZCXiLuUVo8jc /ayz6oiDKX9y3x75hJvyfnnd6e/y8bk5L4c1b4dyrxfjLSo2CyMZoutDn3wr3TSVB2FE mhZDIXnbx8+pzgdil50faNcAyh8MJJdWagOLjYKRdEyX5udXxlqDRG2Bb4l5hStue1pS illw== X-Gm-Message-State: ALKqPwdj7xfXCwZ9o/WJcAn05UP5MjtbkSTM8pQL20oWLoOlSVA9lvDH mjNJiJ+rpiGBTyuEWxSkGbfMrLQPrSs= X-Received: by 2002:a17:902:9a98:: with SMTP id w24-v6mr6373673plp.9.1527758342597; Thu, 31 May 2018 02:19:02 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id s9-v6sm73860703pfa.141.2018.05.31.02.18.59 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 31 May 2018 02:19:02 -0700 (PDT) From: Baolin Wang To: a.zummo@towertech.it, alexandre.belloni@bootlin.com Cc: broonie@kernel.org, linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org, baolin.wang@linaro.org Subject: [PATCH] rtc: sprd: Add new RTC power down check method Date: Thu, 31 May 2018 17:18:08 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We should use the new method to check if RTC was powered down, which is more solid. Since we have introduced power control and power status registers, and we just check if the power status is the default value (0x96), if yes that means the RTC has been powered down. Meanwhile We can set the power control register to be one valid value to change the power status to indicate RTC device is valid now. Signed-off-by: Baolin Wang --- drivers/rtc/rtc-sc27xx.c | 47 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) -- 1.7.9.5 diff --git a/drivers/rtc/rtc-sc27xx.c b/drivers/rtc/rtc-sc27xx.c index 6a3876e..deea5c3 100644 --- a/drivers/rtc/rtc-sc27xx.c +++ b/drivers/rtc/rtc-sc27xx.c @@ -35,6 +35,8 @@ #define SPRD_RTC_DAY_ALM_VALUE 0x4c #define SPRD_RTC_SPG_VALUE 0x50 #define SPRD_RTC_SPG_UPD 0x54 +#define SPRD_RTC_PWR_CTRL 0x58 +#define SPRD_RTC_PWR_STS 0x5c #define SPRD_RTC_SEC_AUXALM_UPD 0x60 #define SPRD_RTC_MIN_AUXALM_UPD 0x64 #define SPRD_RTC_HOUR_AUXALM_UPD 0x68 @@ -86,7 +88,13 @@ /* SPG values definition for SPRD_RTC_SPG_UPD register */ #define SPRD_RTC_POWEROFF_ALM_FLAG BIT(8) -#define SPRD_RTC_POWER_RESET_FLAG BIT(9) + +/* power control/status definition */ +#define SPRD_RTC_POWER_RESET_VALUE 0x96 +#define SPRD_RTC_POWER_STS_CLEAR GENMASK(7, 0) +#define SPRD_RTC_POWER_STS_SHIFT 8 +#define SPRD_RTC_POWER_STS_VALID \ + (~SPRD_RTC_POWER_RESET_VALUE << SPRD_RTC_POWER_STS_SHIFT) /* timeout of synchronizing time and alarm registers (us) */ #define SPRD_RTC_POLL_TIMEOUT 200000 @@ -383,7 +391,6 @@ static int sprd_rtc_set_time(struct device *dev, struct rtc_time *tm) { struct sprd_rtc *rtc = dev_get_drvdata(dev); time64_t secs = rtc_tm_to_time64(tm); - u32 val; int ret; ret = sprd_rtc_set_secs(rtc, SPRD_RTC_TIME, secs); @@ -391,27 +398,20 @@ static int sprd_rtc_set_time(struct device *dev, struct rtc_time *tm) return ret; if (!rtc->valid) { - /* - * Set SPRD_RTC_POWER_RESET_FLAG to indicate now RTC has valid - * time values. - */ - ret = regmap_update_bits(rtc->regmap, - rtc->base + SPRD_RTC_SPG_UPD, - SPRD_RTC_POWER_RESET_FLAG, - SPRD_RTC_POWER_RESET_FLAG); + /* Clear RTC power status firstly */ + ret = regmap_write(rtc->regmap, rtc->base + SPRD_RTC_PWR_CTRL, + SPRD_RTC_POWER_STS_CLEAR); if (ret) return ret; - ret = regmap_read_poll_timeout(rtc->regmap, - rtc->base + SPRD_RTC_INT_RAW_STS, - val, (val & SPRD_RTC_SPG_UPD_EN), - SPRD_RTC_POLL_DELAY_US, - SPRD_RTC_POLL_TIMEOUT); - if (ret) { - dev_err(rtc->dev, "failed to update SPG value:%d\n", - ret); + /* + * Set RTC power status to indicate now RTC has valid time + * values. + */ + ret = regmap_write(rtc->regmap, rtc->base + SPRD_RTC_PWR_CTRL, + SPRD_RTC_POWER_STS_VALID); + if (ret) return ret; - } rtc->valid = true; } @@ -562,15 +562,16 @@ static int sprd_rtc_check_power_down(struct sprd_rtc *rtc) u32 val; int ret; - ret = regmap_read(rtc->regmap, rtc->base + SPRD_RTC_SPG_VALUE, &val); + ret = regmap_read(rtc->regmap, rtc->base + SPRD_RTC_PWR_STS, &val); if (ret) return ret; /* - * If the SPRD_RTC_POWER_RESET_FLAG was not set, which means the RTC has - * been powered down, so the RTC time values are invalid. + * If the RTC power status value is SPRD_RTC_POWER_RESET_VALUE, which + * means the RTC has been powered down, so the RTC time values are + * invalid. */ - rtc->valid = (val & SPRD_RTC_POWER_RESET_FLAG) ? true : false; + rtc->valid = val == SPRD_RTC_POWER_RESET_VALUE ? false : true; return 0; }