From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (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 7E75733A016 for ; Mon, 10 Nov 2025 19:29:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762802957; cv=none; b=aILLhFfUeWKYjpMMkxU34ZGDZJ+RghDMEQcOrIdeSNT5chji01YkVPg3lJeHxrsyRmXgEZuv+dMus/IIgn4o2rnzn6lp4mukpTg7acuimI44J+07KtoLmq8YOM/Mq+T+SOstW5XFgsU0sbSYKjV3iYDF8Vq3Iqm/eCVjtxohDMY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762802957; c=relaxed/simple; bh=Fmx4poAZFZGyLstQYwjHcQxOfV+O6exfaXpWXRFjRjM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XkqGoNeCQATcyEjsQjV+hd8Ckt3YJnPhxY060PTpMvBXJ7h94lJvUI6h2ce2Ji6Ieb8iznSYQDjc+ILbfYquVQr8ld5rZ6gAoFC0n200tu5szVO4UTgyrAbkU3X2TbR1aDalaxXn04OhXclx3egl6HQoqSQqUGK78kXltoaCehU= 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=LlW1aOYj; arc=none smtp.client-ip=209.85.218.52 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="LlW1aOYj" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-b3d196b7eeeso521101766b.0 for ; Mon, 10 Nov 2025 11:29:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1762802949; x=1763407749; 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=uUFmnn4e1bVW35KbGdGkktcuDsfeg0RhFoIgKMaFEtY=; b=LlW1aOYjehsbNPqZfmaJf7+hrPcZOPnRZoocNzNPDUy9WMqZq3Iqszha3F897BAIrz 7XzLOY/6+vqRNuwb5/clGyI/7BFgfjlrwFi3HNBEdb7z2SSgNNscguYsQ1rXjjs5tGjb 6hHkFu8dberHfpI5Ad/m+8ETBGBJ2ekMrrByT84lxTg08JYHxmk+fQYfxomtfWQ630jM tODK9LNSjLVrwJ8C/Gk8XygCun3ywpg0ALSwnumsuIRzI/Qlri1xcSSkQEXPsYLkX81J S/yoQLKCs5/xhDLxe3YldJUfeZjGHQSiAr9LsSulfH5/efrPLOmK5ye/Jgkk0ECRkZS9 0cfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762802949; x=1763407749; 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=uUFmnn4e1bVW35KbGdGkktcuDsfeg0RhFoIgKMaFEtY=; b=Q3x3V2Qe5EjtSt5yL8mP9AdPr4nhfMKPYT3/OkrORl2SUMVwfG+VQDETDz4mkcA41Q /yOJ4I+7VOcl13FzjG7LoPAfwOkySKvZ1UMGhAblptogov+9TmL+wVOLnEJDhAMjs9yV Md2Dbf/nuwgQsGdsG9hCTdu022muA8SKuxLyKe73lO92DiGYJHYI8gQ4OE3rz5N3pRGI P460S2+hzotkctC4a5GGrir7d09eMMyr868bmo4fXL1HM/kyRbjgaFvSmMKsFQ/3ADHO dXwXqDSdHqjdLdfKM1Nol0iboHbHJhA73UzclJpWT29VDgG7xL8boHTK0SBLM8Z+aOC0 +CXg== X-Forwarded-Encrypted: i=1; AJvYcCXPy+yQ9q/E8DlxNUGI9Sm2oSdxUI/w2vlZlXpHTVjQ5Zno50dB0/SXWnp3EHnZiKyjILPEauCeGhFC@vger.kernel.org X-Gm-Message-State: AOJu0Ywbx5XDssOpO0jmSJCed2jJ+c2rqY/DuJfsr7vl5Q0iQtoXHLyu EsOs/kmQyaPHVwZLGACH5uHnI7f8Z1PLdx2vnIbg38NNdNzkM6gCrzwzfYvhaurAfWc= X-Gm-Gg: ASbGncvkp0CyVH0yPvNoTW15R23n1d31KgYNucX3k4Ams8AlxAQHFM0siLIljkNkILf O8dgxJ5Nvq+9tggEyzWX3qBcjAv1zX2nxPXlGsBOXyC9f88DdWTTYdnhkPkN8arnYtG+Rdk/gjR 42KVAOiP1BGEAeATnHveykkCF8PgBL4AAyoVkcPn4aQmugi8jUJ0U/kAvZDz4hxBjm8ak3suf+5 Gv4RVgltKV+z86qbAesDmpkZSebYSbMu8g/9QlLQVyAwPvg3Q1/KoBdyYvobO0OkBwQ2CL5glfr DvdG0BsunAFt27Zv08Zn8a7ZAcpPgU9hzihTV2GsDDpiKcwjLthazKhj6NELuQh46T6mYVVeIdL zU6KoYGGUOzSRpiqHEO3mtxG2bESXb96talVm9DnrreF3n/DEehNCM6qHWmZj8jNJlUfovjcvHR avuGuDN1cxAMfFl46U+i9f3Li9zc6HC+kyLyWhPEfeRCSz7MJugHAJuABMrOPB X-Google-Smtp-Source: AGHT+IHNQl/iS05xTmRf0E31VhCPdGxfwqJeYNmuqmcrWkHeSWZd3rc8bHHOKIevtAA3KAJ0hcfK0Q== X-Received: by 2002:a17:906:4fcf:b0:b72:dee9:88df with SMTP id a640c23a62f3a-b72e047b41emr950072166b.46.1762802948548; Mon, 10 Nov 2025 11:29:08 -0800 (PST) Received: from puffmais2.c.googlers.com (254.48.34.34.bc.googleusercontent.com. [34.34.48.254]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b72bf97d16esm1168178166b.35.2025.11.10.11.29.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Nov 2025 11:29:08 -0800 (PST) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Mon, 10 Nov 2025 19:29:01 +0000 Subject: [PATCH v4 18/20] regulator: s2mps11: refactor S2MPG10 regulator macros for S2MPG11 reuse Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20251110-s2mpg1x-regulators-v4-18-94c9e726d4ba@linaro.org> References: <20251110-s2mpg1x-regulators-v4-0-94c9e726d4ba@linaro.org> In-Reply-To: <20251110-s2mpg1x-regulators-v4-0-94c9e726d4ba@linaro.org> To: Tudor Ambarus , Rob Herring , Conor Dooley , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , Lee Jones , Linus Walleij , Bartosz Golaszewski , Krzysztof Kozlowski Cc: Peter Griffin , Will McVicker , 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 Rails in the S2MPG11 share a very similar set of properties with S2MPG10 with slight differences. Update the existing macros to allow reuse by the upcoming S2MPG11 driver. Signed-off-by: André Draszik --- Note: checkpatch complains about unused macro arguments _r_mask, _r_table, and _r_table_sz, but these are false-positives due to patch context. v2: - fix commit message typos: s2mp1 -> s2mpg1 - drop duplicated assignment of ::of_parse_cb in regulator_desc_s2mpg1x_buck_cmn() macro --- drivers/regulator/s2mps11.c | 69 +++++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 27 deletions(-) diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c index d840aec236dcbdc8b460f89b4cd04e42e3b3da7d..35cfea6b6d8091ba21f00e1cb82b11a8dc9bc3ec 100644 --- a/drivers/regulator/s2mps11.c +++ b/drivers/regulator/s2mps11.c @@ -650,31 +650,44 @@ static const struct regulator_ops s2mpg10_reg_buck_ops[] = { * (12.5mV/μs) while our ::set_voltage_time() takes the value in ramp_reg * into account. */ -#define regulator_desc_s2mpg10_buck(_num, _vrange, _r_reg) { \ - .name = "buck"#_num "m", \ - .supply_name = "vinb"#_num "m", \ - .of_match = of_match_ptr("buck"#_num "m"), \ +#define regulator_desc_s2mpg1x_buck_cmn(_name, _id, _supply, _ops, \ + _vrange, _vsel_reg, _vsel_mask, _en_reg, _en_mask, \ + _r_reg, _r_mask, _r_table, _r_table_sz, \ + _en_time) { \ + .name = "buck" _name, \ + .supply_name = _supply, \ + .of_match = of_match_ptr("buck" _name), \ .regulators_node = of_match_ptr("regulators"), \ .of_parse_cb = s2mpg10_of_parse_cb, \ - .id = S2MPG10_BUCK##_num, \ - .ops = &s2mpg10_reg_buck_ops[0], \ + .id = _id, \ + .ops = &(_ops)[0], \ .type = REGULATOR_VOLTAGE, \ .owner = THIS_MODULE, \ .linear_ranges = _vrange, \ .n_linear_ranges = ARRAY_SIZE(_vrange), \ .n_voltages = _vrange##_count, \ - .vsel_reg = S2MPG10_PMIC_B##_num##M_OUT1, \ - .vsel_mask = 0xff, \ - .enable_reg = S2MPG10_PMIC_B##_num##M_CTRL, \ - .enable_mask = GENMASK(7, 6), \ - .ramp_reg = S2MPG10_PMIC_##_r_reg, \ - .ramp_mask = s2mpg10_buck_to_ramp_mask(S2MPG10_BUCK##_num \ - - S2MPG10_BUCK1), \ - .ramp_delay_table = s2mpg10_buck_ramp_table, \ - .n_ramp_values = ARRAY_SIZE(s2mpg10_buck_ramp_table), \ - .enable_time = 30, /* + V/enable_ramp_rate */ \ + .vsel_reg = _vsel_reg, \ + .vsel_mask = _vsel_mask, \ + .enable_reg = _en_reg, \ + .enable_mask = _en_mask, \ + .ramp_reg = _r_reg, \ + .ramp_mask = _r_mask, \ + .ramp_delay_table = _r_table, \ + .n_ramp_values = _r_table_sz, \ + .enable_time = _en_time, /* + V/enable_ramp_rate */ \ } +#define regulator_desc_s2mpg10_buck(_num, _vrange, _r_reg) \ + regulator_desc_s2mpg1x_buck_cmn(#_num "m", S2MPG10_BUCK##_num, \ + "vinb"#_num "m", s2mpg10_reg_buck_ops, _vrange, \ + S2MPG10_PMIC_B##_num##M_OUT1, GENMASK(7, 0), \ + S2MPG10_PMIC_B##_num##M_CTRL, GENMASK(7, 6), \ + S2MPG10_PMIC_##_r_reg, \ + s2mpg10_buck_to_ramp_mask(S2MPG10_BUCK##_num \ + - S2MPG10_BUCK1), \ + s2mpg10_buck_ramp_table, \ + ARRAY_SIZE(s2mpg10_buck_ramp_table), 30) + #define s2mpg10_regulator_desc_buck_cm(_num, _vrange, _r_reg) \ .desc = regulator_desc_s2mpg10_buck(_num, _vrange, _r_reg), \ .enable_ramp_rate = 12500 @@ -738,24 +751,24 @@ static const struct regulator_ops s2mpg10_reg_ldo_ramp_ops[] = { } }; -#define regulator_desc_s2mpg10_ldo_cmn(_num, _supply, _ops, _vrange, \ - _vsel_reg_sfx, _vsel_mask, _en_reg, _en_mask, \ +#define regulator_desc_s2mpg1x_ldo_cmn(_name, _id, _supply, _ops, \ + _vrange, _vsel_reg, _vsel_mask, _en_reg, _en_mask, \ _ramp_delay, _r_reg, _r_mask, _r_table, _r_table_sz) { \ - .name = "ldo"#_num "m", \ + .name = "ldo" _name, \ .supply_name = _supply, \ - .of_match = of_match_ptr("ldo"#_num "m"), \ + .of_match = of_match_ptr("ldo" _name), \ .regulators_node = of_match_ptr("regulators"), \ .of_parse_cb = s2mpg10_of_parse_cb, \ - .id = S2MPG10_LDO##_num, \ + .id = _id, \ .ops = &(_ops)[0], \ .type = REGULATOR_VOLTAGE, \ .owner = THIS_MODULE, \ .linear_ranges = _vrange, \ .n_linear_ranges = ARRAY_SIZE(_vrange), \ .n_voltages = _vrange##_count, \ - .vsel_reg = S2MPG10_PMIC_L##_num##M_##_vsel_reg_sfx, \ + .vsel_reg = _vsel_reg, \ .vsel_mask = _vsel_mask, \ - .enable_reg = S2MPG10_PMIC_##_en_reg, \ + .enable_reg = _en_reg, \ .enable_mask = _en_mask, \ .ramp_delay = _ramp_delay, \ .ramp_reg = _r_reg, \ @@ -770,10 +783,12 @@ static const struct regulator_ops s2mpg10_reg_ldo_ramp_ops[] = { _ramp_delay, _r_reg, _r_mask, _r_table, _r_table_sz, \ _pc_reg, _pc_mask) \ [S2MPG10_LDO##_num] = { \ - .desc = regulator_desc_s2mpg10_ldo_cmn(_num, _supply, \ - _ops, \ - _vrange, _vsel_reg_sfx, _vsel_mask, \ - _en_reg, _en_mask, \ + .desc = regulator_desc_s2mpg1x_ldo_cmn(#_num "m", \ + S2MPG10_LDO##_num, _supply, _ops, \ + _vrange, \ + S2MPG10_PMIC_L##_num##M_##_vsel_reg_sfx, \ + _vsel_mask, \ + S2MPG10_PMIC_##_en_reg, _en_mask, \ _ramp_delay, _r_reg, _r_mask, _r_table, \ _r_table_sz), \ .pctrlsel_reg = _pc_reg, \ -- 2.51.2.1041.gc1ab5b90ca-goog