From nobody Mon Oct 6 10:18:44 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 2C2D52E03E6; Tue, 22 Jul 2025 10:13:26 +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=1753179209; cv=none; b=jE5SZuMzfzhH22q0SHWYf7ftHz9n/P8t9/XjNxMwmnJy2xNkSN51l2pM6jGvRMRnobOteOtBWD0s1XwWC6tPRRqcV5UvvkM6slsxp1X2OABtYYlJuOXuZrtSKc7dOIlLiZzh0jYR69OYJz6KIvQQpXy/qAGBTygnn04eJGkKz3w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753179209; c=relaxed/simple; bh=AXJhbda1yCJyeDidWix2YMh9O5FyfrGCeMY4fxZW2go=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OZc9PU5cey4ct7J4cqmX2wyLqjVZDFtQbuDel0nXxZE/UqCQIuOpPUODtK1I9dqEPlsKqg0uYUD9lnyE3ZupBhYtA2nwpZjLlnMjHYzGLc92cuJyzvE9KSlMEdRFQPs+B9VaCtNh3ePrzH0dU1jODWy3VMy9IcRt6iP+Wc0vMHk= 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=Msqk8/yO; 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="Msqk8/yO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1753179205; bh=AXJhbda1yCJyeDidWix2YMh9O5FyfrGCeMY4fxZW2go=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Msqk8/yOWmrtdokJAtdoiCxSvigT4NRj0ZDbOHqr/O2fd1rdzlB6MUkUArPzR5ELs 2THO+/Jp0TFoXxTbnsD7AJAqtyaVXg3e9/lNy+2rDMxfpdh/YuwfgdRaKJE5CnOH9q 0qYdPKNYJSwQsjpHD1qeDs1zwbp22HunevRTV57XP8Ymg6vQaEFRLK3oZKWy+K/P9U 7E/4RjdcQOEPZOineUOS77lHCWrX7w7V1sjj0sEF2H15DykgoxKpGSTLkl7nJ9Dva3 ZpUbtsGMncZZCJMKXlNVACmZoGNiNia62FsVAvz3zdA3f0JCALitsMGMM3h00RffMb FNnTJT2SXDkhQ== 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 4C9D417E1324; Tue, 22 Jul 2025 12:13:24 +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 1/7] spmi: Implement spmi_subdevice_alloc_and_add() and devm variant Date: Tue, 22 Jul 2025 12:13:11 +0200 Message-ID: <20250722101317.76729-2-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 devices connected over the SPMI bus may be big, in the sense that those may be a complex of devices managed by a single chip over the SPMI bus, reachable through a single SID. Add new functions aimed at managing sub-devices of a SPMI device spmi_subdevice_alloc_and_add() and a spmi_subdevice_put_and_remove() for adding a new subdevice and removing it respectively, and also add their devm_* variants. The need for such functions comes from the existance of those complex Power Management ICs (PMICs), which feature one or many sub-devices, in some cases with these being even addressable on the chip in form of SPMI register ranges. Examples of those devices can be found in both Qualcomm platforms with their PMICs having PON, RTC, SDAM, GPIO controller, and other sub-devices, and in newer MediaTek platforms showing similar HW features and a similar layout with those also having many subdevs. Also, instead of generally exporting symbols, export them with a new "SPMI" namespace: all users will have to import this namespace to make use of the newly introduced exports. Signed-off-by: AngeloGioacchino Del Regno --- drivers/spmi/spmi-devres.c | 23 +++++++++++ drivers/spmi/spmi.c | 83 ++++++++++++++++++++++++++++++++++++++ include/linux/spmi.h | 16 ++++++++ 3 files changed, 122 insertions(+) diff --git a/drivers/spmi/spmi-devres.c b/drivers/spmi/spmi-devres.c index 62c4b3f24d06..7e00e38be2ff 100644 --- a/drivers/spmi/spmi-devres.c +++ b/drivers/spmi/spmi-devres.c @@ -60,5 +60,28 @@ int devm_spmi_controller_add(struct device *parent, stru= ct spmi_controller *ctrl } EXPORT_SYMBOL_GPL(devm_spmi_controller_add); =20 +static void devm_spmi_subdevice_remove(void *res) +{ + spmi_subdevice_remove((struct spmi_subdevice *)res); +} + +struct spmi_subdevice *devm_spmi_subdevice_alloc_and_add(struct device *de= v, + struct spmi_device *sparent) +{ + struct spmi_subdevice *sub_sdev; + int ret; + + sub_sdev =3D spmi_subdevice_alloc_and_add(sparent); + if (IS_ERR(sub_sdev)) + return sub_sdev; + + ret =3D devm_add_action_or_reset(dev, devm_spmi_subdevice_remove, sub_sde= v); + if (ret) + return ERR_PTR(ret); + + return sub_sdev; +} +EXPORT_SYMBOL_NS_GPL(devm_spmi_subdevice_alloc_and_add, "SPMI"); + MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("SPMI devres helpers"); diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c index 3cf8d9bd4566..62bb782b2bbc 100644 --- a/drivers/spmi/spmi.c +++ b/drivers/spmi/spmi.c @@ -19,6 +19,7 @@ =20 static bool is_registered; static DEFINE_IDA(ctrl_ida); +static DEFINE_IDA(spmi_subdevice_ida); =20 static void spmi_dev_release(struct device *dev) { @@ -31,6 +32,18 @@ static const struct device_type spmi_dev_type =3D { .release =3D spmi_dev_release, }; =20 +static void spmi_subdev_release(struct device *dev) +{ + struct spmi_device *sdev =3D to_spmi_device(dev); + struct spmi_subdevice *sub_sdev =3D container_of(sdev, struct spmi_subdev= ice, sdev); + + kfree(sub_sdev); +} + +static const struct device_type spmi_subdev_type =3D { + .release =3D spmi_subdev_release, +}; + static void spmi_ctrl_release(struct device *dev) { struct spmi_controller *ctrl =3D to_spmi_controller(dev); @@ -90,6 +103,19 @@ void spmi_device_remove(struct spmi_device *sdev) } EXPORT_SYMBOL_GPL(spmi_device_remove); =20 +/** + * spmi_subdevice_remove() - Remove an SPMI subdevice + * @sub_sdev: spmi_device to be removed + */ +void spmi_subdevice_remove(struct spmi_subdevice *sub_sdev) +{ + struct spmi_device *sdev =3D &sub_sdev->sdev; + + device_unregister(&sdev->dev); + ida_free(&spmi_subdevice_ida, sub_sdev->devid); +} +EXPORT_SYMBOL_NS_GPL(spmi_subdevice_remove, "SPMI"); + static inline int spmi_cmd(struct spmi_controller *ctrl, u8 opcode, u8 sid) { @@ -431,6 +457,63 @@ struct spmi_device *spmi_device_alloc(struct spmi_cont= roller *ctrl) } EXPORT_SYMBOL_GPL(spmi_device_alloc); =20 +/** + * spmi_subdevice_alloc_and_add(): Allocate and add a new SPMI sub-device + * @sparent: SPMI parent device with previously registered SPMI controller + * + * Returns: + * Pointer to newly allocated SPMI sub-device for success or negative ERR_= PTR. + */ +struct spmi_subdevice *spmi_subdevice_alloc_and_add(struct spmi_device *sp= arent) +{ + struct spmi_subdevice *sub_sdev; + struct spmi_device *sdev; + int ret; + + if (!sparent) + return ERR_PTR(-EINVAL); + + sub_sdev =3D kzalloc(sizeof(*sub_sdev), GFP_KERNEL); + if (!sub_sdev) + return ERR_PTR(-ENOMEM); + + ret =3D ida_alloc(&spmi_subdevice_ida, GFP_KERNEL); + if (ret < 0) + goto err_ida_alloc; + + sdev =3D &sub_sdev->sdev; + sdev->ctrl =3D sparent->ctrl; + device_initialize(&sdev->dev); + sdev->dev.parent =3D &sparent->dev; + sdev->dev.bus =3D &spmi_bus_type; + sdev->dev.type =3D &spmi_subdev_type; + + sub_sdev->devid =3D ret; + sdev->usid =3D sparent->usid; + + ret =3D dev_set_name(&sdev->dev, "%d-%02x.%d.auto", + sdev->ctrl->nr, sdev->usid, sub_sdev->devid); + if (ret) + goto err_set_name; + + ret =3D device_add(&sdev->dev); + if (ret) { + dev_err(&sdev->dev, "Can't add %s, status %d\n", + dev_name(&sdev->dev), ret); + put_device(&sdev->dev); + return ERR_PTR(ret); + } + + return sub_sdev; + +err_set_name: + ida_free(&ctrl_ida, sub_sdev->devid); +err_ida_alloc: + kfree(sub_sdev); + return ERR_PTR(ret); +} +EXPORT_SYMBOL_NS_GPL(spmi_subdevice_alloc_and_add, "SPMI"); + /** * spmi_controller_alloc() - Allocate a new SPMI controller * @parent: parent device diff --git a/include/linux/spmi.h b/include/linux/spmi.h index 28e8c8bd3944..7cea0a5b034b 100644 --- a/include/linux/spmi.h +++ b/include/linux/spmi.h @@ -69,6 +69,22 @@ int spmi_device_add(struct spmi_device *sdev); =20 void spmi_device_remove(struct spmi_device *sdev); =20 +/** + * struct spmi_subdevice - Basic representation of an SPMI sub-device + * @sdev: Sub-device representation of an SPMI device + * @devid: Platform Device ID of an SPMI sub-device + */ +struct spmi_subdevice { + struct spmi_device sdev; + unsigned int devid; +}; + +struct spmi_subdevice *spmi_subdevice_alloc_and_add(struct spmi_device *sp= arent); +void spmi_subdevice_remove(struct spmi_subdevice *sdev); + +struct spmi_subdevice *devm_spmi_subdevice_alloc_and_add(struct device *de= v, + struct spmi_device *sparent); + /** * struct spmi_controller - interface to the SPMI master controller * @dev: Driver model representation of the device. --=20 2.50.1 From nobody Mon Oct 6 10:18:44 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 From nobody Mon Oct 6 10:18:44 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 58D6E2E0B71; Tue, 22 Jul 2025 10:13:29 +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=1753179211; cv=none; b=D6jMZOR+lvHvMFBuvBMk8C/9nQrndTs0NmqG6FwY6l/6yLjVFJvuCvVHMw5ePFvQTm5H2U9I6c9kTpsDBT7cvJPVVlX2weSlFhbN/EPN1YgzTvyx0QNtdduF0AZkt5h6tAqIXHOLax+OaKzFkm0ANEnhQLmC2x45Wrl6i5kgtcM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753179211; c=relaxed/simple; bh=bo9ebHaqpjpmIYPivWIUuH66mrJ7Mn0+hVa9wGAEH7U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T3tX9et7fjoRCVyMfI9pbqRmNCVizDzhm7nyyVM4x5sPzCNYS7lBKLA3na9M4e/WeoDOiJyYiHEzJzWKjKWiLvdi9+NXivpP29HaKLImlex7KaoRLVEvLSz2tHn6rgPdWv3QxqDv/1h01Fxamcid3+a6caSkIt81BtkoicNZTUI= 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=hrPId0SU; 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="hrPId0SU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1753179207; bh=bo9ebHaqpjpmIYPivWIUuH66mrJ7Mn0+hVa9wGAEH7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hrPId0SU+k0Dpvdeg79zxRa4yBetRztb3blsQX9Rr6G/hURLm4G5f5yPLe1oQ8EQI GYmhNtB2NRi2QZlZV2iDDZtrO5aA886LUSgG5oVW8ob8qXR43ESV0bHmwI7s3L6RPs qkXp4gWhjCHeAkHjXJ5UOoXG9zyILscKL5d8NEeMSO77lvLDrPUwTRsJkme33dZ+KH EL36aypMVUcHIwmRP63Dpy8ai6m7TLhkZc9sEH0oC94wLlf/ZHaebXkdQ7OzpPMrsy Irh9kFi4dcHDFJ0p7BFSGbb3DbceJMp69q3gbjHnwr5MIGfM038UDWlEY06/nWe+QG +z/VbTr5Om1Gw== 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 ADF4D17E1550; Tue, 22 Jul 2025 12:13:26 +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 3/7] power: reset: qcom-pon: Migrate to devm_spmi_subdevice_alloc_and_add() Date: Tue, 22 Jul 2025 12:13:13 +0200 Message-ID: <20250722101317.76729-4-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 integrates a Power On device supporting pwrkey and resin along with the Android reboot reason action identifier. 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 PON 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 --- drivers/power/reset/qcom-pon.c | 37 ++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/drivers/power/reset/qcom-pon.c b/drivers/power/reset/qcom-pon.c index 7e108982a582..3558494aea36 100644 --- a/drivers/power/reset/qcom-pon.c +++ b/drivers/power/reset/qcom-pon.c @@ -11,6 +11,7 @@ #include #include #include +#include =20 #define PON_SOFT_RB_SPARE 0x8f =20 @@ -22,7 +23,6 @@ struct qcom_pon { struct device *dev; struct regmap *regmap; - u32 baseaddr; struct reboot_mode_driver reboot_mode; long reason_shift; }; @@ -35,7 +35,7 @@ static int qcom_pon_reboot_mode_write(struct reboot_mode_= driver *reboot, int ret; =20 ret =3D regmap_update_bits(pon->regmap, - pon->baseaddr + PON_SOFT_RB_SPARE, + PON_SOFT_RB_SPARE, GENMASK(7, pon->reason_shift), magic << pon->reason_shift); if (ret < 0) @@ -46,27 +46,47 @@ static int qcom_pon_reboot_mode_write(struct reboot_mod= e_driver *reboot, =20 static int qcom_pon_probe(struct platform_device *pdev) { + struct regmap_config qcom_pon_regmap_config =3D { + .reg_bits =3D 16, + .val_bits =3D 8, + .max_register =3D 0x100, + .fast_io =3D true, + }; + struct device *dev =3D &pdev->dev; + struct spmi_subdevice *sub_sdev; + struct spmi_device *sparent; struct qcom_pon *pon; long reason_shift; int error; =20 + if (!dev->parent) + return -ENODEV; + pon =3D devm_kzalloc(&pdev->dev, sizeof(*pon), GFP_KERNEL); if (!pon) return -ENOMEM; =20 pon->dev =3D &pdev->dev; =20 - pon->regmap =3D dev_get_regmap(pdev->dev.parent, NULL); - if (!pon->regmap) { - dev_err(&pdev->dev, "failed to locate regmap\n"); + sparent =3D to_spmi_device(dev->parent); + if (!sparent) return -ENODEV; - } =20 - error =3D of_property_read_u32(pdev->dev.of_node, "reg", - &pon->baseaddr); + sub_sdev =3D devm_spmi_subdevice_alloc_and_add(dev, sparent); + if (IS_ERR(sub_sdev)) + return PTR_ERR(sub_sdev); + + error =3D of_property_read_u32(dev->of_node, "reg", + &qcom_pon_regmap_config.reg_base); if (error) return error; =20 + pon->regmap =3D devm_regmap_init_spmi_ext(&sub_sdev->sdev, &qcom_pon_regm= ap_config); + if (!pon->regmap) { + dev_err(&pdev->dev, "failed to locate regmap\n"); + return -ENODEV; + } + reason_shift =3D (long)of_device_get_match_data(&pdev->dev); =20 if (reason_shift !=3D NO_REASON_SHIFT) { @@ -106,3 +126,4 @@ module_platform_driver(qcom_pon_driver); =20 MODULE_DESCRIPTION("Qualcomm Power On driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS("SPMI"); --=20 2.50.1 From nobody Mon Oct 6 10:18:44 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 8DB372E1C74; Tue, 22 Jul 2025 10:13:30 +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=1753179212; cv=none; b=OaCMDZqjdFbbvPmguz4NInKRnqnO918085pjKXlbO4eojIDpyy89xKhPe6qB/JvRXxHDAqhPhcbF21wVVJqTm6SRONawxZPq7Oe8EVL3HzRwLLl51pGyzfabBjWBp3OUR1zVoZemYHSkSECq/Ro66rsFSNd5qo1/qQ6ZaG+YNJc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753179212; c=relaxed/simple; bh=/eR2Io6v2x+YB4KtlVbbokRE6ovQWr+oH9Pw2JAtBXo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TahWcobm3WQdlmenEzmZIhzqcxrILk8aaTOhO0gj13bn4GYyLJJaMV8TEaVA1qJwklrwwl3pwQvzilmXXoEkKbCsMR1JBJtabLmKQakBAAJFBmK5zoKwFlZcIzCnYGCrheVlgVhYLF4CYXcTqUHzaauWre+U7a+TJVAudwPTcfE= 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=AvBFN/1Q; 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="AvBFN/1Q" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1753179208; bh=/eR2Io6v2x+YB4KtlVbbokRE6ovQWr+oH9Pw2JAtBXo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AvBFN/1QalYDMhIHX3mjbH/q7cRxh1IC1iHFTDpF6grzYXSf6SIeNNiAkOXKtwT+f W3dvN3n6HaN/3ZeIDhcueLKfcsOCHgrCCvVnbneCjsDk1eK1/A59ZqXUHCts5daqcL +GSoOiiq3NoNkqJfoml/thd4ryoxxaxxOSvUVufD7fx7CiGRStEwW8fnAauQHQ15LG iQ148EYep0O1SMDyWt1x8I4AvC2ZYp+vOhq0rgcA2Yp67hB6S9XSJwGult6zqJvrmd tvMDLGzAjCWWZt889Rs001LP1QhWeoE9VamTi+k0mdUHeAVduRdTbq1Y9gBEBMl56o 1FlB3bG99P+Vw== 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 DDD6317E1563; Tue, 22 Jul 2025 12:13:27 +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 4/7] phy: qualcomm: eusb2-repeater: Migrate to devm_spmi_subdevice_alloc_and_add() Date: Tue, 22 Jul 2025 12:13:14 +0200 Message-ID: <20250722101317.76729-5-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 an USB Repeater device, used to convert between eUSB2 and USB 2.0 signaling levels, reachable in a specific address range over SPMI. 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 EUSB2 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 --- .../phy/qualcomm/phy-qcom-eusb2-repeater.c | 51 ++++++++++++------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c b/drivers/phy/q= ualcomm/phy-qcom-eusb2-repeater.c index e0f2acc8109c..50eeebfb51a9 100644 --- a/drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c +++ b/drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c @@ -9,6 +9,7 @@ #include #include #include +#include =20 /* eUSB2 status registers */ #define EUSB2_RPTR_STATUS 0x08 @@ -55,7 +56,6 @@ struct eusb2_repeater { struct phy *phy; struct regulator_bulk_data *vregs; const struct eusb2_repeater_cfg *cfg; - u32 base; enum phy_mode mode; }; =20 @@ -110,7 +110,6 @@ static int eusb2_repeater_init(struct phy *phy) struct eusb2_repeater *rptr =3D phy_get_drvdata(phy); struct device_node *np =3D rptr->dev->of_node; struct regmap *regmap =3D rptr->regmap; - u32 base =3D rptr->base; u32 poll_val; int ret; u8 val; @@ -119,25 +118,25 @@ static int eusb2_repeater_init(struct phy *phy) if (ret) return ret; =20 - regmap_write(regmap, base + EUSB2_EN_CTL1, EUSB2_RPTR_EN); + regmap_write(regmap, EUSB2_EN_CTL1, EUSB2_RPTR_EN); =20 /* Write registers from init table */ for (int i =3D 0; i < rptr->cfg->init_tbl_num; i++) - regmap_write(regmap, base + rptr->cfg->init_tbl[i].reg, + regmap_write(regmap, rptr->cfg->init_tbl[i].reg, rptr->cfg->init_tbl[i].value); =20 /* Override registers from devicetree values */ if (!of_property_read_u8(np, "qcom,tune-usb2-amplitude", &val)) - regmap_write(regmap, base + EUSB2_TUNE_USB2_PREEM, val); + regmap_write(regmap, EUSB2_TUNE_USB2_PREEM, val); =20 if (!of_property_read_u8(np, "qcom,tune-usb2-disc-thres", &val)) - regmap_write(regmap, base + EUSB2_TUNE_HSDISC, val); + regmap_write(regmap, EUSB2_TUNE_HSDISC, val); =20 if (!of_property_read_u8(np, "qcom,tune-usb2-preem", &val)) - regmap_write(regmap, base + EUSB2_TUNE_IUSB2, val); + regmap_write(regmap, EUSB2_TUNE_IUSB2, val); =20 /* Wait for status OK */ - ret =3D regmap_read_poll_timeout(regmap, base + EUSB2_RPTR_STATUS, poll_v= al, + ret =3D regmap_read_poll_timeout(regmap, EUSB2_RPTR_STATUS, poll_val, poll_val & RPTR_OK, 10, 5); if (ret) dev_err(rptr->dev, "initialization timed-out\n"); @@ -150,7 +149,6 @@ static int eusb2_repeater_set_mode(struct phy *phy, { struct eusb2_repeater *rptr =3D phy_get_drvdata(phy); struct regmap *regmap =3D rptr->regmap; - u32 base =3D rptr->base; =20 switch (mode) { case PHY_MODE_USB_HOST: @@ -159,8 +157,8 @@ static int eusb2_repeater_set_mode(struct phy *phy, * per eUSB 1.2 Spec. Below implement software workaround until * PHY and controller is fixing seen observation. */ - regmap_write(regmap, base + EUSB2_FORCE_EN_5, F_CLK_19P2M_EN); - regmap_write(regmap, base + EUSB2_FORCE_VAL_5, V_CLK_19P2M_EN); + regmap_write(regmap, EUSB2_FORCE_EN_5, F_CLK_19P2M_EN); + regmap_write(regmap, EUSB2_FORCE_VAL_5, V_CLK_19P2M_EN); break; case PHY_MODE_USB_DEVICE: /* @@ -169,8 +167,8 @@ static int eusb2_repeater_set_mode(struct phy *phy, * repeater doesn't clear previous value due to shared * regulators (say host <-> device mode switch). */ - regmap_write(regmap, base + EUSB2_FORCE_EN_5, 0); - regmap_write(regmap, base + EUSB2_FORCE_VAL_5, 0); + regmap_write(regmap, EUSB2_FORCE_EN_5, 0); + regmap_write(regmap, EUSB2_FORCE_VAL_5, 0); break; default: return -EINVAL; @@ -195,13 +193,23 @@ static const struct phy_ops eusb2_repeater_ops =3D { =20 static int eusb2_repeater_probe(struct platform_device *pdev) { + struct regmap_config eusb2_regmap_config =3D { + .reg_bits =3D 16, + .val_bits =3D 8, + .max_register =3D 0x100, + .fast_io =3D true, + }; + struct spmi_device *sparent; struct eusb2_repeater *rptr; + struct spmi_subdevice *sub_sdev; struct device *dev =3D &pdev->dev; struct phy_provider *phy_provider; struct device_node *np =3D dev->of_node; - u32 res; int ret; =20 + if (!dev->parent) + return -ENODEV; + rptr =3D devm_kzalloc(dev, sizeof(*rptr), GFP_KERNEL); if (!rptr) return -ENOMEM; @@ -213,15 +221,21 @@ static int eusb2_repeater_probe(struct platform_devic= e *pdev) if (!rptr->cfg) return -EINVAL; =20 - rptr->regmap =3D dev_get_regmap(dev->parent, NULL); - if (!rptr->regmap) + sparent =3D to_spmi_device(dev->parent); + if (!sparent) return -ENODEV; =20 - ret =3D of_property_read_u32(np, "reg", &res); + sub_sdev =3D devm_spmi_subdevice_alloc_and_add(dev, sparent); + if (IS_ERR(sub_sdev)) + return PTR_ERR(sub_sdev); + + ret =3D of_property_read_u32(np, "reg", &eusb2_regmap_config.reg_base); if (ret < 0) return ret; =20 - rptr->base =3D res; + rptr->regmap =3D devm_regmap_init_spmi_ext(&sub_sdev->sdev, &eusb2_regmap= _config); + if (IS_ERR(rptr->regmap)) + return -ENODEV; =20 ret =3D eusb2_repeater_init_vregs(rptr); if (ret < 0) { @@ -280,3 +294,4 @@ module_platform_driver(eusb2_repeater_driver); =20 MODULE_DESCRIPTION("Qualcomm PMIC eUSB2 Repeater driver"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS("SPMI"); --=20 2.50.1 From nobody Mon Oct 6 10:18:44 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 862F82E2F0C; Tue, 22 Jul 2025 10:13:31 +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=1753179213; cv=none; b=N5S5Ai6TMEqot4Oe0X48M+Q90BUlk7RmHEclfI12GTDFDmwJU92Vu/R1Wwmq+1I1XDVrZwQRizndvPYcrVn7JT3X4+rxyFMfKLyP4J1gQWpEvjfhXP4XrR9ZRiZKLHwt7seizV/wkhimbdRZ9zFw9xhaQXfXbKN0FMFDX7AANjo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753179213; c=relaxed/simple; bh=Y5s7m+35W4dEzJEEQZv3bEwnDndx5Wp0qHXBVf73M2o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oJBPbvqG+sU7gEexHu+wsXMzxIZbfnkE065qQV1sEma+7HZ3/1a4/ukTJX6MXhkIMRNBqz6uUqGbfwYpGDqAFbKObPYfIUP715z450krFgUx+njeSdYUljxcQ3M6mHdzIlMWyVpOuGfbYsymy4uxAGHl3STA2uG7vVW0bnmEcZU= 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=VMi+blg3; 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="VMi+blg3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1753179210; bh=Y5s7m+35W4dEzJEEQZv3bEwnDndx5Wp0qHXBVf73M2o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VMi+blg39JOFm0vQmE++xhOeDSy9P2pcJRaIDvyRUahCCCVlNZvEz9/eRSnPbLhpM 436pgGhIx8zsOScM/BAZXAV0aqjfqaU4i/0qbhAee6wuK8XGSFgQRFiOvQWVte4qU4 +/lshFO9sNNE/RCJxy+Nd5ikazUz0gNzTI6dAucDwVeqmpGsjE2odCuChnYUTxNFPr B5Fe7j2UNEAs4xoJEeFoRX93lGby3oS88Kc06F61HtQoX92riKxWpas+j+8AKTnXtt 1PGTmdiE+dipgtFn3RAB01ZCasPAYQD2zHdey04zy9YLF6iz7ucHvMQdJf3X9tOy1T MJxcFjpnbLbfw== 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 1BA0D17E1301; Tue, 22 Jul 2025 12:13:29 +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 5/7] misc: qcom-coincell: Migrate to devm_spmi_subdevice_alloc_and_add() Date: Tue, 22 Jul 2025 12:13:15 +0200 Message-ID: <20250722101317.76729-6-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 charger for coincells, usually powering an RTC when external (or main battery) power is missing. Instead of using the parent SPMI device (the main PMIC) as a kind of syscon in this driver, register a new SPMI sub-device 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. Acked-by: Greg Kroah-Hartman Signed-off-by: AngeloGioacchino Del Regno --- drivers/misc/qcom-coincell.c | 44 +++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/drivers/misc/qcom-coincell.c b/drivers/misc/qcom-coincell.c index 3c57f7429147..5570cf079dc7 100644 --- a/drivers/misc/qcom-coincell.c +++ b/drivers/misc/qcom-coincell.c @@ -9,11 +9,11 @@ #include #include #include +#include =20 struct qcom_coincell { struct device *dev; struct regmap *regmap; - u32 base_addr; }; =20 #define QCOM_COINCELL_REG_RSET 0x44 @@ -35,7 +35,7 @@ static int qcom_coincell_chgr_config(struct qcom_coincell= *chgr, int rset, /* if disabling, just do that and skip other operations */ if (!enable) return regmap_write(chgr->regmap, - chgr->base_addr + QCOM_COINCELL_REG_ENABLE, 0); + QCOM_COINCELL_REG_ENABLE, 0); =20 /* find index for current-limiting resistor */ for (i =3D 0; i < ARRAY_SIZE(qcom_rset_map); i++) @@ -58,7 +58,7 @@ static int qcom_coincell_chgr_config(struct qcom_coincell= *chgr, int rset, } =20 rc =3D regmap_write(chgr->regmap, - chgr->base_addr + QCOM_COINCELL_REG_RSET, i); + QCOM_COINCELL_REG_RSET, i); if (rc) { /* * This is mainly to flag a bad base_addr (reg) from dts. @@ -71,37 +71,58 @@ static int qcom_coincell_chgr_config(struct qcom_coince= ll *chgr, int rset, } =20 rc =3D regmap_write(chgr->regmap, - chgr->base_addr + QCOM_COINCELL_REG_VSET, j); + QCOM_COINCELL_REG_VSET, j); if (rc) return rc; =20 /* set 'enable' register */ return regmap_write(chgr->regmap, - chgr->base_addr + QCOM_COINCELL_REG_ENABLE, + QCOM_COINCELL_REG_ENABLE, QCOM_COINCELL_ENABLE); } =20 static int qcom_coincell_probe(struct platform_device *pdev) { - struct device_node *node =3D pdev->dev.of_node; + struct regmap_config qcom_coincell_regmap_config =3D { + .reg_bits =3D 16, + .val_bits =3D 8, + .max_register =3D 0x100, + .fast_io =3D true, + }; + struct device *dev =3D &pdev->dev; + struct device_node *node =3D dev->of_node; + struct spmi_subdevice *sub_sdev; + struct spmi_device *sparent; struct qcom_coincell chgr; u32 rset =3D 0; u32 vset =3D 0; bool enable; int rc; =20 + if (!dev->parent) + return -ENODEV; + chgr.dev =3D &pdev->dev; =20 - chgr.regmap =3D dev_get_regmap(pdev->dev.parent, NULL); + rc =3D of_property_read_u32(node, "reg", &qcom_coincell_regmap_config.reg= _base); + if (rc) + return rc; + + sparent =3D to_spmi_device(dev->parent); + if (!sparent) + return -ENODEV; + + sub_sdev =3D devm_spmi_subdevice_alloc_and_add(dev, sparent); + if (IS_ERR(sub_sdev)) + return PTR_ERR(sub_sdev); + + chgr.regmap =3D devm_regmap_init_spmi_ext(&sub_sdev->sdev, + &qcom_coincell_regmap_config); if (!chgr.regmap) { dev_err(chgr.dev, "Unable to get regmap\n"); return -EINVAL; } =20 - rc =3D of_property_read_u32(node, "reg", &chgr.base_addr); - if (rc) - return rc; - enable =3D !of_property_read_bool(node, "qcom,charger-disable"); =20 if (enable) { @@ -142,3 +163,4 @@ module_platform_driver(qcom_coincell_driver); =20 MODULE_DESCRIPTION("Qualcomm PMIC coincell charger driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS("SPMI"); --=20 2.50.1 From nobody Mon Oct 6 10:18:44 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 E781A2E3B09; Tue, 22 Jul 2025 10:13:32 +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=1753179214; cv=none; b=W2sgF+kQhjIN6OXtIZ2bfR8xqam8nbspWrtRClZXaACtbFg2lyRg2Uz1iGMMJfTUKPPbbWLsRTub2ryK9RmID3rpeDxFabVbL1nfBLhP78rTTvn6MQHFasE/EbzTQC7XP1txFlUcfuhyhiuMDAcnpTkgS+ewPUTYrNdBq4iKCJI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753179214; c=relaxed/simple; bh=Zl45Sp752j3kbveJVbJG3Co5ddYS+kiIWQF02duR3WI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sJnh1+E3N7ghnf0UsDt3RggzvDsqArmlTHTUVD2hbH1vP2qS8btM7pFf8724JM09OB70JFpLfYSIZeHqL7NMpc3gC0DRNDCkYDjm0RmY5E5Vo1X55W6EE2PqvvQc4sy43Luuznh2pOT1+/7J5eIJ8L57pchlm8M5oKIB8FGq2Yw= 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=l5XUIhfH; 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="l5XUIhfH" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1753179211; bh=Zl45Sp752j3kbveJVbJG3Co5ddYS+kiIWQF02duR3WI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l5XUIhfHx3NdMAj6Fi8IsEI8jETgNOrdAh2PUnnW66E505F4+5V9CMcwSxuyyoc9J e1w2EVnhHxn6BMe6IKw+gqZ2cutClSNXFIDvSE/h5Q4y6+NnEOiLSflbZVo0vqjSXf Dqh80YZAfJUViNqoR8jx7LyIy8S22QZJfNUymIixzenDuK+6M+AYFeUb++uWCdB5oK JgapbVeQy6PzffrPM5P5yjEf+ff5mtvTpsFxYaRuoIBHNcgAetP4av5B+Z9tQF3UF+ /pZp3XX/zShAzurQAxnyZut78bwcYZnx8JaEX2T4jfG6zTw/NLZZPX7zUQtybclE2g ANzk83Ls8P6EQ== 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 4C84C17E1324; Tue, 22 Jul 2025 12:13:30 +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 6/7] iio: adc: qcom-spmi-iadc: Migrate to devm_spmi_subdevice_alloc_and_add() Date: Tue, 22 Jul 2025 12:13:16 +0200 Message-ID: <20250722101317.76729-7-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 an Current ADC device, reachable in a specific address range over SPMI. Instead of using the parent SPMI device (the main PMIC) as a kind of syscon in this driver, register a new SPMI sub-device 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: Jonathan Cameron --- drivers/iio/adc/qcom-spmi-iadc.c | 36 +++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/drivers/iio/adc/qcom-spmi-iadc.c b/drivers/iio/adc/qcom-spmi-i= adc.c index b64a8a407168..985967c85bca 100644 --- a/drivers/iio/adc/qcom-spmi-iadc.c +++ b/drivers/iio/adc/qcom-spmi-iadc.c @@ -16,6 +16,7 @@ #include #include #include +#include =20 /* IADC register and bit definition */ #define IADC_REVISION2 0x1 @@ -94,7 +95,6 @@ * struct iadc_chip - IADC Current ADC device structure. * @regmap: regmap for register read/write. * @dev: This device pointer. - * @base: base offset for the ADC peripheral. * @rsense: Values of the internal and external sense resister in micro Oh= ms. * @poll_eoc: Poll for end of conversion instead of waiting for IRQ. * @offset: Raw offset values for the internal and external channels. @@ -105,7 +105,6 @@ struct iadc_chip { struct regmap *regmap; struct device *dev; - u16 base; bool poll_eoc; u32 rsense[2]; u16 offset[2]; @@ -119,7 +118,7 @@ static int iadc_read(struct iadc_chip *iadc, u16 offset= , u8 *data) unsigned int val; int ret; =20 - ret =3D regmap_read(iadc->regmap, iadc->base + offset, &val); + ret =3D regmap_read(iadc->regmap, offset, &val); if (ret < 0) return ret; =20 @@ -129,7 +128,7 @@ static int iadc_read(struct iadc_chip *iadc, u16 offset= , u8 *data) =20 static int iadc_write(struct iadc_chip *iadc, u16 offset, u8 data) { - return regmap_write(iadc->regmap, iadc->base + offset, data); + return regmap_write(iadc->regmap, offset, data); } =20 static int iadc_reset(struct iadc_chip *iadc) @@ -270,7 +269,7 @@ static int iadc_poll_wait_eoc(struct iadc_chip *iadc, u= nsigned int interval_us) =20 static int iadc_read_result(struct iadc_chip *iadc, u16 *data) { - return regmap_bulk_read(iadc->regmap, iadc->base + IADC_DATA, data, 2); + return regmap_bulk_read(iadc->regmap, IADC_DATA, data, 2); } =20 static int iadc_do_conversion(struct iadc_chip *iadc, int chan, u16 *data) @@ -483,12 +482,22 @@ static const struct iio_chan_spec iadc_channels[] =3D= { =20 static int iadc_probe(struct platform_device *pdev) { + struct regmap_config iadc_regmap_config =3D { + .reg_bits =3D 16, + .val_bits =3D 8, + .max_register =3D 0x100, + .fast_io =3D true, + }; struct device_node *node =3D pdev->dev.of_node; struct device *dev =3D &pdev->dev; + struct spmi_subdevice *sub_sdev; + struct spmi_device *sparent; struct iio_dev *indio_dev; struct iadc_chip *iadc; int ret, irq_eoc; - u32 res; + + if (!dev->parent) + return -ENODEV; =20 indio_dev =3D devm_iio_device_alloc(dev, sizeof(*iadc)); if (!indio_dev) @@ -497,18 +506,24 @@ static int iadc_probe(struct platform_device *pdev) iadc =3D iio_priv(indio_dev); iadc->dev =3D dev; =20 - iadc->regmap =3D dev_get_regmap(dev->parent, NULL); - if (!iadc->regmap) + sparent =3D to_spmi_device(dev->parent); + if (!sparent) return -ENODEV; =20 + sub_sdev =3D devm_spmi_subdevice_alloc_and_add(dev, sparent); + if (IS_ERR(sub_sdev)) + return PTR_ERR(sub_sdev); + init_completion(&iadc->complete); mutex_init(&iadc->lock); =20 - ret =3D of_property_read_u32(node, "reg", &res); + ret =3D of_property_read_u32(node, "reg", &iadc_regmap_config.reg_base); if (ret < 0) return -ENODEV; =20 - iadc->base =3D res; + iadc->regmap =3D devm_regmap_init_spmi_ext(&sub_sdev->sdev, &iadc_regmap_= config); + if (IS_ERR(iadc->regmap)) + return PTR_ERR(iadc->regmap); =20 ret =3D iadc_version_check(iadc); if (ret < 0) @@ -584,3 +599,4 @@ MODULE_ALIAS("platform:qcom-spmi-iadc"); MODULE_DESCRIPTION("Qualcomm SPMI PMIC current ADC driver"); MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Ivan T. Ivanov "); +MODULE_IMPORT_NS("SPMI"); --=20 2.50.1 From nobody Mon Oct 6 10:18:44 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 418742E4271; Tue, 22 Jul 2025 10:13:33 +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=1753179216; cv=none; b=mz2CNHW9NtD1NFPF0MmL3WjyfrCMOm2NKYLTazEoZy+7CMPAD1Oxksw2w11p/WTXjDzhM9rbczEEPVJkH9Oj/wvX4BlLL4DgoU51bJFl55GE8zKz2vbak5eN1yzjvrOj6xR8o7PLlKrJpATlIqVkGpT677c//iTDIGec7KWaOks= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753179216; c=relaxed/simple; bh=wDe4pGSIzfeJpl9n15NTs3K1CA3vRyhvLXXpR8wPThM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JzHH1GbUkcfwqqOSrSEMyabaLQMU1PQ76AJaif+Ksg1Fz1Iu9Db+gKeWloFIVZrxTPnPqW+xjjwncUZv15VxjIbMn6K8jociLjqMeX7RGCyuetrKPD/N68fDKytIK/qX/efE32zrheFTywgAECe+FZg3ae8VAhuKvK8iQX1VzgA= 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=HDMkXMLE; 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="HDMkXMLE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1753179212; bh=wDe4pGSIzfeJpl9n15NTs3K1CA3vRyhvLXXpR8wPThM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HDMkXMLEugfN6BcAJWned35tNTjeu2P3ClBx9PV3H7sZN6B9XwAAlhU5H239POLEA u7mzOE0wADoOxkgk6fw51ikpSav0rEADWmSfDMpTw3ozbifuXmoQDoFvD9AZ4dIAtb czSQv+9umpqV/p5Qg/4M5cGbCT/HRrA04M3PyIfFHxlsuuCe+gEu7u62EY1F/cOX9O jDQAL8rlqreG3gsSPunKzkE5whxFKaLI1m6odtswR21Y8Z6ckvBbuxKHj5h5+zhXAD LVb3gYRHw3HZuv9z2HwwMKgwdIh6ZjJ87gBnJJ19Ii/tVnhwcpgXcBzLJi4EOcrElR rVTGlLlCasxHg== 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 7E45917E1540; Tue, 22 Jul 2025 12:13:31 +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 7/7] iio: adc: qcom-spmi-iadc: Remove regmap R/W wrapper functions Date: Tue, 22 Jul 2025 12:13:17 +0200 Message-ID: <20250722101317.76729-8-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" This driver doesn't need to add any register base address to any regmap call anymore since it was migrated to register as a SPMI subdevice with its own regmap reg_base, which makes the regmap API to automatically add such base address internally. Since the iadc_{read,write,read_result}() functions now only do call regmap_{read,write,bulk_read}() and nothing else, simplify the driver by removing them and by calling regmap APIs directly. Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: Jonathan Cameron --- drivers/iio/adc/qcom-spmi-iadc.c | 83 ++++++++++++-------------------- 1 file changed, 30 insertions(+), 53 deletions(-) diff --git a/drivers/iio/adc/qcom-spmi-iadc.c b/drivers/iio/adc/qcom-spmi-i= adc.c index 985967c85bca..98ed28d74bda 100644 --- a/drivers/iio/adc/qcom-spmi-iadc.c +++ b/drivers/iio/adc/qcom-spmi-iadc.c @@ -113,77 +113,59 @@ struct iadc_chip { struct completion complete; }; =20 -static int iadc_read(struct iadc_chip *iadc, u16 offset, u8 *data) -{ - unsigned int val; - int ret; - - ret =3D regmap_read(iadc->regmap, offset, &val); - if (ret < 0) - return ret; - - *data =3D val; - return 0; -} - -static int iadc_write(struct iadc_chip *iadc, u16 offset, u8 data) -{ - return regmap_write(iadc->regmap, offset, data); -} - static int iadc_reset(struct iadc_chip *iadc) { - u8 data; + u32 data; int ret; =20 - ret =3D iadc_write(iadc, IADC_SEC_ACCESS, IADC_SEC_ACCESS_DATA); + ret =3D regmap_write(iadc->regmap, IADC_SEC_ACCESS, IADC_SEC_ACCESS_DATA); if (ret < 0) return ret; =20 - ret =3D iadc_read(iadc, IADC_PERH_RESET_CTL3, &data); + ret =3D regmap_read(iadc->regmap, IADC_PERH_RESET_CTL3, &data); if (ret < 0) return ret; =20 - ret =3D iadc_write(iadc, IADC_SEC_ACCESS, IADC_SEC_ACCESS_DATA); + ret =3D regmap_write(iadc->regmap, IADC_SEC_ACCESS, IADC_SEC_ACCESS_DATA); if (ret < 0) return ret; =20 data |=3D IADC_FOLLOW_WARM_RB; =20 - return iadc_write(iadc, IADC_PERH_RESET_CTL3, data); + return regmap_write(iadc->regmap, IADC_PERH_RESET_CTL3, data); } =20 static int iadc_set_state(struct iadc_chip *iadc, bool state) { - return iadc_write(iadc, IADC_EN_CTL1, state ? IADC_EN_CTL1_SET : 0); + return regmap_write(iadc->regmap, IADC_EN_CTL1, state ? IADC_EN_CTL1_SET = : 0); } =20 static void iadc_status_show(struct iadc_chip *iadc) { - u8 mode, sta1, chan, dig, en, req; + u32 mode, sta1, chan, dig, en, req; int ret; =20 - ret =3D iadc_read(iadc, IADC_MODE_CTL, &mode); + ret =3D regmap_read(iadc->regmap, IADC_MODE_CTL, &mode); if (ret < 0) return; =20 - ret =3D iadc_read(iadc, IADC_DIG_PARAM, &dig); + ret =3D regmap_read(iadc->regmap, IADC_DIG_PARAM, &dig); if (ret < 0) return; =20 - ret =3D iadc_read(iadc, IADC_CH_SEL_CTL, &chan); + ret =3D regmap_read(iadc->regmap, IADC_CH_SEL_CTL, &chan); if (ret < 0) return; =20 - ret =3D iadc_read(iadc, IADC_CONV_REQ, &req); + ret =3D regmap_read(iadc->regmap, IADC_CONV_REQ, &req); if (ret < 0) return; =20 - ret =3D iadc_read(iadc, IADC_STATUS1, &sta1); + ret =3D regmap_read(iadc->regmap, IADC_STATUS1, &sta1); if (ret < 0) return; =20 - ret =3D iadc_read(iadc, IADC_EN_CTL1, &en); + ret =3D regmap_read(iadc->regmap, IADC_EN_CTL1, &en); if (ret < 0) return; =20 @@ -199,34 +181,34 @@ static int iadc_configure(struct iadc_chip *iadc, int= channel) =20 /* Mode selection */ mode =3D (IADC_OP_MODE_NORMAL << IADC_OP_MODE_SHIFT) | IADC_TRIM_EN; - ret =3D iadc_write(iadc, IADC_MODE_CTL, mode); + ret =3D regmap_write(iadc->regmap, IADC_MODE_CTL, mode); if (ret < 0) return ret; =20 /* Channel selection */ - ret =3D iadc_write(iadc, IADC_CH_SEL_CTL, channel); + ret =3D regmap_write(iadc->regmap, IADC_CH_SEL_CTL, channel); if (ret < 0) return ret; =20 /* Digital parameter setup */ decim =3D IADC_DEF_DECIMATION << IADC_DIG_DEC_RATIO_SEL_SHIFT; - ret =3D iadc_write(iadc, IADC_DIG_PARAM, decim); + ret =3D regmap_write(iadc->regmap, IADC_DIG_PARAM, decim); if (ret < 0) return ret; =20 /* HW settle time delay */ - ret =3D iadc_write(iadc, IADC_HW_SETTLE_DELAY, IADC_DEF_HW_SETTLE_TIME); + ret =3D regmap_write(iadc->regmap, IADC_HW_SETTLE_DELAY, IADC_DEF_HW_SETT= LE_TIME); if (ret < 0) return ret; =20 - ret =3D iadc_write(iadc, IADC_FAST_AVG_CTL, IADC_DEF_AVG_SAMPLES); + ret =3D regmap_write(iadc->regmap, IADC_FAST_AVG_CTL, IADC_DEF_AVG_SAMPLE= S); if (ret < 0) return ret; =20 if (IADC_DEF_AVG_SAMPLES) - ret =3D iadc_write(iadc, IADC_FAST_AVG_EN, IADC_FAST_AVG_EN_SET); + ret =3D regmap_write(iadc->regmap, IADC_FAST_AVG_EN, IADC_FAST_AVG_EN_SE= T); else - ret =3D iadc_write(iadc, IADC_FAST_AVG_EN, 0); + ret =3D regmap_write(iadc->regmap, IADC_FAST_AVG_EN, 0); =20 if (ret < 0) return ret; @@ -239,19 +221,19 @@ static int iadc_configure(struct iadc_chip *iadc, int= channel) return ret; =20 /* Request conversion */ - return iadc_write(iadc, IADC_CONV_REQ, IADC_CONV_REQ_SET); + return regmap_write(iadc->regmap, IADC_CONV_REQ, IADC_CONV_REQ_SET); } =20 static int iadc_poll_wait_eoc(struct iadc_chip *iadc, unsigned int interva= l_us) { unsigned int count, retry; int ret; - u8 sta1; + u32 sta1; =20 retry =3D interval_us / IADC_CONV_TIME_MIN_US; =20 for (count =3D 0; count < retry; count++) { - ret =3D iadc_read(iadc, IADC_STATUS1, &sta1); + ret =3D regmap_read(iadc->regmap, IADC_STATUS1, &sta1); if (ret < 0) return ret; =20 @@ -267,11 +249,6 @@ static int iadc_poll_wait_eoc(struct iadc_chip *iadc, = unsigned int interval_us) return -ETIMEDOUT; } =20 -static int iadc_read_result(struct iadc_chip *iadc, u16 *data) -{ - return regmap_bulk_read(iadc->regmap, IADC_DATA, data, 2); -} - static int iadc_do_conversion(struct iadc_chip *iadc, int chan, u16 *data) { unsigned int wait; @@ -296,7 +273,7 @@ static int iadc_do_conversion(struct iadc_chip *iadc, i= nt chan, u16 *data) } =20 if (!ret) - ret =3D iadc_read_result(iadc, data); + ret =3D regmap_bulk_read(iadc->regmap, IADC_DATA, data, 2); exit: iadc_set_state(iadc, false); if (ret < 0) @@ -392,10 +369,10 @@ static int iadc_update_offset(struct iadc_chip *iadc) =20 static int iadc_version_check(struct iadc_chip *iadc) { - u8 val; + u32 val; int ret; =20 - ret =3D iadc_read(iadc, IADC_PERPH_TYPE, &val); + ret =3D regmap_read(iadc->regmap, IADC_PERPH_TYPE, &val); if (ret < 0) return ret; =20 @@ -404,7 +381,7 @@ static int iadc_version_check(struct iadc_chip *iadc) return -EINVAL; } =20 - ret =3D iadc_read(iadc, IADC_PERPH_SUBTYPE, &val); + ret =3D regmap_read(iadc->regmap, IADC_PERPH_SUBTYPE, &val); if (ret < 0) return ret; =20 @@ -413,7 +390,7 @@ static int iadc_version_check(struct iadc_chip *iadc) return -EINVAL; } =20 - ret =3D iadc_read(iadc, IADC_REVISION2, &val); + ret =3D regmap_read(iadc->regmap, IADC_REVISION2, &val); if (ret < 0) return ret; =20 @@ -428,7 +405,7 @@ static int iadc_version_check(struct iadc_chip *iadc) static int iadc_rsense_read(struct iadc_chip *iadc, struct device_node *no= de) { int ret, sign, int_sense; - u8 deviation; + u32 deviation; =20 ret =3D of_property_read_u32(node, "qcom,external-resistor-micro-ohms", &iadc->rsense[IADC_EXT_RSENSE]); @@ -440,7 +417,7 @@ static int iadc_rsense_read(struct iadc_chip *iadc, str= uct device_node *node) return -EINVAL; } =20 - ret =3D iadc_read(iadc, IADC_NOMINAL_RSENSE, &deviation); + ret =3D regmap_read(iadc->regmap, IADC_NOMINAL_RSENSE, &deviation); if (ret < 0) return ret; =20 --=20 2.50.1