From nobody Mon Apr 13 10:39:31 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91677C25B0E for ; Mon, 15 Aug 2022 04:34:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240779AbiHOEes (ORCPT ); Mon, 15 Aug 2022 00:34:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232772AbiHOEen (ORCPT ); Mon, 15 Aug 2022 00:34:43 -0400 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 942FF14D21; Sun, 14 Aug 2022 21:34:42 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 1650C3200754; Mon, 15 Aug 2022 00:34:41 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 15 Aug 2022 00:34:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1660538080; x=1660624480; bh=ZS xEvGyrB6oDsjk8O9SkFaf2hh3bJF3tpg+kGnGDcDM=; b=I/QJe0JP656h626rPp o1Mjn/3punpiO398RO4DtHOsAT4+IPzySnt2SsP8haiSLnSEJWOsRKu1+fJu9472 HzE8/dWnp5Tr3Sa3fUPRq27Vr31qBr94IkL+PFHFczFMBuXSoGRWwmqdg0tKa+9l WopS3eS/+iv8QfVCAOVSx5uyIJVqP/sxmp+EhDKCnl9w4/U2f+IXupm7JAKPVaz3 ehu+YrccY9GsOGiQ8OTk+MtxtTXdZ4ep419ipy/gklxuu77OfcOgFfhFeJBxPHzE iEnEISlp0HI+qXM3v+Le/yHwJjGAfHkDDunTduD7QhGOnhoMnaEOkUGHgSASitd8 klFA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1660538080; x=1660624480; bh=ZSxEvGyrB6oDs jk8O9SkFaf2hh3bJF3tpg+kGnGDcDM=; b=XxyxXqr16cYo0DvpvkXZm6Mejo0At rDJST+FmSc39aTRU7R6JjEUfkJowvVzoTXMruNgofff7kG2XiWNbfPB2fCgKWeX8 WVbXQkw4Q/A1Ho/Ny09cfJMh3+x0hHekBABkMfl2ejIYPHDOJ+dkaxa0SawtLiGq nGzWJWCaSLSjMu3Yuz1H4F/g7QMOTu2pnaB7Hiej8eU4IzlY6OaiVc5VAj4oH3lK ZEUH2kUAN2KAwfQC7cu7NI4OCBmIDKVE7xPhPwuJVTDlcVWPZQq4wcjftIF2lWhl 3SzdJSuYXMOomJppGIjcLBx5wsFBOYu+KQmREoD8SCNKtGy0BjfDXaI6w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehuddgkeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepgffhvefhgfehjeehgfekheeuffegheffjeegheeuudeufeffhffh ueeihfeufffhnecuffhomhgrihhnpeguvghvihgtvghtrhgvvgdrohhrghenucevlhhush htvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmuhgvlhesshhh ohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 Aug 2022 00:34:39 -0400 (EDT) From: Samuel Holland To: Liam Girdwood , Mark Brown , Chen-Yu Tsai , Jernej Skrabec , Krzysztof Kozlowski , Rob Herring Cc: Samuel Holland , Maxime Ripard , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH v3 1/4] regulator: dt-bindings: Add Allwinner D1 LDOs Date: Sun, 14 Aug 2022 23:34:32 -0500 Message-Id: <20220815043436.20170-2-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220815043436.20170-1-samuel@sholland.org> References: <20220815043436.20170-1-samuel@sholland.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The Allwinner D1 SoC contains two pairs of in-package LDOs. One pair is for general purpose use. LDOA generally powers the board's 1.8 V rail. LDOB generally powers the in-package DRAM, where applicable. The other pair of LDOs powers the analog power domains inside the SoC, including the audio codec, thermal sensor, and ADCs. These LDOs require a 0.9 V bandgap voltage reference. The calibration value for the voltage reference is stored in an eFuse, accessed via an NVMEM cell. Neither LDO control register is in its own MMIO range; instead, each regulator device relies on a regmap/syscon exported by its parent. Signed-off-by: Samuel Holland --- Changes in v3: - Add "reg" property to bindings - Add "unevaluatedProperties: true" to regulator nodes - Minor changes to regulator node name patterns - Remove system-ldos example (now added in patch 3) Changes in v2: - Remove syscon property from bindings - Update binding examples to fix warnings and provide context .../allwinner,sun20i-d1-analog-ldos.yaml | 74 +++++++++++++++++++ .../allwinner,sun20i-d1-system-ldos.yaml | 37 ++++++++++ 2 files changed, 111 insertions(+) create mode 100644 Documentation/devicetree/bindings/regulator/allwinner,s= un20i-d1-analog-ldos.yaml create mode 100644 Documentation/devicetree/bindings/regulator/allwinner,s= un20i-d1-system-ldos.yaml diff --git a/Documentation/devicetree/bindings/regulator/allwinner,sun20i-d= 1-analog-ldos.yaml b/Documentation/devicetree/bindings/regulator/allwinner,= sun20i-d1-analog-ldos.yaml new file mode 100644 index 000000000000..d6964b44ef21 --- /dev/null +++ b/Documentation/devicetree/bindings/regulator/allwinner,sun20i-d1-analo= g-ldos.yaml @@ -0,0 +1,74 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/regulator/allwinner,sun20i-d1-analog-ld= os.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Allwinner D1 Analog LDOs + +description: + Allwinner D1 contains a set of LDOs which are designed to supply analog = power + inside and outside the SoC. They are controlled by a register within the= audio + codec MMIO space, but which is not part of the audio codec clock/reset d= omain. + +maintainers: + - Samuel Holland + +properties: + compatible: + enum: + - allwinner,sun20i-d1-analog-ldos + + reg: + maxItems: 1 + + nvmem-cells: + items: + - description: NVMEM cell for the calibrated bandgap reference trim = value + + nvmem-cell-names: + items: + - const: bg_trim + +patternProperties: + "^(a|hp)ldo$": + type: object + $ref: regulator.yaml# + unevaluatedProperties: false + +required: + - compatible + - reg + - nvmem-cells + - nvmem-cell-names + +unevaluatedProperties: false + +examples: + - | + audio-codec@2030000 { + compatible =3D "simple-mfd", "syscon"; + reg =3D <0x2030000 0x1000>; + ranges; + #address-cells =3D <1>; + #size-cells =3D <1>; + + regulators@2030348 { + compatible =3D "allwinner,sun20i-d1-analog-ldos"; + reg =3D <0x2030348 0x4>; + nvmem-cells =3D <&bg_trim>; + nvmem-cell-names =3D "bg_trim"; + + reg_aldo: aldo { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; + + reg_hpldo: hpldo { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; + }; + }; + +... diff --git a/Documentation/devicetree/bindings/regulator/allwinner,sun20i-d= 1-system-ldos.yaml b/Documentation/devicetree/bindings/regulator/allwinner,= sun20i-d1-system-ldos.yaml new file mode 100644 index 000000000000..e3e2810fb3d7 --- /dev/null +++ b/Documentation/devicetree/bindings/regulator/allwinner,sun20i-d1-syste= m-ldos.yaml @@ -0,0 +1,37 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/regulator/allwinner,sun20i-d1-system-ld= os.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Allwinner D1 System LDOs + +description: + Allwinner D1 contains a pair of general-purpose LDOs which are designed = to + supply power inside and outside the SoC. They are controlled by a regist= er + within the system control MMIO space. + +maintainers: + - Samuel Holland + +properties: + compatible: + enum: + - allwinner,sun20i-d1-system-ldos + + reg: + maxItems: 1 + +patternProperties: + "^ldo[ab]$": + type: object + $ref: regulator.yaml# + unevaluatedProperties: false + +required: + - compatible + - reg + +unevaluatedProperties: false + +... --=20 2.35.1 From nobody Mon Apr 13 10:39:31 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 660B4C00140 for ; Mon, 15 Aug 2022 04:34:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240825AbiHOEew (ORCPT ); Mon, 15 Aug 2022 00:34:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240773AbiHOEeq (ORCPT ); Mon, 15 Aug 2022 00:34:46 -0400 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EB6815710; Sun, 14 Aug 2022 21:34:45 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id CFDA032007F1; Mon, 15 Aug 2022 00:34:43 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 15 Aug 2022 00:34:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1660538083; x=1660624483; bh=j0 YGbL+16ryHG9GLVxnVYPWloLbOtkIl8/4JW1mVKes=; b=uzvtGcHJPf3NalAYL/ UFFDU4uW4gapBp/ZbR7pNt02YvW6Xm3uAqIuF7iL+gGWBCMVsj7zfFBVvp0WshHL uCPZgqUdZPqL+CFcVE7EMiG9MqGPLTlefgmtlueEFwVyjJEs/V3lf1qx8DW5cQJm mG0+uANkxa4m1HuIAIHNjhNg9N/+6Ti6iT2M1vlNLDLXw/4uPppDK7+3tchoOOFA Uhq9ISgXsC1sa9heKWo+y6w/XLcvcJPDBRad6DjG1nK6FCaZpjDc60lq7goDRBrn oUP/HugGiie+6wMb0luwjy55GLFjlOb9NeykfGQbbY/EHRtz7RdpoYFqD8PyhhMq CxXg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1660538083; x=1660624483; bh=j0YGbL+16ryHG 9GLVxnVYPWloLbOtkIl8/4JW1mVKes=; b=CAOciLFtU5rFtJ5d/Uz5SgoI/iePa zWZX3JXjuAo0hlkNXXH0Z76DFF8Y+ELVFD9vGlRDE90jMshZiQv05GnsNiMD8JqG 0edRE1ATAaGZlxH9Ggl3iNB4i0uQclN7eGjt++sQaZhRI0HIIuuaY/uUqZqCR/pj LBGFEtiw4nOtiGBlqh/DheBSscC3zvW+BIWtlylr6xhDxgKH1QndeB940QXkm0v+ lNKHFXYFdIGR3G5F0EDRi3ZkZDILR4ommJ8EkS6BzeImyR4Ln54jf6GNTmaN1jSm m9vaZyp7fJ1R2M4hJn1mQ5l1lZk7xe8yUl+x2iadBM0ASHS13nnzNEDHA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehuddgkeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 Aug 2022 00:34:42 -0400 (EDT) From: Samuel Holland To: Liam Girdwood , Mark Brown , Chen-Yu Tsai , Jernej Skrabec , Krzysztof Kozlowski , Rob Herring Cc: Samuel Holland , Maxime Ripard , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH v3 2/4] regulator: sun20i: Add support for Allwinner D1 LDOs Date: Sun, 14 Aug 2022 23:34:33 -0500 Message-Id: <20220815043436.20170-3-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220815043436.20170-1-samuel@sholland.org> References: <20220815043436.20170-1-samuel@sholland.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" D1 contains two pairs of LDOs. Since they have similar bindings, and they always exist together, put them in a single driver. The analog LDOs are relatively boring, with a single linear range. Their one quirk is that a bandgap reference must be calibrated for them to produce the correct voltage. The system LDOs have the complication that their voltage step is not an integer, so a custom .list_voltage is needed to get the rounding right. Signed-off-by: Samuel Holland Reviewed-by: Heiko Stuebner Tested-by: Heiko Stuebner --- Changes in v3: - Adjust control flow in sun20i_regulator_get_regmap() for clarity Changes in v2: - Use decimal numbers for .n_voltages instead of field widths - Get the regmap from the parent device instead of a property/phandle drivers/regulator/Kconfig | 8 + drivers/regulator/Makefile | 1 + drivers/regulator/sun20i-regulator.c | 232 +++++++++++++++++++++++++++ 3 files changed, 241 insertions(+) create mode 100644 drivers/regulator/sun20i-regulator.c diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 23e3e4a35cc9..0c5727173fa0 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -1262,6 +1262,14 @@ config REGULATOR_STW481X_VMMC This driver supports the internal VMMC regulator in the STw481x PMIC chips. =20 +config REGULATOR_SUN20I + tristate "Allwinner D1 internal LDOs" + depends on ARCH_SUNXI || COMPILE_TEST + depends on MFD_SYSCON && NVMEM + default ARCH_SUNXI + help + This driver supports the internal LDOs in the Allwinner D1 SoC. + config REGULATOR_SY7636A tristate "Silergy SY7636A voltage regulator" help diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index fa49bb6cc544..5dff112eb015 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -148,6 +148,7 @@ obj-$(CONFIG_REGULATOR_STM32_VREFBUF) +=3D stm32-vrefbu= f.o obj-$(CONFIG_REGULATOR_STM32_PWR) +=3D stm32-pwr.o obj-$(CONFIG_REGULATOR_STPMIC1) +=3D stpmic1_regulator.o obj-$(CONFIG_REGULATOR_STW481X_VMMC) +=3D stw481x-vmmc.o +obj-$(CONFIG_REGULATOR_SUN20I) +=3D sun20i-regulator.o obj-$(CONFIG_REGULATOR_SY7636A) +=3D sy7636a-regulator.o obj-$(CONFIG_REGULATOR_SY8106A) +=3D sy8106a-regulator.o obj-$(CONFIG_REGULATOR_SY8824X) +=3D sy8824x.o diff --git a/drivers/regulator/sun20i-regulator.c b/drivers/regulator/sun20= i-regulator.c new file mode 100644 index 000000000000..46f3927d7d10 --- /dev/null +++ b/drivers/regulator/sun20i-regulator.c @@ -0,0 +1,232 @@ +// SPDX-License-Identifier: GPL-2.0-only +// +// Copyright (c) 2021-2022 Samuel Holland +// + +#include +#include +#include +#include +#include +#include +#include + +#define SUN20I_POWER_REG 0x348 + +#define SUN20I_SYS_LDO_CTRL_REG 0x150 + +struct sun20i_regulator_data { + int (*init)(struct device *dev, + struct regmap *regmap); + const struct regulator_desc *descs; + unsigned int ndescs; +}; + +static int sun20i_d1_analog_ldos_init(struct device *dev, struct regmap *r= egmap) +{ + u8 bg_trim; + int ret; + + ret =3D nvmem_cell_read_u8(dev, "bg_trim", &bg_trim); + if (ret) + return dev_err_probe(dev, ret, "Failed to get bg_trim value\n"); + + /* The default value corresponds to 900 mV. */ + if (!bg_trim) + bg_trim =3D 0x19; + + return regmap_update_bits(regmap, SUN20I_POWER_REG, + GENMASK(7, 0), bg_trim); +} + +static const struct regulator_ops sun20i_d1_analog_ldo_ops =3D { + .list_voltage =3D regulator_list_voltage_linear, + .map_voltage =3D regulator_map_voltage_linear, + .set_voltage_sel =3D regulator_set_voltage_sel_regmap, + .get_voltage_sel =3D regulator_get_voltage_sel_regmap, + .enable =3D regulator_enable_regmap, + .disable =3D regulator_disable_regmap, + .is_enabled =3D regulator_is_enabled_regmap, +}; + +static const struct regulator_desc sun20i_d1_analog_ldo_descs[] =3D { + { + .name =3D "aldo", + .supply_name =3D "vdd33", + .of_match =3D "aldo", + .ops =3D &sun20i_d1_analog_ldo_ops, + .type =3D REGULATOR_VOLTAGE, + .owner =3D THIS_MODULE, + .n_voltages =3D 8, + .min_uV =3D 1650000, + .uV_step =3D 50000, + .vsel_reg =3D SUN20I_POWER_REG, + .vsel_mask =3D GENMASK(14, 12), + .enable_reg =3D SUN20I_POWER_REG, + .enable_mask =3D BIT(31), + }, + { + .name =3D "hpldo", + .supply_name =3D "hpldoin", + .of_match =3D "hpldo", + .ops =3D &sun20i_d1_analog_ldo_ops, + .type =3D REGULATOR_VOLTAGE, + .owner =3D THIS_MODULE, + .n_voltages =3D 8, + .min_uV =3D 1650000, + .uV_step =3D 50000, + .vsel_reg =3D SUN20I_POWER_REG, + .vsel_mask =3D GENMASK(10, 8), + .enable_reg =3D SUN20I_POWER_REG, + .enable_mask =3D BIT(30), + }, +}; + +static const struct sun20i_regulator_data sun20i_d1_analog_ldos =3D { + .init =3D sun20i_d1_analog_ldos_init, + .descs =3D sun20i_d1_analog_ldo_descs, + .ndescs =3D ARRAY_SIZE(sun20i_d1_analog_ldo_descs), +}; + +/* regulator_list_voltage_linear() modified for the non-integral uV_step. = */ +static int sun20i_d1_system_ldo_list_voltage(struct regulator_dev *rdev, + unsigned int selector) +{ + const struct regulator_desc *desc =3D rdev->desc; + unsigned int uV; + + if (selector >=3D desc->n_voltages) + return -EINVAL; + + uV =3D desc->min_uV + (desc->uV_step * selector); + + /* Produce correctly-rounded absolute voltages. */ + return uV + ((selector + 1 + (desc->min_uV % 4)) / 3); +} + +static const struct regulator_ops sun20i_d1_system_ldo_ops =3D { + .list_voltage =3D sun20i_d1_system_ldo_list_voltage, + .map_voltage =3D regulator_map_voltage_ascend, + .set_voltage_sel =3D regulator_set_voltage_sel_regmap, + .get_voltage_sel =3D regulator_get_voltage_sel_regmap, +}; + +static const struct regulator_desc sun20i_d1_system_ldo_descs[] =3D { + { + .name =3D "ldoa", + .supply_name =3D "ldo-in", + .of_match =3D "ldoa", + .ops =3D &sun20i_d1_system_ldo_ops, + .type =3D REGULATOR_VOLTAGE, + .owner =3D THIS_MODULE, + .n_voltages =3D 32, + .min_uV =3D 1600000, + .uV_step =3D 13333, /* repeating */ + .vsel_reg =3D SUN20I_SYS_LDO_CTRL_REG, + .vsel_mask =3D GENMASK(7, 0), + }, + { + .name =3D "ldob", + .supply_name =3D "ldo-in", + .of_match =3D "ldob", + .ops =3D &sun20i_d1_system_ldo_ops, + .type =3D REGULATOR_VOLTAGE, + .owner =3D THIS_MODULE, + .n_voltages =3D 64, + .min_uV =3D 1166666, + .uV_step =3D 13333, /* repeating */ + .vsel_reg =3D SUN20I_SYS_LDO_CTRL_REG, + .vsel_mask =3D GENMASK(15, 8), + }, +}; + +static const struct sun20i_regulator_data sun20i_d1_system_ldos =3D { + .descs =3D sun20i_d1_system_ldo_descs, + .ndescs =3D ARRAY_SIZE(sun20i_d1_system_ldo_descs), +}; + +static const struct of_device_id sun20i_regulator_of_match[] =3D { + { + .compatible =3D "allwinner,sun20i-d1-analog-ldos", + .data =3D &sun20i_d1_analog_ldos, + }, + { + .compatible =3D "allwinner,sun20i-d1-system-ldos", + .data =3D &sun20i_d1_system_ldos, + }, + { }, +}; +MODULE_DEVICE_TABLE(of, sun20i_regulator_of_match); + +static struct regmap *sun20i_regulator_get_regmap(struct device *dev) +{ + struct regmap *regmap; + + /* + * First try the syscon interface. The system control device is not + * compatible with "syscon", so fall back to getting the regmap from + * its platform device. This is ugly, but required for devicetree + * backward compatibility. + */ + regmap =3D syscon_node_to_regmap(dev->parent->of_node); + if (!IS_ERR(regmap)) + return regmap; + + regmap =3D dev_get_regmap(dev->parent, NULL); + if (regmap) + return regmap; + + return ERR_PTR(-EPROBE_DEFER); +} + +static int sun20i_regulator_probe(struct platform_device *pdev) +{ + const struct sun20i_regulator_data *data; + struct device *dev =3D &pdev->dev; + struct regulator_config config; + struct regmap *regmap; + int ret; + + data =3D of_device_get_match_data(dev); + if (!data) + return -EINVAL; + + regmap =3D sun20i_regulator_get_regmap(dev); + if (IS_ERR(regmap)) + return dev_err_probe(dev, PTR_ERR(regmap), "Failed to get regmap\n"); + + if (data->init) { + ret =3D data->init(dev, regmap); + if (ret) + return ret; + } + + config =3D (struct regulator_config) { + .dev =3D dev, + .regmap =3D regmap, + }; + + for (unsigned int i =3D 0; i < data->ndescs; ++i) { + const struct regulator_desc *desc =3D &data->descs[i]; + struct regulator_dev *rdev; + + rdev =3D devm_regulator_register(dev, desc, &config); + if (IS_ERR(rdev)) + return PTR_ERR(rdev); + } + + return 0; +} + +static struct platform_driver sun20i_regulator_driver =3D { + .probe =3D sun20i_regulator_probe, + .driver =3D { + .name =3D "sun20i-regulator", + .of_match_table =3D sun20i_regulator_of_match, + }, +}; +module_platform_driver(sun20i_regulator_driver); + +MODULE_AUTHOR("Samuel Holland "); +MODULE_DESCRIPTION("Allwinner D1 internal LDO driver"); +MODULE_LICENSE("GPL"); --=20 2.35.1 From nobody Mon Apr 13 10:39:31 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 714D1C00140 for ; Mon, 15 Aug 2022 04:34:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240884AbiHOEe5 (ORCPT ); Mon, 15 Aug 2022 00:34:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240784AbiHOEes (ORCPT ); Mon, 15 Aug 2022 00:34:48 -0400 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26E0614D2E; Sun, 14 Aug 2022 21:34:48 -0700 (PDT) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 97A35320039A; Mon, 15 Aug 2022 00:34:46 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Mon, 15 Aug 2022 00:34:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1660538086; x=1660624486; bh=XH 2cIlWZsk/PrlJIdXb2Jov0BbOTJ4OiPzQM4O8yc7o=; b=ce4GHGTG84XpdwddCX gJ7V9nSj6ywVsKqnbZudmG7S2xA5EA0kfCF9/2gJ+6BrbCLqjOjMqydgCfECguWg wEQOaAS4vCJwoNHdILkaM5tQ9+GdxojkjNuQ42+geC1+XgA9EXIrKQW6fsFVEZrV U64j1DC8h9xqezfZj88ncxsjZjd82EDv1MMyKl2JuvmBuzXfiOjwPeH7KeBoSrdm LgUoBpixT1uqYogI/37lvt+lXZAmT5mXW62WfhfEE8/7liTvUZb3eQ1lYfeHHeZ/ /FeiQzmGlhADMgToXvG+oTH7EckVyHgZA8WQlCsqfgqh80ZLj/3hx8dvLD+etytB vbJA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1660538086; x=1660624486; bh=XH2cIlWZsk/Pr lJIdXb2Jov0BbOTJ4OiPzQM4O8yc7o=; b=se4Y7TsqorqvAjfC85OfF3TvjDPWU jBYMgIHlll7q0VgloXRHJ2VzRUtUuIeK9AR0Ajfvy5qjzB7DsfBkatdJGxxC54Wp xshZXEXs2js0epyNmaghIvNGOrE3EnmlXIpoY6cBP1Kp6P1DHligCtD9kDX/X8IE Jq6zcNmhLWhSnfEk08Nct1MO3oKevel+wShkA8HufpgGPSlsSPoL1PMwKBLpc7mU 2uOY6ch74NUZHK0tIT+vWH3vryCea2nQZ6UjtApGpkVNdrRnmjxxCF0LMHUZkoQh YbwWaY4nCjsysklVjuSbXl/tsOs6T3gO8pl6NrIidQJVv5SCtuujtA5gQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehuddgkeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 Aug 2022 00:34:45 -0400 (EDT) From: Samuel Holland To: Liam Girdwood , Mark Brown , Chen-Yu Tsai , Jernej Skrabec , Krzysztof Kozlowski , Rob Herring Cc: Samuel Holland , Maxime Ripard , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH v3 3/4] dt-bindings: sram: sunxi-sram: Add optional regulators child Date: Sun, 14 Aug 2022 23:34:34 -0500 Message-Id: <20220815043436.20170-4-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220815043436.20170-1-samuel@sholland.org> References: <20220815043436.20170-1-samuel@sholland.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Some sunxi SoCs have in-package regulators controlled by a register in the system control MMIO block. Allow a child node for these regulators in addition to SRAM child nodes. Signed-off-by: Samuel Holland --- Changes in v3: - Require the regulators node to have a unit address - Reference the regulator schema from the SRAM controller schema - Move the system LDOs example to the SRAM controller schema - Reorder the patches so the example passes validation Changes in v2: - New patch for v2 .../allwinner,sun4i-a10-system-control.yaml | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-sys= tem-control.yaml b/Documentation/devicetree/bindings/sram/allwinner,sun4i-a= 10-system-control.yaml index d64c1b28fb61..915ca85c3f10 100644 --- a/Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-con= trol.yaml +++ b/Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-con= trol.yaml @@ -56,6 +56,10 @@ properties: ranges: true =20 patternProperties: + "^regulators@[0-9a-f]+$": + $ref: /schemas/regulator/allwinner,sun20i-d1-system-ldos.yaml# + unevaluatedProperties: false + "^sram@[a-z0-9]+": type: object =20 @@ -130,3 +134,28 @@ examples: }; }; }; + + - | + syscon@3000000 { + compatible =3D "allwinner,sun20i-d1-system-control"; + reg =3D <0x3000000 0x1000>; + ranges; + #address-cells =3D <1>; + #size-cells =3D <1>; + + regulators@3000150 { + compatible =3D "allwinner,sun20i-d1-system-ldos"; + reg =3D <0x3000150 0x4>; + + reg_ldoa: ldoa { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; + + reg_ldob: ldob { + regulator-name =3D "vcc-dram"; + regulator-min-microvolt =3D <1500000>; + regulator-max-microvolt =3D <1500000>; + }; + }; + }; --=20 2.35.1 From nobody Mon Apr 13 10:39:31 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9441C00140 for ; Mon, 15 Aug 2022 04:35:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240942AbiHOEfD (ORCPT ); Mon, 15 Aug 2022 00:35:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240794AbiHOEey (ORCPT ); Mon, 15 Aug 2022 00:34:54 -0400 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D748815727; Sun, 14 Aug 2022 21:34:50 -0700 (PDT) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 59B03320083A; Mon, 15 Aug 2022 00:34:49 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Mon, 15 Aug 2022 00:34:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1660538088; x=1660624488; bh=Ak h2a1fDujqMH4YEeTbbnnaQ35ZklucjT/210qkRNQ0=; b=y08lZUOZXfu52ot0+9 K7tGy3zkFw3TNgirtVvY5Dcp5OAXOwDKQ90qXRWIFBM2AxCOWPf+ZiIZvVfjgdRa NFkmH3uCHzSn8l+6Vbxm5UH90LN+JEpKGjhBhCp+DJtLvzpfaGNgBhkm0QbiTSVW b04eiJ0ViON9ys9OfXtfYueAqfot8SUuPisPzEtOikf34L98Gry2+uhJ86c5Mz+x qXfQi6YUYjaQQ/K/79DtLo10q2reQZCIQWbtt3La7XG/JX3moTTXW/MJhKoQz06X p+csGj2IHFK5260wQON5z5nHgl5ycN+np7Mp31UzhaUnm1h1yggdQkTrCJqiOe43 /u0g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1660538088; x=1660624488; bh=Akh2a1fDujqMH 4YEeTbbnnaQ35ZklucjT/210qkRNQ0=; b=0hCjihZFNeu/gXSOO9Ke7iNzTCZ1C ngo7qYhA2xyEGZr94gxOwtrkk7hvQ9nkmK+S46ifhA/3492+Z6x0gJpAXipezXI7 GNaTLov+1hlhAG5oW3NU9puzdExdGBe1sSlVspxqtLtamp2dB7yUa4hIcbgSPfHZ YuQfSFUzl+9/Q6A4RA1itThXkx/pZhtORZroTeGJJsgcWt3UGVsutLihIVWIIEJP 6vz1u3Ctc6dzOI00Oekmn50gKAq+DYYljqszJ2SKwxo4aOqGXDGmxc8P785JpV0h +l9LVW2yO2P/AhOZmJyFsWVBUHwzaVHMVFRjAemfLn/Y+Ik3QNCyEpdKw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehuddgkeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 Aug 2022 00:34:48 -0400 (EDT) From: Samuel Holland To: Liam Girdwood , Mark Brown , Chen-Yu Tsai , Jernej Skrabec , Krzysztof Kozlowski , Rob Herring Cc: Samuel Holland , Maxime Ripard , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH v3 4/4] soc: sunxi: sram: Only iterate over SRAM children Date: Sun, 14 Aug 2022 23:34:35 -0500 Message-Id: <20220815043436.20170-5-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220815043436.20170-1-samuel@sholland.org> References: <20220815043436.20170-1-samuel@sholland.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Now that a "regulators" child is accepted by the controller binding, the debugfs show routine must be explicitly limited to "sram" children. Signed-off-by: Samuel Holland Reviewed-by: Heiko Stuebner Tested-by: Heiko Stuebner --- (no changes since v2) Changes in v2: - New patch for v2 drivers/soc/sunxi/sunxi_sram.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c index 92f9186c1c42..6acaaeb65652 100644 --- a/drivers/soc/sunxi/sunxi_sram.c +++ b/drivers/soc/sunxi/sunxi_sram.c @@ -120,6 +120,9 @@ static int sunxi_sram_show(struct seq_file *s, void *da= ta) seq_puts(s, "--------------------\n\n"); =20 for_each_child_of_node(sram_dev->of_node, sram_node) { + if (!of_node_name_eq(sram_node, "sram")) + continue; + sram_addr_p =3D of_get_address(sram_node, 0, NULL, NULL); =20 seq_printf(s, "sram@%08x\n", --=20 2.35.1