devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "André Draszik" <andre.draszik@linaro.org>
To: Krzysztof Kozlowski <krzk@kernel.org>, Lee Jones <lee@kernel.org>,
	 Rob Herring <robh@kernel.org>,
	Conor Dooley <conor+dt@kernel.org>,
	 Sylwester Nawrocki <s.nawrocki@samsung.com>,
	 Chanwoo Choi <cw00.choi@samsung.com>,
	Alim Akhtar <alim.akhtar@samsung.com>,
	 Michael Turquette <mturquette@baylibre.com>,
	 Stephen Boyd <sboyd@kernel.org>,
	Russell King <linux@armlinux.org.uk>,
	 Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>,
	 Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: "Peter Griffin" <peter.griffin@linaro.org>,
	"Tudor Ambarus" <tudor.ambarus@linaro.org>,
	"Will McVicker" <willmcvicker@google.com>,
	kernel-team@android.com, linux-kernel@vger.kernel.org,
	linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org,
	linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-rtc@vger.kernel.org,
	"André Draszik" <andre.draszik@linaro.org>
Subject: [PATCH 16/34] mfd: sec: s2dos05/s2mpu05: use explicit regmap config
Date: Sun, 23 Mar 2025 22:39:32 +0000	[thread overview]
Message-ID: <20250323-s2mpg10-v1-16-d08943702707@linaro.org> (raw)
In-Reply-To: <20250323-s2mpg10-v1-0-d08943702707@linaro.org>

When support for PMICs without compatibles was removed in
commit f736d2c0caa8 ("mfd: sec: Remove PMICs without compatibles"),
sec_regmap_config effectively became an orphan, because S5M8763X was
the only user left of it before removal, using the default: case of the
switch statement.

When s2dos05 and s2mpu05 support was added in commit bf231e5febcf
("mfd: sec-core: Add support for the Samsung s2dos05") and commit
ed33479b7beb ("mfd: sec: Add support for S2MPU05 PMIC"), they ended up
using that orphaned regmap_config in a non-obvious way due to the
default: case of the device type switch matching statement taking
effect again.

To make things more obvious, and to help the reader of this code while
reasoning about what the intention might be here, and to ensure future
additions to support new devices in this driver don't forget to add a
regmap config, add an explicit regmap config for these two devices, so
that we can ultimately remove the generic regmap config.

Note that this commit doesn't fix the issue that s2dos05_regmap_config
ands2mpu05_regmap_config really are incomplete, but I have no
documentation on them.

Signed-off-by: André Draszik <andre.draszik@linaro.org>
---
 drivers/mfd/sec-i2c.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/drivers/mfd/sec-i2c.c b/drivers/mfd/sec-i2c.c
index ce1e5af9215a305fbb55157ae4e7bfb9aace86b8..3912baa5c2f918b7ad345e2bbbbe4daf2e49ca6d 100644
--- a/drivers/mfd/sec-i2c.c
+++ b/drivers/mfd/sec-i2c.c
@@ -66,6 +66,11 @@ static const struct regmap_config sec_regmap_config = {
 	.val_bits = 8,
 };
 
+static const struct regmap_config s2dos05_regmap_config = {
+	.reg_bits = 8,
+	.val_bits = 8,
+};
+
 static const struct regmap_config s2mpa01_regmap_config = {
 	.reg_bits = 8,
 	.val_bits = 8,
@@ -120,6 +125,11 @@ static const struct regmap_config s2mpu02_regmap_config = {
 	.cache_type = REGCACHE_FLAT,
 };
 
+static const struct regmap_config s2mpu05_regmap_config = {
+	.reg_bits = 8,
+	.val_bits = 8,
+};
+
 static const struct regmap_config s5m8767_regmap_config = {
 	.reg_bits = 8,
 	.val_bits = 8,
@@ -158,6 +168,9 @@ static int sec_pmic_i2c_probe(struct i2c_client *client)
 	device_type = (unsigned long)of_device_get_match_data(&client->dev);
 
 	switch (device_type) {
+	case S2DOS05:
+		regmap = &s2dos05_regmap_config;
+		break;
 	case S2MPA01:
 		regmap = &s2mpa01_regmap_config;
 		break;
@@ -176,6 +189,9 @@ static int sec_pmic_i2c_probe(struct i2c_client *client)
 	case S2MPU02:
 		regmap = &s2mpu02_regmap_config;
 		break;
+	case S2MPU05:
+		regmap = &s2mpu05_regmap_config;
+		break;
 	case S5M8767X:
 		regmap = &s5m8767_regmap_config;
 		break;

-- 
2.49.0.395.g12beb8f557-goog


  parent reply	other threads:[~2025-03-23 22:39 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-23 22:39 [PATCH 00/34] Samsung S2MPG10 PMIC MFD-based drivers André Draszik
2025-03-23 22:39 ` [PATCH 01/34] dt-bindings: mfd: samsung,s2mps11: add s2mpg10 André Draszik
2025-03-24 16:55   ` Rob Herring
2025-03-24 17:23     ` André Draszik
2025-03-23 22:39 ` [PATCH 02/34] dt-bindings: clock: " André Draszik
2025-03-24 17:01   ` Rob Herring (Arm)
2025-03-25 15:12   ` Stephen Boyd
2025-03-23 22:39 ` [PATCH 03/34] firmware: exynos-acpm: export devm_acpm_get_by_phandle() André Draszik
2025-03-26  7:03   ` Krzysztof Kozlowski
2025-03-26  9:19     ` André Draszik
2025-03-23 22:39 ` [PATCH 04/34] mfd: sec: drop non-existing forward declarations André Draszik
2025-03-26  7:03   ` Krzysztof Kozlowski
2025-03-23 22:39 ` [PATCH 05/34] mfd: sec: sort includes alphabetically André Draszik
2025-03-23 22:39 ` [PATCH 06/34] mfd: sec: update includes to add missing and remove superfluous ones André Draszik
2025-03-23 22:39 ` [PATCH 07/34] mfd: sec: move private internal API to internal header André Draszik
2025-03-26  7:04   ` Krzysztof Kozlowski
2025-03-23 22:39 ` [PATCH 08/34] mfd: sec: fix open parenthesis alignment (of_property_read_bool) André Draszik
2025-03-26  7:06   ` Krzysztof Kozlowski
2025-03-26  9:21     ` André Draszik
2025-03-27 16:55       ` Krzysztof Kozlowski
2025-03-23 22:39 ` [PATCH 09/34] mfd: sec: slightly rework runtime platform data allocation André Draszik
2025-03-26  7:06   ` Krzysztof Kozlowski
2025-03-23 22:39 ` [PATCH 10/34] mfd: sec: split into core and transport (i2c) drivers André Draszik
2025-03-26  7:14   ` Krzysztof Kozlowski
2025-03-26  9:33     ` André Draszik
2025-03-23 22:39 ` [PATCH 11/34] defconfigs: rename CONFIG_MFD_SEC_CORE to CONFIG_MFD_SEC_I2C André Draszik
2025-03-26  7:16   ` Krzysztof Kozlowski
2025-03-27  8:56     ` André Draszik
2025-03-27 16:57       ` Krzysztof Kozlowski
2025-03-27 19:00         ` André Draszik
2025-03-23 22:39 ` [PATCH 12/34] mfd: sec: add support for S2MPG10 PMIC André Draszik
2025-03-26  7:22   ` Krzysztof Kozlowski
2025-03-26  9:35     ` André Draszik
2025-03-23 22:39 ` [PATCH 13/34] mfd: sec: merge separate core and irq modules André Draszik
2025-03-26  7:22   ` Krzysztof Kozlowski
2025-03-23 22:39 ` [PATCH 14/34] mfd: sec: sort struct of_device_id entries and the device type switch André Draszik
2025-03-26  7:22   ` Krzysztof Kozlowski
2025-03-23 22:39 ` [PATCH 15/34] mfd: sec: use dev_err_probe() where appropriate André Draszik
2025-03-26  7:24   ` Krzysztof Kozlowski
2025-03-26  9:42     ` André Draszik
2025-03-23 22:39 ` André Draszik [this message]
2025-03-23 22:39 ` [PATCH 17/34] mfd: sec: drop generic regmap config André Draszik
2025-03-26  7:27   ` Krzysztof Kozlowski
2025-03-23 22:39 ` [PATCH 18/34] mfd: sec: s2dos05: doesn't support interrupts (it seems) André Draszik
2025-03-26  7:28   ` Krzysztof Kozlowski
2025-03-23 22:39 ` [PATCH 19/34] mfd: sec: don't ignore errors from sec_irq_init() André Draszik
2025-03-26  7:29   ` Krzysztof Kozlowski
2025-03-23 22:39 ` [PATCH 20/34] mfd: sec: rework platform data and regmap instantiating André Draszik
2025-03-24  3:52   ` kernel test robot
2025-03-24  5:09   ` kernel test robot
2025-03-23 22:39 ` [PATCH 21/34] mfd: sec: change device_type to int André Draszik
2025-03-23 22:39 ` [PATCH 22/34] mfd: sec: don't compare against NULL / 0 for errors, use ! André Draszik
2025-03-23 22:39 ` [PATCH 23/34] mfd: sec: use sizeof(*var), not sizeof(struct type_of_var) André Draszik
2025-03-23 22:39 ` [PATCH 24/34] mfd: sec: convert to using MFD_CELL macros André Draszik
2025-03-23 22:39 ` [PATCH 25/34] mfd: sec: convert to using REGMAP_IRQ_REG() macros André Draszik
2025-03-23 22:39 ` [PATCH 26/34] clk: s2mps11: add support for S2MPG10 PMIC clock André Draszik
2025-03-25 15:11   ` Stephen Boyd
2025-03-23 22:39 ` [PATCH 27/34] rtc: s5m: cache value of platform_get_device_id() during probe André Draszik
2025-03-23 22:39 ` [PATCH 28/34] rtc: s5m: prepare for external regmap André Draszik
2025-03-23 22:39 ` [PATCH 29/34] rtc: s5m: add support for S2MPG10 RTC André Draszik
2025-03-23 22:39 ` [PATCH 30/34] rtc: s5m: fix a typo: peding -> pending André Draszik
2025-03-23 22:39 ` [PATCH 31/34] rtc: s5m: switch to devm_device_init_wakeup André Draszik
2025-03-23 22:39 ` [PATCH 32/34] rtc: s5m: replace regmap_update_bits with regmap_clear/set_bits André Draszik
2025-03-23 22:39 ` [PATCH 33/34] rtc: s5m: replace open-coded read/modify/write registers with regmap helpers André Draszik
2025-03-23 22:39 ` [PATCH 34/34] MAINTAINERS: add myself as reviewer for Samsung S2M MFD André Draszik
2025-03-28  8:11 ` [PATCH 00/34] Samsung S2MPG10 PMIC MFD-based drivers Lee Jones

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=20250323-s2mpg10-v1-16-d08943702707@linaro.org \
    --to=andre.draszik@linaro.org \
    --cc=alexandre.belloni@bootlin.com \
    --cc=alim.akhtar@samsung.com \
    --cc=catalin.marinas@arm.com \
    --cc=conor+dt@kernel.org \
    --cc=cw00.choi@samsung.com \
    --cc=devicetree@vger.kernel.org \
    --cc=kernel-team@android.com \
    --cc=krzk@kernel.org \
    --cc=lee@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rtc@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=mturquette@baylibre.com \
    --cc=peter.griffin@linaro.org \
    --cc=robh@kernel.org \
    --cc=s.nawrocki@samsung.com \
    --cc=sboyd@kernel.org \
    --cc=tudor.ambarus@linaro.org \
    --cc=will@kernel.org \
    --cc=willmcvicker@google.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).