From nobody Tue Feb 10 06:25:46 2026 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (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 7F7744508E4 for ; Thu, 22 Jan 2026 15:43:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769096642; cv=none; b=j7/FmyUQRK0TI54uVezkxOM2Pz8Y7Sijkxgd3zF2WTv8wv804Wii3SbbjeELAJXrrIWN/O+1B908a/P/r9pH2CXvVoEaF1ELd3/SVErgjlvg8gAAv6t52UVaelKvR3TdkTUT+Lq688FxM3x23+otGnERAtFSEKKeMwN75Vg2V48= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769096642; c=relaxed/simple; bh=qZwi0VBdEjXKYAJmcVLy03jwB2048b4QRMXyR5EnHQs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TmA95udlgRRd/pb4+l8A3dFk3SrL3EBCkR4fdKEngJeew6E+TabzyEihma0R8P1PotZul1fYiivImw5Ov9xY7xMgNYP+BCuCMVzVYoyu73YPSe5gZRoa0zAplKjQzLWwt2nfv9Ks19woBqbc0EGcXiUCJLfNHxACZIsqYX0jz20= 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=MID5vbQF; arc=none smtp.client-ip=209.85.208.41 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="MID5vbQF" Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-64b791b5584so1742401a12.0 for ; Thu, 22 Jan 2026 07:43:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1769096626; x=1769701426; 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=IbATD9gH/jg77F2vOXb69VjDypI/0O8i8+As0LO3lMk=; b=MID5vbQFsDMz35KD2z4l5ykRaDPTNQqqeR7q+DPXdU7fdSr4zVkf9V3I0rzFz6uT2H 0tqdw1pF858TMcfWi5uDuxWH+fNMk/1MgXncI39eiqri8FDklAQO1uuPqxRQhfjmAYXu 3MikbyEbDnMfTUr0dZa74CQd9dT555rul2EiI7Yh7uXFim6lvQElrNnUJNWPbRX/Ky2G cbWy9+UudeAP7Oom8AmVPCGs0oIlKElSvtTgJlE3eWsUDeFWcs8SDOL5xgMzMFVi9qHZ KMrlPn7WkaGpzNvpIm/W4u4jUmJDf2hXcCfpi4XEvExQySpnOgjWEVHW5MTQkvm/n/tl DmrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769096626; x=1769701426; 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=IbATD9gH/jg77F2vOXb69VjDypI/0O8i8+As0LO3lMk=; b=L4qZ+EzHP9jucugY21g4z9D/GA3ujUkupNiRb2E5A+xAYeZoyulBRXDWm2M28SpoA5 27o7i/B1ZYuMgTK6UiKL2iX3NiCVGPEaL/8EfIecwehaiyoH453snT/8N/8GaDmlBrKW stH/jqmX24uOFURzECFK/9HEjJqrmoerNaxk0pSz8/qGmaawEVV1JXK3kz863CxDXNgE oYgZY/s9eN5bnPQ3DIU4FzlhZhZiSMTLV768Rra5ptigIHOslGTyfzjL0U4OMCvS9E3Q UWOGnNPxyxC4UEF4lMWF0JxKb0HVLoaNwHEJkVb8HpRw4uA4y9jzSIIiMDfawv/3Ef0J wsxA== X-Forwarded-Encrypted: i=1; AJvYcCWoRg4goh3OJbS/daObdRElqW4h7tNc3/UG93UvOdQ4rymqBQDNa5OfqlSweMMG9XQZVUB2bPhjdyQbVzc=@vger.kernel.org X-Gm-Message-State: AOJu0YzyVhMruMvX+eOaURmIeixM1qkDXOT5DuH8LdQJ+i0WxK9WnhHQ sU8hwc2Cty91N4vuB6AG1J5KYU7kerd1mAw/R/MaBzy9G2arbjk7FKx70mJG4fLy8bw= X-Gm-Gg: AZuq6aJ2qIBR0crfuAFaEfS2fSK5KArNWJTKlhyB/yY8RUw0nu6qr0yIkZ9jAeaLIav 4m+IIXjLsO837lT5/KYmaZRGj7L7TQKoRCz+X3qp+0RtQGgaNzlLDXnSRHERS7Jqiq+4KSzLffX ojOZgmgwhmVUZ1Gqp5gQKKeIvT9CzWNNNi+zgvnIeGOZF/WuGAuHjke1mZUN4IZqdrqG0/tynfI 5FKdoNNu5WssqLf4xc1jIJLVM9j4lxIP4u/nbkwvZSOgaJ6bzRgMeoqElL/1fNslrZM91OlrxZb N7COhtWMrUbYwUyKTF5Yyzk3A1XYqqN3oNE6UzgjVSZU8XbC+ALmWzdE2YnnKEH03SrakhRAl3q X67Oz1M1l5UQxOa8FDwXlY2cKEZ0k5FIQlfXHQolsGzTIYn1Anw8/hQlbuZ1lWU/frY9fXDOOqF m1gbnL7T0yFT+jugD9tSvAI/Xz/Fj3wmisOav5XGRqHnFPVQabQDtF4J6b/mnd2Cm8lCkB+mZlJ Xbe6g== X-Received: by 2002:a05:6402:2552:b0:64f:cfa0:9008 with SMTP id 4fb4d7f45d1cf-6584874e1bbmr49315a12.4.1769096626312; Thu, 22 Jan 2026 07:43:46 -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 4fb4d7f45d1cf-654535c49f4sm16334363a12.31.2026.01.22.07.43.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jan 2026 07:43:46 -0800 (PST) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Thu, 22 Jan 2026 15:43:42 +0000 Subject: [PATCH v7 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: <20260122-s2mpg1x-regulators-v7-15-3b1f9831fffd@linaro.org> References: <20260122-s2mpg1x-regulators-v7-0-3b1f9831fffd@linaro.org> In-Reply-To: <20260122-s2mpg1x-regulators-v7-0-3b1f9831fffd@linaro.org> To: Tudor Ambarus , Rob Herring , Conor Dooley , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , Lee Jones , Linus Walleij , Bartosz Golaszewski , Krzysztof Kozlowski , Linus Walleij , Bartosz Golaszewski 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.457.g6b5491de43-goog