From nobody Wed Apr 30 12:57:10 2025
Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com
[209.85.218.53])
(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 70EE12153EA
for <linux-kernel@vger.kernel.org>; Wed, 9 Apr 2025 20:37:40 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=209.85.218.53
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1744231064; cv=none;
b=P5jy0l0J0Dcvs20YmX73J1GRDrOhr7GyuwItdFCfenGpGfHAu8pIUrTUeO0yqnmzihgQAQ4c+gPqwgGiK/d3tXmaK+A80UIfOOal2b9vW5u+h37WDehn9cI1w8Q9OnkFRKjL1CSOo0IkBl0e1GWDvWYWu0pTrrgVq1GBczRxcg0=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1744231064; c=relaxed/simple;
bh=XNPLpibedDTSu7S33NUIPTJnGACKRxAom0wu7hI1PCg=;
h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References:
In-Reply-To:To:Cc;
b=UieZFbwBs2PN/5nLuRdufpZDSkWGChD4qf24MOzsAtpagQ3GhvnyEolLJyokqaFdU8JVHski+727sIZbrlTu260DIlhIo6QqBGXRF34ffqH5Ot/AdSgGou8xAAjXqHA4eU4WE3WGAyJxnghoFeYhy5VTJMnG4WfYMD2GxOdbCMI=
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=OTdhWDRD; arc=none smtp.client-ip=209.85.218.53
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="OTdhWDRD"
Received: by mail-ej1-f53.google.com with SMTP id
a640c23a62f3a-ac41514a734so19043066b.2
for <linux-kernel@vger.kernel.org>;
Wed, 09 Apr 2025 13:37:40 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1744231057; x=1744835857;
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=VzEjXNkLNu9GbyJRrsPm3OGWMuRzZZwPEzkpfwqOZVo=;
b=OTdhWDRDj8cUyEoBcRy7n2oKEqS8SgsRPrT6JDTUeTBOAMtzCua5No5Q6xxgkkjQ30
ySFmmvi/cjO70Cux0AUtba6idIXfriM/xq0dEAeX2uJTeaA7ykRJ4PephyEEdtXyuB1p
SWeee4xi5TdhVVehwgKKaiTo+k3Pc9xccaLl/pS9H+2MhcZLNxCSvreS0WAR9IapoLM8
3mu1bBm9SlQv0x5/Gwjp6IinFBKpCn0aMxdsrBAZZJyUoAUrd8H/AOf66634XKwo47IM
XTo/OABATYwfv/mfMFBnarXmOCfk5+HKV9ux4YldAG7mBKTmISLFOgKENqHiShYIXf0O
8HZg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1744231057; x=1744835857;
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=VzEjXNkLNu9GbyJRrsPm3OGWMuRzZZwPEzkpfwqOZVo=;
b=ce5wjt1cVHB/Jpnsu2TMEaiUA598I7ejMWXS597T57v81ZoBwu/jwsCmJizATX8BIS
hlB89p4vtaPsWHh225odvAmsq7gi+voLtxwOl0ytRm0iuFRcbp9kaN2ZaSopcKGxHY9p
3mOj5r+nCODNzsQf8IrBfoJGaH62izyJSq6THLSV9l2lUuYfl3Q8y1CPbH3jCDS97W5F
MvJOUEtaXCZuRXGdo4ViGT7BM4K2wLIJGzYUlv+oJ5X0XJwyIlMgpNG2ny7eF6agoJqn
4q3EJvN1/GJrHhNqaECofOq+0LKHh35Hks+n7AlzmDA3D30QEBm/APEJVdo9TV44uaH6
2Nqw==
X-Forwarded-Encrypted: i=1;
AJvYcCXweLauEcBYetNkqY8ZvGlPb5+LmRnnTUZadT10yHdvKDB9RrYqG3phwrPQPum6IAfMVuv2Xepr5IYwJk8=@vger.kernel.org
X-Gm-Message-State: AOJu0Yyc8NBiNntoNHs26Q66QUk3Pnh2+pSkUOlg4+KdnXgo2zQNRJ+9
YmTlSiT2sYXN28QDByyKLfBXijp2BvfCAKRD1Ouva1FydSaoL5b1Yxcwd7vwjOQ=
X-Gm-Gg: ASbGncuQThkpJqg6LIEYq00/RMFB0kEd2mxD9AfbhvC+uwNhvjOGJ45lSUKBEPh95z9
MqnpVfeG9yFxFG4b6i0TfDZSefiBsi5OGTcnpGZQuBuLyIetCWquvyVivVabxbG2D9I6ByTmllM
1f4Apy6T8dRl3hbTmcR5b2G5NkN0Ih4NDPvjmG5Qls0BzjOEf5sf8PhQVg0mx0Jyc2Z/FcfNAyQ
1ATWxXvBbd7qEEhAc2bZOnbPhjvmmmuz+AXFJUUrc+eo6vsbxxbEd69jPODefJRRbrmhCpxTV6S
VFsXU9n2JoNST2guzldrt0VePop+OgpdOV22C5xC84FHkzJGs63Jhl1NKt9hPREGqO5d2NF8l2i
/6+S5EsVDfUm9z/L6aJE/LQD+LgiVQPqljp32Zw==
X-Google-Smtp-Source:
AGHT+IGzaRFtKWEVWYdD0lu6CSjddwUa5mqgDytfA0O5AR616wmqNvg2sZQEFHwPTrDOE7dwUEpCcw==
X-Received: by 2002:a17:907:3d09:b0:ac7:edc4:3d42 with SMTP id
a640c23a62f3a-acabd24cb8amr9037566b.24.1744231056790;
Wed, 09 Apr 2025 13:37:36 -0700 (PDT)
Received: from puffmais.c.googlers.com
(40.162.204.35.bc.googleusercontent.com. [35.204.162.40])
by smtp.gmail.com with ESMTPSA id
a640c23a62f3a-acaa1ccc001sm145850366b.126.2025.04.09.13.37.36
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 09 Apr 2025 13:37:36 -0700 (PDT)
From: =?utf-8?q?Andr=C3=A9_Draszik?= <andre.draszik@linaro.org>
Date: Wed, 09 Apr 2025 21:37:35 +0100
Subject: [PATCH v4 14/32] mfd: sec-i2c: 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: <20250409-s2mpg10-v4-14-d66d5f39b6bf@linaro.org>
References: <20250409-s2mpg10-v4-0-d66d5f39b6bf@linaro.org>
In-Reply-To: <20250409-s2mpg10-v4-0-d66d5f39b6bf@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>,
Krzysztof Kozlowski <krzysztof.kozlowski@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.
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Andr=C3=A9 Draszik <andre.draszik@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.604.gff1f9ca942-goog