From: Sebastian Reichel <sebastian.reichel@collabora.com>
To: Heiko Stuebner <heiko@sntech.de>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Lee Jones <lee@kernel.org>
Cc: 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>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Alessandro Zummo <a.zummo@towertech.it>,
linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
Sebastian Reichel <sebastian.reichel@collabora.com>,
kernel@collabora.com, Diederik de Haas <didi.debian@cknow.org>,
Vincent Legoll <vincent.legoll@gmail.com>
Subject: [PATCH v8 06/14] mfd: rk8xx-i2c: use device_get_match_data
Date: Thu, 4 May 2023 19:36:10 +0200 [thread overview]
Message-ID: <20230504173618.142075-7-sebastian.reichel@collabora.com> (raw)
In-Reply-To: <20230504173618.142075-1-sebastian.reichel@collabora.com>
Simplify the device identification logic by supplying the relevant
information via of_match_data. This also removes the dev_info()
printing the chip version, since that's supplied by the match data
now.
Due to lack of hardware this change is compile-tested only.
Acked-for-MFD-by: Lee Jones <lee@kernel.org>
Tested-by: Diederik de Haas <didi.debian@cknow.org> # Rock64, Quartz64 Model A + B
Tested-by: Vincent Legoll <vincent.legoll@gmail.com> # Pine64 QuartzPro64
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
drivers/mfd/rk8xx-core.c | 2 -
drivers/mfd/rk8xx-i2c.c | 89 +++++++++++++++++-----------------------
2 files changed, 37 insertions(+), 54 deletions(-)
diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c
index 5c0a5acef34c..ddf2052c5190 100644
--- a/drivers/mfd/rk8xx-core.c
+++ b/drivers/mfd/rk8xx-core.c
@@ -597,8 +597,6 @@ int rk8xx_probe(struct device *dev, int variant, unsigned int irq, struct regmap
return -EINVAL;
}
- dev_info(dev, "chip id: 0x%x\n", (unsigned int)rk808->variant);
-
if (!irq)
return dev_err_probe(dev, -EINVAL, "No interrupt support, no core IRQ\n");
diff --git a/drivers/mfd/rk8xx-i2c.c b/drivers/mfd/rk8xx-i2c.c
index 6d121b589fec..2822bfa8a04a 100644
--- a/drivers/mfd/rk8xx-i2c.c
+++ b/drivers/mfd/rk8xx-i2c.c
@@ -16,6 +16,11 @@
#include <linux/of.h>
#include <linux/regmap.h>
+struct rk8xx_i2c_platform_data {
+ const struct regmap_config *regmap_cfg;
+ int variant;
+};
+
static bool rk808_is_volatile_reg(struct device *dev, unsigned int reg)
{
/*
@@ -103,66 +108,46 @@ static const struct regmap_config rk817_regmap_config = {
.volatile_reg = rk817_is_volatile_reg,
};
-static int rk8xx_i2c_get_variant(struct i2c_client *client)
-{
- u8 pmic_id_msb, pmic_id_lsb;
- int msb, lsb;
-
- if (of_device_is_compatible(client->dev.of_node, "rockchip,rk817") ||
- of_device_is_compatible(client->dev.of_node, "rockchip,rk809")) {
- pmic_id_msb = RK817_ID_MSB;
- pmic_id_lsb = RK817_ID_LSB;
- } else {
- pmic_id_msb = RK808_ID_MSB;
- pmic_id_lsb = RK808_ID_LSB;
- }
+static const struct rk8xx_i2c_platform_data rk805_data = {
+ .regmap_cfg = &rk805_regmap_config,
+ .variant = RK805_ID,
+};
+
+static const struct rk8xx_i2c_platform_data rk808_data = {
+ .regmap_cfg = &rk808_regmap_config,
+ .variant = RK808_ID,
+};
- /* Read chip variant */
- msb = i2c_smbus_read_byte_data(client, pmic_id_msb);
- if (msb < 0)
- return dev_err_probe(&client->dev, msb, "failed to read the chip id MSB\n");
+static const struct rk8xx_i2c_platform_data rk809_data = {
+ .regmap_cfg = &rk817_regmap_config,
+ .variant = RK809_ID,
+};
- lsb = i2c_smbus_read_byte_data(client, pmic_id_lsb);
- if (lsb < 0)
- return dev_err_probe(&client->dev, lsb, "failed to read the chip id LSB\n");
+static const struct rk8xx_i2c_platform_data rk817_data = {
+ .regmap_cfg = &rk817_regmap_config,
+ .variant = RK817_ID,
+};
- return ((msb << 8) | lsb) & RK8XX_ID_MSK;
-}
+static const struct rk8xx_i2c_platform_data rk818_data = {
+ .regmap_cfg = &rk818_regmap_config,
+ .variant = RK818_ID,
+};
static int rk8xx_i2c_probe(struct i2c_client *client)
{
- const struct regmap_config *regmap_cfg;
+ const struct rk8xx_i2c_platform_data *data;
struct regmap *regmap;
- int variant;
- variant = rk8xx_i2c_get_variant(client);
- if (variant < 0)
- return variant;
-
- switch (variant) {
- case RK805_ID:
- regmap_cfg = &rk805_regmap_config;
- break;
- case RK808_ID:
- regmap_cfg = &rk808_regmap_config;
- break;
- case RK818_ID:
- regmap_cfg = &rk818_regmap_config;
- break;
- case RK809_ID:
- case RK817_ID:
- regmap_cfg = &rk817_regmap_config;
- break;
- default:
- return dev_err_probe(&client->dev, -EINVAL, "Unsupported RK8XX ID %x\n", variant);
- }
+ data = device_get_match_data(&client->dev);
+ if (!data)
+ return -ENODEV;
- regmap = devm_regmap_init_i2c(client, regmap_cfg);
+ regmap = devm_regmap_init_i2c(client, data->regmap_cfg);
if (IS_ERR(regmap))
return dev_err_probe(&client->dev, PTR_ERR(regmap),
"regmap initialization failed\n");
- return rk8xx_probe(&client->dev, variant, client->irq, regmap);
+ return rk8xx_probe(&client->dev, data->variant, client->irq, regmap);
}
static void rk8xx_i2c_shutdown(struct i2c_client *client)
@@ -173,11 +158,11 @@ static void rk8xx_i2c_shutdown(struct i2c_client *client)
static SIMPLE_DEV_PM_OPS(rk8xx_i2c_pm_ops, rk8xx_suspend, rk8xx_resume);
static const struct of_device_id rk8xx_i2c_of_match[] = {
- { .compatible = "rockchip,rk805" },
- { .compatible = "rockchip,rk808" },
- { .compatible = "rockchip,rk809" },
- { .compatible = "rockchip,rk817" },
- { .compatible = "rockchip,rk818" },
+ { .compatible = "rockchip,rk805", .data = &rk805_data },
+ { .compatible = "rockchip,rk808", .data = &rk808_data },
+ { .compatible = "rockchip,rk809", .data = &rk809_data },
+ { .compatible = "rockchip,rk817", .data = &rk817_data },
+ { .compatible = "rockchip,rk818", .data = &rk818_data },
{ },
};
MODULE_DEVICE_TABLE(of, rk8xx_i2c_of_match);
--
2.39.2
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2023-05-04 17:36 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-04 17:36 [PATCH v8 00/14] mfd/pinctrl/regulator: Add RK806 Support Sebastian Reichel
2023-05-04 17:36 ` [PATCH v8 01/14] clk: RK808: reduce 'struct rk808' usage Sebastian Reichel
2023-05-15 15:14 ` Lee Jones
2023-05-04 17:36 ` [PATCH v8 02/14] mfd: rk808: convert to device managed resources Sebastian Reichel
2023-05-15 15:17 ` Lee Jones
2023-05-04 17:36 ` [PATCH v8 03/14] mfd: rk808: use dev_err_probe Sebastian Reichel
2023-05-15 15:18 ` Lee Jones
2023-05-04 17:36 ` [PATCH v8 04/14] mfd: rk808: replace 'struct i2c_client' with 'struct device' Sebastian Reichel
2023-05-15 15:18 ` Lee Jones
2023-05-04 17:36 ` [PATCH v8 05/14] mfd: rk808: split into core and i2c Sebastian Reichel
2023-05-15 15:19 ` Lee Jones
[not found] ` <CGME20230516212700eucas1p1fbde1b6181c18d821e0796b6b6a4fa00@eucas1p1.samsung.com>
2023-05-16 21:26 ` Marek Szyprowski
2023-05-16 22:01 ` Sebastian Reichel
2023-06-30 11:34 ` Geert Uytterhoeven
2023-06-30 18:48 ` Sebastian Reichel
2023-07-04 13:08 ` Geert Uytterhoeven
2023-05-04 17:36 ` Sebastian Reichel [this message]
2023-05-15 15:19 ` [PATCH v8 06/14] mfd: rk8xx-i2c: use device_get_match_data Lee Jones
2023-05-04 17:36 ` [PATCH v8 07/14] dt-bindings: mfd: add rk806 binding Sebastian Reichel
2023-05-15 15:20 ` Lee Jones
2023-05-04 17:36 ` [PATCH v8 08/14] mfd: rk8xx: add rk806 support Sebastian Reichel
2023-05-15 15:20 ` Lee Jones
2023-11-15 17:17 ` Neil Armstrong
2023-11-15 18:00 ` Sebastian Reichel
2023-11-16 8:41 ` Neil Armstrong
2023-11-16 11:30 ` Sebastian Reichel
2023-05-04 17:36 ` [PATCH v8 09/14] pinctrl: rk805: add rk806 pinctrl support Sebastian Reichel
2023-05-15 15:21 ` Lee Jones
2023-05-04 17:36 ` [PATCH v8 10/14] regulator: expose regulator_find_closest_bigger Sebastian Reichel
2023-05-04 17:36 ` [PATCH v8 11/14] regulator: rk808: fix asynchronous probing Sebastian Reichel
2023-05-04 17:36 ` [PATCH v8 12/14] regulator: rk808: cleanup parent device usage Sebastian Reichel
2023-05-04 17:36 ` [PATCH v8 13/14] regulator: rk808: revert to synchronous probing Sebastian Reichel
2023-05-04 17:36 ` [PATCH v8 14/14] regulator: rk808: add rk806 support Sebastian Reichel
2023-05-15 15:24 ` [GIT PULL] Immutable branch between MFD, Clk, Input, Pinctrl, RTC, Power, Regulator and Sound due for the v6.5 merge window Lee Jones
2023-05-23 21:44 ` (subset) [PATCH v8 00/14] mfd/pinctrl/regulator: Add RK806 Support Mark Brown
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=20230504173618.142075-7-sebastian.reichel@collabora.com \
--to=sebastian.reichel@collabora.com \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=didi.debian@cknow.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=vincent.legoll@gmail.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;
as well as URLs for NNTP newsgroup(s).