From nobody Mon Oct 6 11:53:24 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33CE62E06ED; Tue, 22 Jul 2025 10:13:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753179210; cv=none; b=evtSrwjkH565/cFX7cbAlj2I4Td19mwYVOiTM884WNoCpaP+0vBX/TK2OwdUuiYKT+8B/4Pi5011aNRjPUprfDTzOJ1PPJUgan1yLMJcMeBbdDMAB6acwHQST8cQAKRimod5RMaa7sdNeuHRqBk/jEhDfxemTF8fCXt+LPx9gkA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753179210; c=relaxed/simple; bh=QGb8GqGY598O2QWef1VDjXTOMWEPkYHiRuUezCy9h5k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UUncUGFrAj3/Bg8yYB/ftcVJfhtS9ugyXae4i5i7m+uGw9HY7vPNkdhsPqE4P2xH1qqiS7zpQQEFWtxVAik5n8b7hdjSFMftYe9LVIjDa4JZf2XzwYFUDwxAdQ6EAdWjMU7YZlBBOe6NqNE8QSygwAc3ya9C8uQB2ftO4/yJuqM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=UFbeOouQ; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="UFbeOouQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1753179206; bh=QGb8GqGY598O2QWef1VDjXTOMWEPkYHiRuUezCy9h5k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UFbeOouQnucHrw1CANpZZv7A4mv+lOoL2NpGn8PKSrp32NFdu+EycTmNdpQvLwS3r NaC8LhGPCEo0Sr9Ngxf+Dr1A0RVq5BGu3UOjyAd6+Mhi4KSWAby86VV7c/aOwlPhgg mJ7Hkk10MyjCoerXQM5sbtfmzGLAoIgmCOYRY0T6l7rmTF/Y/t39/rVvXsPS970JcX nY6eO2tzMPYXlpxZaR6SE6Zn/FmdXR9q2Sky8FItpCZsKVowSZKQF3/IRagFA9ZpyM DT/xEwIeag1XbjmJ5lyDObZzo7vsvUww8UP+XOGwtqqgZirk5DK/b/+VZuqmVXtsyo 0cip+Ktb9r26Q== Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by bali.collaboradmins.com (Postfix) with ESMTPSA id 7E4E317E1540; Tue, 22 Jul 2025 12:13:25 +0200 (CEST) From: AngeloGioacchino Del Regno To: sboyd@kernel.org Cc: jic23@kernel.org, dlechner@baylibre.com, nuno.sa@analog.com, andy@kernel.org, arnd@arndb.de, gregkh@linuxfoundation.org, srini@kernel.org, vkoul@kernel.org, kishon@kernel.org, sre@kernel.org, krzysztof.kozlowski@linaro.org, u.kleine-koenig@baylibre.com, angelogioacchino.delregno@collabora.com, linux-arm-msm@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-phy@lists.infradead.org, linux-pm@vger.kernel.org, kernel@collabora.com, wenst@chromium.org, casey.connolly@linaro.org Subject: [PATCH v2 2/7] nvmem: qcom-spmi-sdam: Migrate to devm_spmi_subdevice_alloc_and_add() Date: Tue, 22 Jul 2025 12:13:12 +0200 Message-ID: <20250722101317.76729-3-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250722101317.76729-1-angelogioacchino.delregno@collabora.com> References: <20250722101317.76729-1-angelogioacchino.delregno@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some Qualcomm PMICs integrate a SDAM device, internally located in a specific address range reachable through SPMI communication. Instead of using the parent SPMI device (the main PMIC) as a kind of syscon in this driver, register a new SPMI sub-device for SDAM and initialize its own regmap with this sub-device's specific base address, retrieved from the devicetree. This allows to stop manually adding the register base address to every R/W call in this driver, as this can be, and is now, handled by the regmap API instead. Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: Konrad Dybcio --- drivers/nvmem/qcom-spmi-sdam.c | 43 +++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/drivers/nvmem/qcom-spmi-sdam.c b/drivers/nvmem/qcom-spmi-sdam.c index 4f1cca6eab71..b2c5734d8dc1 100644 --- a/drivers/nvmem/qcom-spmi-sdam.c +++ b/drivers/nvmem/qcom-spmi-sdam.c @@ -9,6 +9,7 @@ #include #include #include +#include =20 #define SDAM_MEM_START 0x40 #define REGISTER_MAP_ID 0x40 @@ -20,7 +21,6 @@ struct sdam_chip { struct regmap *regmap; struct nvmem_config sdam_config; - unsigned int base; unsigned int size; }; =20 @@ -73,7 +73,7 @@ static int sdam_read(void *priv, unsigned int offset, voi= d *val, return -EINVAL; } =20 - rc =3D regmap_bulk_read(sdam->regmap, sdam->base + offset, val, bytes); + rc =3D regmap_bulk_read(sdam->regmap, offset, val, bytes); if (rc < 0) dev_err(dev, "Failed to read SDAM offset %#x len=3D%zd, rc=3D%d\n", offset, bytes, rc); @@ -100,7 +100,7 @@ static int sdam_write(void *priv, unsigned int offset, = void *val, return -EINVAL; } =20 - rc =3D regmap_bulk_write(sdam->regmap, sdam->base + offset, val, bytes); + rc =3D regmap_bulk_write(sdam->regmap, offset, val, bytes); if (rc < 0) dev_err(dev, "Failed to write SDAM offset %#x len=3D%zd, rc=3D%d\n", offset, bytes, rc); @@ -110,28 +110,48 @@ static int sdam_write(void *priv, unsigned int offset= , void *val, =20 static int sdam_probe(struct platform_device *pdev) { + struct regmap_config sdam_regmap_config =3D { + .reg_bits =3D 16, + .val_bits =3D 8, + .max_register =3D 0x100, + .fast_io =3D true, + }; struct sdam_chip *sdam; struct nvmem_device *nvmem; + struct spmi_device *sparent; + struct spmi_subdevice *sub_sdev; + struct device *dev =3D &pdev->dev; unsigned int val; int rc; =20 + if (!dev->parent) + return -ENODEV; + sdam =3D devm_kzalloc(&pdev->dev, sizeof(*sdam), GFP_KERNEL); if (!sdam) return -ENOMEM; =20 - sdam->regmap =3D dev_get_regmap(pdev->dev.parent, NULL); - if (!sdam->regmap) { - dev_err(&pdev->dev, "Failed to get regmap handle\n"); - return -ENXIO; - } + sparent =3D to_spmi_device(dev->parent); + if (!sparent) + return -ENODEV; =20 - rc =3D of_property_read_u32(pdev->dev.of_node, "reg", &sdam->base); + sub_sdev =3D devm_spmi_subdevice_alloc_and_add(dev, sparent); + if (IS_ERR(sub_sdev)) + return PTR_ERR(sub_sdev); + + rc =3D of_property_read_u32(dev->of_node, "reg", &sdam_regmap_config.reg_= base); if (rc < 0) { dev_err(&pdev->dev, "Failed to get SDAM base, rc=3D%d\n", rc); return -EINVAL; } =20 - rc =3D regmap_read(sdam->regmap, sdam->base + SDAM_SIZE, &val); + sdam->regmap =3D devm_regmap_init_spmi_ext(&sub_sdev->sdev, &sdam_regmap_= config); + if (IS_ERR(sdam->regmap)) { + dev_err(&pdev->dev, "Failed to get regmap handle\n"); + return PTR_ERR(sdam->regmap); + } + + rc =3D regmap_read(sdam->regmap, SDAM_SIZE, &val); if (rc < 0) { dev_err(&pdev->dev, "Failed to read SDAM_SIZE rc=3D%d\n", rc); return -EINVAL; @@ -159,7 +179,7 @@ static int sdam_probe(struct platform_device *pdev) } dev_dbg(&pdev->dev, "SDAM base=3D%#x size=3D%u registered successfully\n", - sdam->base, sdam->size); + sdam_regmap_config.reg_base, sdam->size); =20 return 0; } @@ -181,3 +201,4 @@ module_platform_driver(sdam_driver); =20 MODULE_DESCRIPTION("QCOM SPMI SDAM driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS("SPMI"); --=20 2.50.1