From nobody Tue May 6 18:29:07 2025
Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com
[209.85.218.51])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5A22024887E
for <linux-kernel@vger.kernel.org>; Thu, 3 Apr 2025 08:59:12 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=209.85.218.51
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1743670757; cv=none;
b=TJ58So42jkKmfZydKXdpWs1YVYGt9bg0R3knqXlfaZ8wnourxKbR1JDEgALkDIM5k9jwych/wPk449+RvD/D2zfClAo2FYzhsB6w/ibWvSdblUMsX3mE6cSG+JqdztUismJmB0BqBGIctdp96E+M+O8sYnNxdbsyF+cGCVumlnY=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1743670757; c=relaxed/simple;
bh=acDeJKyeAKIRosg5ADxV9Zz9Wij86n9v8Z9fpq/Qhv4=;
h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References:
In-Reply-To:To:Cc;
b=igT91u2nKSxwVVlZ72dReKeLE2qaO76lTFacmKWsJGxDtX/BafBFgyfHRJhn8WCfwMd0UG+wOTf5h/xf3mz7HYPHNfFxetudSTy0MxdHT8+r+JgrLXcQd8J+JsmLZHhWdlNWh+dPc8LO344E0o/KA618SoevuGXYi6X89mIGsvs=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=linaro.org;
spf=pass smtp.mailfrom=linaro.org;
dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org
header.b=b8vvVP5n; arc=none smtp.client-ip=209.85.218.51
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=linaro.org
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=linaro.org
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org
header.b="b8vvVP5n"
Received: by mail-ej1-f51.google.com with SMTP id
a640c23a62f3a-ac3eb3fdd2eso115276766b.0
for <linux-kernel@vger.kernel.org>;
Thu, 03 Apr 2025 01:59:12 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1743670749; x=1744275549;
darn=vger.kernel.org;
h=cc:to:in-reply-to:references:message-id:content-transfer-encoding
:mime-version:subject:date:from:from:to:cc:subject:date:message-id
:reply-to;
bh=GcW1mWBfWGvNcEl9sJWjMnkVLrjIE7eEENFwEaEA4Go=;
b=b8vvVP5n3VQ/7xgndVI4/3Mc1UEnjaBRmBKWVLRViB9QlnvgD8W35fGmn5PhpNSfDc
wpgyPOr2uKWevcFFFjFyPFeRsYheQdZKuYy5iyPBViwcIoiuoEV+IYOlra5oJFydozFu
iKw7LlGBOixRlHNvlSl+fGDVVgz/kUACKD1LNyr7NIHtRPpYlxKwtKHifKgkADnltbPR
WmAk76V9abSSn6XS2BYO5GKH0DAxEnBMGQsy3Z7bNTsvLN0yXMmmTB3yolyMO/r7F1Fo
NUHKWdu9DPl+vM7cOZWzHwKRkY5ad+7/rYe8MvgT3h9p9iEm85cJHB97ru8icOfjxZI6
rxgg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1743670749; x=1744275549;
h=cc:to:in-reply-to:references:message-id:content-transfer-encoding
:mime-version:subject:date:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=GcW1mWBfWGvNcEl9sJWjMnkVLrjIE7eEENFwEaEA4Go=;
b=cNXkbcTuGLW7Lc4wrtYNLsVc1Xyylh4HY58oqal8S5R5JBQg1eWHlHyWZBrZGHsw2/
2v2jlu1QqAd2qNDRTGs/CojVbPdkqAGuzDhJHDKRnZxOjmrVXxOGY+65j/8VBmAt9Zvr
5PLoebzGn+QXgv5azOx7UgldgRon4hk23+gDK/zmFxuU1fN5JGEEyjG/JYdfxtBd294G
jKwbfPY0Y3p5Vd1mYNf3WyioNdL4yKDiRWwvUDpDn0Z4+21eGXTkz2Sy68bdUUV6Y75i
lYJkpr4A4JOkmDABXU3X6IAGWXn0F8b7gvxOaNydr0gqKThGDpI83LdDO+YDo7jvZHJc
AnMA==
X-Forwarded-Encrypted: i=1;
AJvYcCVOxm7kA6OfOWYIEAXQJkhNzbEz8JvU+mxpJDXY9JE12HqSKkrtf+TpIzSEWufZu6oYSKz0yPPJ0v94WVg=@vger.kernel.org
X-Gm-Message-State: AOJu0YzxTggYnnCNRPUZ+eU+StMEXkUm/pbZtA+Pf74uy5qxDcNj2Xfl
3BIacNtU1wtTlY6b5Nr1FZjzp0qmbMyE74JJ0690fmyVccUP47YERfsII49UGEY=
X-Gm-Gg: ASbGncu25vLvaLc1hGNb+9GFrVtv2CxUlEfFmH5UMUPXuK912VZWUlO/B1wmcJCGXTG
KXwkB58cSMXMBk6hGysauiuGHVH7JjE4E2erSo0K5Ha86XPa+7V0bJNPBCrD6OPGnFfRe4zhv+V
I8mqo2rsa3jUUhEOD6gIInErScDrOvcomNcXcSCUHhdWrGXMOGKckecpX9ndCjtjZs8Er6TiEOL
0yW3Zp2MCmqipkDh6L07JApBcaRPbi7jL71UCybtSHOgFvtqhHFhMFu8TG0jWjdHFLtesq3ETVv
liRg7o1WiILXZr5mxR4OMuO7u103XnIdlXyUPhYUEcrCCqDI1alSwBVQCg8lsTe3AuyBYw+205p
g2L1/+yRKk0NcrGE3kC+LDnGUyBWw
X-Google-Smtp-Source:
AGHT+IGavhoPGzCabBNLBzdbL3jiat+xI87iDC+wiboHJiUvbmM/Wprhewp9oSPfUMvc9gVC8l54GA==
X-Received: by 2002:a17:907:6e87:b0:ac7:3911:35e7 with SMTP id
a640c23a62f3a-ac7c0a97bb3mr143560466b.59.1743670749216;
Thu, 03 Apr 2025 01:59:09 -0700 (PDT)
Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com.
[35.204.239.8])
by smtp.gmail.com with ESMTPSA id
4fb4d7f45d1cf-5f0880a535fsm637614a12.80.2025.04.03.01.59.08
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 03 Apr 2025 01:59:08 -0700 (PDT)
From: =?utf-8?q?Andr=C3=A9_Draszik?= <andre.draszik@linaro.org>
Date: Thu, 03 Apr 2025 09:59:06 +0100
Subject: [PATCH v3 14/32] mfd: sec: s2dos05/s2mpu05: use explicit regmap
config and drop default
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Message-Id: <20250403-s2mpg10-v3-14-b542b3505e68@linaro.org>
References: <20250403-s2mpg10-v3-0-b542b3505e68@linaro.org>
In-Reply-To: <20250403-s2mpg10-v3-0-b542b3505e68@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,
=?utf-8?q?Andr=C3=A9_Draszik?= <andre.draszik@linaro.org>
X-Mailer: b4 0.14.2
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, and
completely remove the generic regmap config as it becomes an orphan
again that shouldn't be used by any device.
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=C3=A9 Draszik <andre.draszik@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
v2:
* squash two previously separate patches into this one (Krzysztof)
---
drivers/mfd/sec-i2c.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/mfd/sec-i2c.c b/drivers/mfd/sec-i2c.c
index a107a9c1e760f90fcb59a9944b74e9a39a0d946c..81f90003eea2a40f2caaebb49fc=
9494b89370e7f 100644
--- a/drivers/mfd/sec-i2c.c
+++ b/drivers/mfd/sec-i2c.c
@@ -61,7 +61,7 @@ static bool s2mpu02_volatile(struct device *dev, unsigned=
int reg)
}
}
=20
-static const struct regmap_config sec_regmap_config =3D {
+static const struct regmap_config s2dos05_regmap_config =3D {
.reg_bits =3D 8,
.val_bits =3D 8,
};
@@ -120,6 +120,11 @@ static const struct regmap_config s2mpu02_regmap_confi=
g =3D {
.cache_type =3D REGCACHE_FLAT,
};
=20
+static const struct regmap_config s2mpu05_regmap_config =3D {
+ .reg_bits =3D 8,
+ .val_bits =3D 8,
+};
+
static const struct regmap_config s5m8767_regmap_config =3D {
.reg_bits =3D 8,
.val_bits =3D 8,
@@ -138,6 +143,9 @@ static int sec_pmic_i2c_probe(struct i2c_client *client)
device_type =3D (unsigned long)of_device_get_match_data(&client->dev);
=20
switch (device_type) {
+ case S2DOS05:
+ regmap =3D &s2dos05_regmap_config;
+ break;
case S2MPA01:
regmap =3D &s2mpa01_regmap_config;
break;
@@ -156,12 +164,16 @@ static int sec_pmic_i2c_probe(struct i2c_client *clie=
nt)
case S2MPU02:
regmap =3D &s2mpu02_regmap_config;
break;
+ case S2MPU05:
+ regmap =3D &s2mpu05_regmap_config;
+ break;
case S5M8767X:
regmap =3D &s5m8767_regmap_config;
break;
default:
- regmap =3D &sec_regmap_config;
- break;
+ return dev_err_probe(&client->dev, -ENODEV,
+ "Unsupported device type %lu\n",
+ device_type);
}
=20
regmap_pmic =3D devm_regmap_init_i2c(client, regmap);
--=20
2.49.0.472.ge94155a9ec-goog