From nobody Tue Feb 10 07:40:49 2026 Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) (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 06C2D32D0C9 for ; Mon, 5 Jan 2026 09:01:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767603717; cv=none; b=AsRwbfPW0H9CdUJ6jdAs7OLcTwrS3bc1357QsddutEYohAfubadoHZ69d0gDfAxJK2xqs0JB6WcU0q/a3ewVeuufAqLvfV/SksoqcW8Y4mwXplTDkEzMV40CPRE2A0314Pqsu4Ou6EBtweNIg+iMkhDW5EtWAlJY0O8jooEBSAw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767603717; c=relaxed/simple; bh=RBiblDYuoL7LiB6An/b16TWoN7ju2Vuj/2Yriz+avcs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GUMP95Ny5vQt5voqgLic9vw+rXa6C6txlwaz/ES/ZRayuxtKR99OxGbZBKCmNFYKcoX9o/yYnlwQr+kEwo8wQCUh0AIp5//wgUKUtIQWhZhRZSzZqwvNc8pKoXL4hf93LJfAyqvZ7UA8OXOfGIsCtOQr9oXPiDuIHm6Q4RGSkJs= 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=cJARZl2v; arc=none smtp.client-ip=209.85.218.47 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="cJARZl2v" Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-b83b72508f3so539053466b.2 for ; Mon, 05 Jan 2026 01:01:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1767603709; x=1768208509; 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=QCOif9oxn9Ts49wbKRM5kmB/vgWlHk9jFqT6IaUcSpc=; b=cJARZl2vlRj5yAtAmwO0+6xn7F7n9mlhRNHE5R3EVZIr/8c6v5w9VGxYDqBXSU/So3 kdYi+4IFzX55p5hM/31ZmFG3zm7Co3aKT7iK2zHfiBh7FTxNihTGlplDFTrBrShajhO4 z0uJH1h6bAlQebLBU5UWq0daTZwZogBHl6R+L9Jx14dx8DJEy90Hebmos2EeqAwRsgly e60EQDZMmvcoQ1mrbkMkOsY/POMqwUEJBeAEXuSmMRuvK5BnZp1iZI50xpzA/6E3hnkm g7PDYFGGhas1p5KvVliQ39J3WWqzzDhR2aHL9pOR4p2no/MUhg0abXNSCRR3+BrD8Xnn eJQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767603709; x=1768208509; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=QCOif9oxn9Ts49wbKRM5kmB/vgWlHk9jFqT6IaUcSpc=; b=dToYUWQI5CKS5hwywHsVBqAuBHg/dC970lpl4ueHo6NbJ6dF5zWMv1J3BhZRDgQfB3 QnRr2gr9rM7kBqROnjy4+EoH730Y+BGpz1AEXuL12hsqRsD3ClWU7GcKtZ56V5ti0N8+ L/4zTMZjE9cKI0Tsj8IJIIq+f8Y4qmD+lcLGBC9KCsmhSjOS4oPzsFBZiu7gZSBHhR0L tmomGgpiyN7X/Zc1PkB2AQiPFqLoeDkrO1jMF03MS30b1pG6CfNVkzRsxI+nJ1+efB0j zBdAsbK4wywbSSP1xo2oJt9/tGwlwmUk0eIQzhLXHbDYVlfFI73Qz8NPDsvpcfIWNlZM x5ig== X-Forwarded-Encrypted: i=1; AJvYcCWnIOL8VcYPNf3e1FGUPutWB7Clxd0NG3D+AJWKyI5KcQehFNM1SJxNIc78Co+W9aYFwNKuVNQfHUxWPho=@vger.kernel.org X-Gm-Message-State: AOJu0YzU9LNzBqUZbpUJzFf7bX+LMDWnqOsm/xngzViu10+ofNSwIKkR hop5pRyWr7hRGpp3q7iKwLtX3yXQ21mx9c5iwz6d8Wc6Ucn/UVz2GkLphgqqGTvWOOk= X-Gm-Gg: AY/fxX5KE13CmRfVU18wd97t8uWYLXYhS96W8vHPHdvQt7PcGsHz8XZzWoF6XrcZfiu d4yf4y+ejGlfZ9KRs9On1IyIuO5op/KiSb4loPkmbCw+b6Q2EZAxVv+SQVHjVCUq/pACSeeHrtW WUTwKV8NGYGM9gsBSvnx2yJ+i8WN8Y8zV/BVeas1FVsl9TMRgczf47EQCTYnD4uV4n9maFTKrGd +TzXZpVh/6Ri+rZ7aZlZRV0iqU/aPoQ1vtDDEYDiLkuzgGp5PJKcxfieYpFwx1W7fIL1YIxLJ+C Xv1JJxZHvX1h/5SD/xEkS9rPblWwURcYJAV39EVpQvPK5v+YT3CKNGRrfnuYWDL5B25+qxlh/8T Vp4FMb4onwpK+DNitoNC4qk/1QZiaaQmJH4hUH8W0A7pGMLiSpSRYANReqeO85fmkhCFjjdxfum nr8nzqLUPsA6YSuda5WMY3Uyd9qIQLFk/TOoltMdSERr8ie6CmvTdRZ2GFjo/5eE2SGxJdx5SIB OdsXQ== X-Google-Smtp-Source: AGHT+IFUVIMSn/sV3dFiXZcscsT3hGk0kSrJJy4RRYZc736gdsQg7/QBdwgX43lVqJFHn1pNi85KIg== X-Received: by 2002:a17:907:948d:b0:b83:95c7:e984 with SMTP id a640c23a62f3a-b8395c7ed4dmr1656276066b.49.1767603708754; Mon, 05 Jan 2026 01:01:48 -0800 (PST) Received: from puffmais2.c.googlers.com (244.175.141.34.bc.googleusercontent.com. [34.141.175.244]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8037f0ecb9sm5384010466b.56.2026.01.05.01.01.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jan 2026 01:01:48 -0800 (PST) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Mon, 05 Jan 2026 09:01:51 +0000 Subject: [PATCH v6 15/20] regulator: s2mps11: refactor handling of external rail control Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260105-s2mpg1x-regulators-v6-15-80f4b6d1bf9d@linaro.org> References: <20260105-s2mpg1x-regulators-v6-0-80f4b6d1bf9d@linaro.org> In-Reply-To: <20260105-s2mpg1x-regulators-v6-0-80f4b6d1bf9d@linaro.org> To: Tudor Ambarus , Rob Herring , Conor Dooley , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , Lee Jones , Bartosz Golaszewski , Krzysztof Kozlowski , Linus Walleij , Bartosz Golaszewski , Linus Walleij Cc: Peter Griffin , Will McVicker , Juan Yescas , kernel-team@android.com, linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-gpio@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.14.2 Refactor s2mps14_pmic_enable_ext_control() and s2mps11_of_parse_cb() slightly as a preparation for adding S2MPG10 and S2MPG11 support, as both of those PMICs also support control of rails via GPIOs. This also includes the following to avoid further updates in follow-up commits: * On S2MPG10 and S2MPG11, external rail control can be via GPIO or via non-GPIO signals, hence passing a GPIO is allowed to be optional. This avoids inappropriate verbose driver messages. * Prepare to allow use of standard DT property name 'enable-gpios' for newer platforms instead of vendor-specific 'samsung,ext-control'. Signed-off-by: Andr=C3=A9 Draszik --- v2: - add 'optional' flag to this commit (Bartosz) - add 'con_id' to this commit --- drivers/regulator/s2mps11.c | 100 +++++++++++++++++++++++++++++-----------= ---- 1 file changed, 67 insertions(+), 33 deletions(-) diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c index 88e21c90832a45547e5791b15cd1de274f81fed6..7f4db6673b43ebd533c2afb568a= e3481351a9c60 100644 --- a/drivers/regulator/s2mps11.c +++ b/drivers/regulator/s2mps11.c @@ -328,29 +328,15 @@ static int s2mps11_regulator_set_suspend_disable(stru= ct regulator_dev *rdev) rdev->desc->enable_mask, state); } =20 -static int s2mps11_of_parse_cb(struct device_node *np, - const struct regulator_desc *desc, - struct regulator_config *config) +static int s2mps11_of_parse_gpiod(struct device_node *np, + const char *con_id, bool optional, + const struct regulator_desc *desc, + struct regulator_config *config) { - const struct s2mps11_info *s2mps11 =3D config->driver_data; struct gpio_desc *ena_gpiod; int ret; =20 - if (s2mps11->dev_type =3D=3D S2MPS14X) - switch (desc->id) { - case S2MPS14_LDO10: - case S2MPS14_LDO11: - case S2MPS14_LDO12: - break; - - default: - return 0; - } - else - return 0; - - ena_gpiod =3D fwnode_gpiod_get_index(of_fwnode_handle(np), - "samsung,ext-control", 0, + ena_gpiod =3D fwnode_gpiod_get_index(of_fwnode_handle(np), con_id, 0, GPIOD_OUT_HIGH | GPIOD_FLAGS_BIT_NONEXCLUSIVE, "s2mps11-regulator"); @@ -361,14 +347,19 @@ static int s2mps11_of_parse_cb(struct device_node *np, if (ret =3D=3D -EPROBE_DEFER) return ret; =20 - if (ret =3D=3D -ENOENT) + if (ret =3D=3D -ENOENT) { + if (optional) + return 0; + dev_info(config->dev, "No entry for control GPIO for %d/%s in node %pOF\n", desc->id, desc->name, np); - else + } else { dev_warn_probe(config->dev, ret, "Failed to get control GPIO for %d/%s in node %pOF\n", desc->id, desc->name, np); + } + return 0; } =20 @@ -380,6 +371,29 @@ static int s2mps11_of_parse_cb(struct device_node *np, return 0; } =20 +static int s2mps11_of_parse_cb(struct device_node *np, + const struct regulator_desc *desc, + struct regulator_config *config) +{ + const struct s2mps11_info *s2mps11 =3D config->driver_data; + + if (s2mps11->dev_type =3D=3D S2MPS14X) + switch (desc->id) { + case S2MPS14_LDO10: + case S2MPS14_LDO11: + case S2MPS14_LDO12: + break; + + default: + return 0; + } + else + return 0; + + return s2mps11_of_parse_gpiod(np, "samsung,ext-control", false, desc, + config); +} + static const struct regulator_ops s2mps11_ldo_ops =3D { .list_voltage =3D regulator_list_voltage_linear, .map_voltage =3D regulator_map_voltage_linear, @@ -903,10 +917,16 @@ static const struct regulator_desc s2mps15_regulators= [] =3D { }; =20 static int s2mps14_pmic_enable_ext_control(struct s2mps11_info *s2mps11, - struct regulator_dev *rdev) + struct regulator_dev *rdev) { - return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg, - rdev->desc->enable_mask, S2MPS14_ENABLE_EXT_CONTROL); + int ret =3D regmap_update_bits(rdev->regmap, rdev->desc->enable_reg, + rdev->desc->enable_mask, + S2MPS14_ENABLE_EXT_CONTROL); + if (ret < 0) + return dev_err_probe(rdev_get_dev(rdev), ret, + "failed to enable GPIO control over %d/%s\n", + rdev->desc->id, rdev->desc->name); + return 0; } =20 static int s2mpu02_set_ramp_delay(struct regulator_dev *rdev, int ramp_del= ay) @@ -1244,6 +1264,26 @@ static const struct regulator_desc s2mpu05_regulator= s[] =3D { regulator_desc_s2mpu05_buck45(5), }; =20 +static int s2mps11_handle_ext_control(struct s2mps11_info *s2mps11, + struct regulator_dev *rdev) +{ + int ret; + + switch (s2mps11->dev_type) { + case S2MPS14X: + if (!rdev->ena_pin) + return 0; + + ret =3D s2mps14_pmic_enable_ext_control(s2mps11, rdev); + break; + + default: + return 0; + } + + return ret; +} + static int s2mps11_pmic_probe(struct platform_device *pdev) { struct sec_pmic_dev *iodev =3D dev_get_drvdata(pdev->dev.parent); @@ -1314,15 +1354,9 @@ static int s2mps11_pmic_probe(struct platform_device= *pdev) regulators[i].id, regulators[i].name); =20 - if (regulator->ena_pin) { - ret =3D s2mps14_pmic_enable_ext_control(s2mps11, - regulator); - if (ret < 0) - return dev_err_probe(&pdev->dev, ret, - "failed to enable GPIO control over %d/%s\n", - regulator->desc->id, - regulator->desc->name); - } + ret =3D s2mps11_handle_ext_control(s2mps11, regulator); + if (ret < 0) + return ret; } =20 return 0; --=20 2.52.0.351.gbe84eed79e-goog