From nobody Mon Apr 6 06:12:16 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D74AECAAA1 for ; Fri, 9 Sep 2022 17:56:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232043AbiIIRz7 (ORCPT ); Fri, 9 Sep 2022 13:55:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230280AbiIIRzf (ORCPT ); Fri, 9 Sep 2022 13:55:35 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 824AEA6AF3; Fri, 9 Sep 2022 10:55:33 -0700 (PDT) Received: from jupiter.universe (dyndsl-095-033-168-128.ewe-ip-backbone.de [95.33.168.128]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: sre) by madras.collabora.co.uk (Postfix) with ESMTPSA id E2A7E6601FD5; Fri, 9 Sep 2022 18:55:30 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1662746131; bh=X3yfj13to2tg/D84twn9byIRBMZ9DxelBTecqBK6ZEM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=grnBPc6gZsmmKZT/6mEFxGsNGBdG6q+FRyg2ll/EpY2dbfBYz4TJr3IeWDeATDqFS m1YFpK8AzTWJVMAAYfYXIWs1nRyFe9YJrcL88w3WHiu0aItzMZm2JZG5I8NvrOQdXS uRK+mxzoTBrDJnLEvj24OhgZYEXEEmQO3nbIft9yMC7/utKVi38fo7PqHWkfPLIXxo jv50ogJIxKxxfOyJ2UTLn7JFfzyWwDafmYsEzPy9kSjmSyO85YNKIIZwHG1P/AjEap oYrQyAK7gbe9ljy8EDa/9BInQxmMtVM9HLyPue84DIREkVAxzoHpesvRm4r/ih/taB r8PEKwBrRl6+w== Received: by jupiter.universe (Postfix, from userid 1000) id 1D042480170; Fri, 9 Sep 2022 19:55:27 +0200 (CEST) From: Sebastian Reichel To: Heiko Stuebner , Rob Herring , Krzysztof Kozlowski , Lee Jones Cc: Michael Turquette , Stephen Boyd , Linus Walleij , Mark Brown , Liam Girdwood , Alexandre Belloni , Alessandro Zummo , linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , kernel@collabora.com Subject: [PATCHv3 05/14] rtc: rk808: reduce 'struct rk808' usage Date: Fri, 9 Sep 2022 19:55:13 +0200 Message-Id: <20220909175522.179175-6-sebastian.reichel@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220909175522.179175-1-sebastian.reichel@collabora.com> References: <20220909175522.179175-1-sebastian.reichel@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Reduce usage of 'struct rk808' (driver data of the parent MFD), so that only the chip variant field is still being accessed directly. This allows restructuring the MFD driver to support SPI based PMICs. Acked-by: Alexandre Belloni Signed-off-by: Sebastian Reichel --- drivers/rtc/rtc-rk808.c | 47 ++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/drivers/rtc/rtc-rk808.c b/drivers/rtc/rtc-rk808.c index e920da8c08da..2d9bcb3ce1e3 100644 --- a/drivers/rtc/rtc-rk808.c +++ b/drivers/rtc/rtc-rk808.c @@ -14,7 +14,6 @@ #include #include #include -#include =20 /* RTC_CTRL_REG bitfields */ #define BIT_RTC_CTRL_REG_STOP_RTC_M BIT(0) @@ -51,7 +50,7 @@ struct rk_rtc_compat_reg { }; =20 struct rk808_rtc { - struct rk808 *rk808; + struct regmap *regmap; struct rtc_device *rtc; struct rk_rtc_compat_reg *creg; int irq; @@ -97,12 +96,11 @@ static void gregorian_to_rockchip(struct rtc_time *tm) static int rk808_rtc_readtime(struct device *dev, struct rtc_time *tm) { struct rk808_rtc *rk808_rtc =3D dev_get_drvdata(dev); - struct rk808 *rk808 =3D rk808_rtc->rk808; u8 rtc_data[NUM_TIME_REGS]; int ret; =20 /* Force an update of the shadowed registers right now */ - ret =3D regmap_update_bits(rk808->regmap, rk808_rtc->creg->ctrl_reg, + ret =3D regmap_update_bits(rk808_rtc->regmap, rk808_rtc->creg->ctrl_reg, BIT_RTC_CTRL_REG_RTC_GET_TIME, BIT_RTC_CTRL_REG_RTC_GET_TIME); if (ret) { @@ -116,7 +114,7 @@ static int rk808_rtc_readtime(struct device *dev, struc= t rtc_time *tm) * 32khz. If we clear the GET_TIME bit here, the time of i2c transfer * certainly more than 31.25us: 16 * 2.5us at 400kHz bus frequency. */ - ret =3D regmap_update_bits(rk808->regmap, rk808_rtc->creg->ctrl_reg, + ret =3D regmap_update_bits(rk808_rtc->regmap, rk808_rtc->creg->ctrl_reg, BIT_RTC_CTRL_REG_RTC_GET_TIME, 0); if (ret) { @@ -124,7 +122,7 @@ static int rk808_rtc_readtime(struct device *dev, struc= t rtc_time *tm) return ret; } =20 - ret =3D regmap_bulk_read(rk808->regmap, rk808_rtc->creg->seconds_reg, + ret =3D regmap_bulk_read(rk808_rtc->regmap, rk808_rtc->creg->seconds_reg, rtc_data, NUM_TIME_REGS); if (ret) { dev_err(dev, "Failed to bulk read rtc_data: %d\n", ret); @@ -148,7 +146,6 @@ static int rk808_rtc_readtime(struct device *dev, struc= t rtc_time *tm) static int rk808_rtc_set_time(struct device *dev, struct rtc_time *tm) { struct rk808_rtc *rk808_rtc =3D dev_get_drvdata(dev); - struct rk808 *rk808 =3D rk808_rtc->rk808; u8 rtc_data[NUM_TIME_REGS]; int ret; =20 @@ -163,7 +160,7 @@ static int rk808_rtc_set_time(struct device *dev, struc= t rtc_time *tm) rtc_data[6] =3D bin2bcd(tm->tm_wday); =20 /* Stop RTC while updating the RTC registers */ - ret =3D regmap_update_bits(rk808->regmap, rk808_rtc->creg->ctrl_reg, + ret =3D regmap_update_bits(rk808_rtc->regmap, rk808_rtc->creg->ctrl_reg, BIT_RTC_CTRL_REG_STOP_RTC_M, BIT_RTC_CTRL_REG_STOP_RTC_M); if (ret) { @@ -171,14 +168,14 @@ static int rk808_rtc_set_time(struct device *dev, str= uct rtc_time *tm) return ret; } =20 - ret =3D regmap_bulk_write(rk808->regmap, rk808_rtc->creg->seconds_reg, + ret =3D regmap_bulk_write(rk808_rtc->regmap, rk808_rtc->creg->seconds_reg, rtc_data, NUM_TIME_REGS); if (ret) { dev_err(dev, "Failed to bull write rtc_data: %d\n", ret); return ret; } /* Start RTC again */ - ret =3D regmap_update_bits(rk808->regmap, rk808_rtc->creg->ctrl_reg, + ret =3D regmap_update_bits(rk808_rtc->regmap, rk808_rtc->creg->ctrl_reg, BIT_RTC_CTRL_REG_STOP_RTC_M, 0); if (ret) { dev_err(dev, "Failed to update RTC control: %d\n", ret); @@ -191,12 +188,11 @@ static int rk808_rtc_set_time(struct device *dev, str= uct rtc_time *tm) static int rk808_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) { struct rk808_rtc *rk808_rtc =3D dev_get_drvdata(dev); - struct rk808 *rk808 =3D rk808_rtc->rk808; u8 alrm_data[NUM_ALARM_REGS]; uint32_t int_reg; int ret; =20 - ret =3D regmap_bulk_read(rk808->regmap, + ret =3D regmap_bulk_read(rk808_rtc->regmap, rk808_rtc->creg->alarm_seconds_reg, alrm_data, NUM_ALARM_REGS); if (ret) { @@ -212,7 +208,7 @@ static int rk808_rtc_readalarm(struct device *dev, stru= ct rtc_wkalrm *alrm) alrm->time.tm_year =3D (bcd2bin(alrm_data[5] & YEARS_REG_MSK)) + 100; rockchip_to_gregorian(&alrm->time); =20 - ret =3D regmap_read(rk808->regmap, rk808_rtc->creg->int_reg, &int_reg); + ret =3D regmap_read(rk808_rtc->regmap, rk808_rtc->creg->int_reg, &int_reg= ); if (ret) { dev_err(dev, "Failed to read RTC INT REG: %d\n", ret); return ret; @@ -228,10 +224,9 @@ static int rk808_rtc_readalarm(struct device *dev, str= uct rtc_wkalrm *alrm) =20 static int rk808_rtc_stop_alarm(struct rk808_rtc *rk808_rtc) { - struct rk808 *rk808 =3D rk808_rtc->rk808; int ret; =20 - ret =3D regmap_update_bits(rk808->regmap, rk808_rtc->creg->int_reg, + ret =3D regmap_update_bits(rk808_rtc->regmap, rk808_rtc->creg->int_reg, BIT_RTC_INTERRUPTS_REG_IT_ALARM_M, 0); =20 return ret; @@ -239,10 +234,9 @@ static int rk808_rtc_stop_alarm(struct rk808_rtc *rk80= 8_rtc) =20 static int rk808_rtc_start_alarm(struct rk808_rtc *rk808_rtc) { - struct rk808 *rk808 =3D rk808_rtc->rk808; int ret; =20 - ret =3D regmap_update_bits(rk808->regmap, rk808_rtc->creg->int_reg, + ret =3D regmap_update_bits(rk808_rtc->regmap, rk808_rtc->creg->int_reg, BIT_RTC_INTERRUPTS_REG_IT_ALARM_M, BIT_RTC_INTERRUPTS_REG_IT_ALARM_M); =20 @@ -252,7 +246,6 @@ static int rk808_rtc_start_alarm(struct rk808_rtc *rk80= 8_rtc) static int rk808_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) { struct rk808_rtc *rk808_rtc =3D dev_get_drvdata(dev); - struct rk808 *rk808 =3D rk808_rtc->rk808; u8 alrm_data[NUM_ALARM_REGS]; int ret; =20 @@ -272,7 +265,7 @@ static int rk808_rtc_setalarm(struct device *dev, struc= t rtc_wkalrm *alrm) alrm_data[4] =3D bin2bcd(alrm->time.tm_mon + 1); alrm_data[5] =3D bin2bcd(alrm->time.tm_year - 100); =20 - ret =3D regmap_bulk_write(rk808->regmap, + ret =3D regmap_bulk_write(rk808_rtc->regmap, rk808_rtc->creg->alarm_seconds_reg, alrm_data, NUM_ALARM_REGS); if (ret) { @@ -313,20 +306,18 @@ static int rk808_rtc_alarm_irq_enable(struct device *= dev, static irqreturn_t rk808_alarm_irq(int irq, void *data) { struct rk808_rtc *rk808_rtc =3D data; - struct rk808 *rk808 =3D rk808_rtc->rk808; - struct i2c_client *client =3D rk808->i2c; int ret; =20 - ret =3D regmap_write(rk808->regmap, rk808_rtc->creg->status_reg, + ret =3D regmap_write(rk808_rtc->regmap, rk808_rtc->creg->status_reg, RTC_STATUS_MASK); if (ret) { - dev_err(&client->dev, + dev_err(&rk808_rtc->rtc->dev, "%s:Failed to update RTC status: %d\n", __func__, ret); return ret; } =20 rtc_update_irq(rk808_rtc->rtc, 1, RTC_IRQF | RTC_AF); - dev_dbg(&client->dev, + dev_dbg(&rk808_rtc->rtc->dev, "%s:irq=3D%d\n", __func__, irq); return IRQ_HANDLED; } @@ -404,10 +395,12 @@ static int rk808_rtc_probe(struct platform_device *pd= ev) break; } platform_set_drvdata(pdev, rk808_rtc); - rk808_rtc->rk808 =3D rk808; + rk808_rtc->regmap =3D dev_get_regmap(pdev->dev.parent, NULL); + if (!rk808_rtc->regmap) + return -ENODEV; =20 /* start rtc running by default, and use shadowed timer. */ - ret =3D regmap_update_bits(rk808->regmap, rk808_rtc->creg->ctrl_reg, + ret =3D regmap_update_bits(rk808_rtc->regmap, rk808_rtc->creg->ctrl_reg, BIT_RTC_CTRL_REG_STOP_RTC_M | BIT_RTC_CTRL_REG_RTC_READSEL_M, BIT_RTC_CTRL_REG_RTC_READSEL_M); @@ -417,7 +410,7 @@ static int rk808_rtc_probe(struct platform_device *pdev) return ret; } =20 - ret =3D regmap_write(rk808->regmap, rk808_rtc->creg->status_reg, + ret =3D regmap_write(rk808_rtc->regmap, rk808_rtc->creg->status_reg, RTC_STATUS_MASK); if (ret) { dev_err(&pdev->dev, --=20 2.35.1