From mboxrd@z Thu Jan 1 00:00:00 1970 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 4DED1ECAAD3 for ; Mon, 5 Sep 2022 19:48:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232037AbiIETsr (ORCPT ); Mon, 5 Sep 2022 15:48:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231146AbiIETsk (ORCPT ); Mon, 5 Sep 2022 15:48:40 -0400 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B42F852448; Mon, 5 Sep 2022 12:48:37 -0700 (PDT) Received: (Authenticated sender: alexandre.belloni@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 78001240002; Mon, 5 Sep 2022 19:48:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1662407316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ah8jhfH/D4OHctEuafBp7keddC3pHmg23KQPpgxMUeI=; b=jhHYq4+I9MSB+Ly1n8jyvSuHllpQTiPzXiRw7MElH5ucKMXCO1FybW1iqz12PkpJSEtaUa Ioa7L310FqZo/cJQS15pbBoFkyOCDFRZwPtEA39JoOEFplwNY0yrcgy8OEIPga4lUmWHel C081uf7a22GVboVyOGSGBDqMk6GW3caWUjL4BW8H7xEEaNbciyw3dYTNz4ITUHfa39URt/ scZd13aBniiuqa+DHsVqBktKjASze0JIfsglGLvIm2crvHpE0XND795yG0wvqb7R3S5smk pJm7VHicH6Pt7dlxstGqQRLNVkoE0BYEPOM1x6nB3wA9MAKnjOVT2b7A5KAivA== Date: Mon, 5 Sep 2022 21:48:34 +0200 From: Alexandre Belloni To: Sebastian Reichel Cc: Heiko Stuebner , Rob Herring , Krzysztof Kozlowski , Lee Jones , Michael Turquette , Stephen Boyd , Linus Walleij , Mark Brown , Liam Girdwood , Alessandro Zummo , linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@collabora.com Subject: Re: [PATCH 05/13] rtc: rk808: reduce 'struct rk808' usage Message-ID: References: <20220831215437.117880-1-sebastian.reichel@collabora.com> <20220831215437.117880-6-sebastian.reichel@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220831215437.117880-6-sebastian.reichel@collabora.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 31/08/2022 23:54:29+0200, Sebastian Reichel wrote: > 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. > > Signed-off-by: Sebastian Reichel Acked-by: Alexandre Belloni > --- > 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 > > /* RTC_CTRL_REG bitfields */ > #define BIT_RTC_CTRL_REG_STOP_RTC_M BIT(0) > @@ -51,7 +50,7 @@ struct rk_rtc_compat_reg { > }; > > 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 = dev_get_drvdata(dev); > - struct rk808 *rk808 = rk808_rtc->rk808; > u8 rtc_data[NUM_TIME_REGS]; > int ret; > > /* Force an update of the shadowed registers right now */ > - ret = regmap_update_bits(rk808->regmap, rk808_rtc->creg->ctrl_reg, > + ret = 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, struct 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 = regmap_update_bits(rk808->regmap, rk808_rtc->creg->ctrl_reg, > + ret = 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, struct rtc_time *tm) > return ret; > } > > - ret = regmap_bulk_read(rk808->regmap, rk808_rtc->creg->seconds_reg, > + ret = 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, struct rtc_time *tm) > static int rk808_rtc_set_time(struct device *dev, struct rtc_time *tm) > { > struct rk808_rtc *rk808_rtc = dev_get_drvdata(dev); > - struct rk808 *rk808 = rk808_rtc->rk808; > u8 rtc_data[NUM_TIME_REGS]; > int ret; > > @@ -163,7 +160,7 @@ static int rk808_rtc_set_time(struct device *dev, struct rtc_time *tm) > rtc_data[6] = bin2bcd(tm->tm_wday); > > /* Stop RTC while updating the RTC registers */ > - ret = regmap_update_bits(rk808->regmap, rk808_rtc->creg->ctrl_reg, > + ret = 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, struct rtc_time *tm) > return ret; > } > > - ret = regmap_bulk_write(rk808->regmap, rk808_rtc->creg->seconds_reg, > + ret = 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 = regmap_update_bits(rk808->regmap, rk808_rtc->creg->ctrl_reg, > + ret = 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, struct rtc_time *tm) > static int rk808_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) > { > struct rk808_rtc *rk808_rtc = dev_get_drvdata(dev); > - struct rk808 *rk808 = rk808_rtc->rk808; > u8 alrm_data[NUM_ALARM_REGS]; > uint32_t int_reg; > int ret; > > - ret = regmap_bulk_read(rk808->regmap, > + ret = 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, struct rtc_wkalrm *alrm) > alrm->time.tm_year = (bcd2bin(alrm_data[5] & YEARS_REG_MSK)) + 100; > rockchip_to_gregorian(&alrm->time); > > - ret = regmap_read(rk808->regmap, rk808_rtc->creg->int_reg, &int_reg); > + ret = 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, struct rtc_wkalrm *alrm) > > static int rk808_rtc_stop_alarm(struct rk808_rtc *rk808_rtc) > { > - struct rk808 *rk808 = rk808_rtc->rk808; > int ret; > > - ret = regmap_update_bits(rk808->regmap, rk808_rtc->creg->int_reg, > + ret = regmap_update_bits(rk808_rtc->regmap, rk808_rtc->creg->int_reg, > BIT_RTC_INTERRUPTS_REG_IT_ALARM_M, 0); > > return ret; > @@ -239,10 +234,9 @@ static int rk808_rtc_stop_alarm(struct rk808_rtc *rk808_rtc) > > static int rk808_rtc_start_alarm(struct rk808_rtc *rk808_rtc) > { > - struct rk808 *rk808 = rk808_rtc->rk808; > int ret; > > - ret = regmap_update_bits(rk808->regmap, rk808_rtc->creg->int_reg, > + ret = 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); > > @@ -252,7 +246,6 @@ static int rk808_rtc_start_alarm(struct rk808_rtc *rk808_rtc) > static int rk808_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) > { > struct rk808_rtc *rk808_rtc = dev_get_drvdata(dev); > - struct rk808 *rk808 = rk808_rtc->rk808; > u8 alrm_data[NUM_ALARM_REGS]; > int ret; > > @@ -272,7 +265,7 @@ static int rk808_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) > alrm_data[4] = bin2bcd(alrm->time.tm_mon + 1); > alrm_data[5] = bin2bcd(alrm->time.tm_year - 100); > > - ret = regmap_bulk_write(rk808->regmap, > + ret = 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 = data; > - struct rk808 *rk808 = rk808_rtc->rk808; > - struct i2c_client *client = rk808->i2c; > int ret; > > - ret = regmap_write(rk808->regmap, rk808_rtc->creg->status_reg, > + ret = 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; > } > > rtc_update_irq(rk808_rtc->rtc, 1, RTC_IRQF | RTC_AF); > - dev_dbg(&client->dev, > + dev_dbg(&rk808_rtc->rtc->dev, > "%s:irq=%d\n", __func__, irq); > return IRQ_HANDLED; > } > @@ -404,10 +395,12 @@ static int rk808_rtc_probe(struct platform_device *pdev) > break; > } > platform_set_drvdata(pdev, rk808_rtc); > - rk808_rtc->rk808 = rk808; > + rk808_rtc->regmap = dev_get_regmap(pdev->dev.parent, NULL); > + if (!rk808_rtc->regmap) > + return -ENODEV; > > /* start rtc running by default, and use shadowed timer. */ > - ret = regmap_update_bits(rk808->regmap, rk808_rtc->creg->ctrl_reg, > + ret = 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; > } > > - ret = regmap_write(rk808->regmap, rk808_rtc->creg->status_reg, > + ret = regmap_write(rk808_rtc->regmap, rk808_rtc->creg->status_reg, > RTC_STATUS_MASK); > if (ret) { > dev_err(&pdev->dev, > -- > 2.35.1 > -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com