From: Alexandre Belloni <alexandre.belloni@bootlin.com>
To: Sebastian Reichel <sebastian.reichel@collabora.com>
Cc: Heiko Stuebner <heiko@sntech.de>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Lee Jones <lee@kernel.org>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Alessandro Zummo <a.zummo@towertech.it>,
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
Date: Mon, 5 Sep 2022 21:48:34 +0200 [thread overview]
Message-ID: <YxZSknMfmq//grDb@mail.local> (raw)
In-Reply-To: <20220831215437.117880-6-sebastian.reichel@collabora.com>
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 <sebastian.reichel@collabora.com>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> ---
> 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 <linux/bcd.h>
> #include <linux/mfd/rk808.h>
> #include <linux/platform_device.h>
> -#include <linux/i2c.h>
>
> /* 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
next prev parent reply other threads:[~2022-09-05 19:48 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-31 21:54 [PATCH 00/13] Introduce RK806 Support Sebastian Reichel
2022-08-31 21:54 ` [PATCH 01/13] mfd: rk808: convert to device managed resources Sebastian Reichel
2022-08-31 21:54 ` [PATCH 02/13] mfd: rk808: use dev_err_probe Sebastian Reichel
2022-08-31 21:54 ` [PATCH 03/13] clk: RK808: reduce 'struct rk808' usage Sebastian Reichel
2022-08-31 21:54 ` [PATCH 04/13] regulator: rk808: " Sebastian Reichel
2022-09-01 11:32 ` Mark Brown
2022-08-31 21:54 ` [PATCH 05/13] rtc: " Sebastian Reichel
2022-09-05 19:48 ` Alexandre Belloni [this message]
2022-08-31 21:54 ` [PATCH 06/13] mfd: rk808: replace 'struct i2c_client' with 'struct device' Sebastian Reichel
2022-08-31 21:54 ` [PATCH 07/13] mfd: rk808: split into core and i2c Sebastian Reichel
2022-08-31 21:54 ` [PATCH 08/13] dt-bindings: mfd: add rk806 binding Sebastian Reichel
2022-09-01 8:09 ` Krzysztof Kozlowski
2022-08-31 21:54 ` [PATCH 09/13] mfd: rk8xx: add rk806 support Sebastian Reichel
2022-08-31 21:54 ` [PATCH 10/13] pinctrl: rk805: add rk806 pinctrl support Sebastian Reichel
2022-08-31 21:58 ` Linus Walleij
2022-08-31 21:54 ` [PATCH 11/13] regulator: rk808: Use dev_err_probe Sebastian Reichel
2022-08-31 21:54 ` [PATCH 12/13] regulator: rk808: add rk806 support Sebastian Reichel
2022-09-01 11:36 ` Mark Brown
2022-08-31 21:54 ` [PATCH 13/13] ASoC: rk817: Remove 'select REGMAP_I2C' Sebastian Reichel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YxZSknMfmq//grDb@mail.local \
--to=alexandre.belloni@bootlin.com \
--cc=a.zummo@towertech.it \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=kernel@collabora.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lee@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mturquette@baylibre.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
--cc=sebastian.reichel@collabora.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox