From nobody Mon Feb 9 16:01:09 2026 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5480B31BC80 for ; Fri, 14 Nov 2025 13:38:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763127508; cv=none; b=Cs2Ylv9mJgobWqzsNT+6I+gXCeC6WUoA4RXvZ0FFByrs0/faBlrkk1EeiYug+9PBsLAHs5jcD24YahqW3musL0WZWcvh4KmTobf03epMtH4mYRiONavSk/WOw5f6A8KvIyFrUmLR5Z7raTkG/WKKuWYqlIRR3ppgPaY3pQUZ96Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763127508; c=relaxed/simple; bh=aIZmZ8Bit7ZQP6+E51qlwqHqkVtTGhNdOByH2z3GuCs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LXgX4FyKgrq5zeQHKcF2iJW/0w/oypf5stxU0gMoTCGfodh9cbJWuYpenc4mIhzoCURM4HS9vp04GXr7dWiU+Yj2H0RNnsliz9aJeUZ++WyIa4U+bvd6RjRkm5T6pHnYO8OcDmQt8Vch1Fy9PSsOcns0NNGJXxrpo6sEl0o7+Sk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=DfzWJnVW; arc=none smtp.client-ip=209.85.218.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DfzWJnVW" Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-b714b1290aeso298015266b.2 for ; Fri, 14 Nov 2025 05:38:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763127505; x=1763732305; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tunUdZ+Uo3TFHtZ2y2DxEuFXtR8sw55m1IPZhLEhl+o=; b=DfzWJnVWp+QSyd5DlUN9yKhtS7bLzHf4N6OWVhipIl9EiyG1nXg/toeoF2Y3zRuSp7 /6Ad1hko6WvB5mQBpPEnI+gAdD4N/uka94afadyjkFN0e6jYrRfUUWgl5kxduNrdmFxU ag65EWMI1PZFshvDYzXkXs2i04E1cKiATpCs9zo7Zxz16f239BOZidoP71OVixfUYj+P Wi1fV4vGAs2eR1apeYyZqhwADaxSFNinbKn1dvTxkIopg0adpX++eftEv00IVkt+dNiN s8WYOFKe7QkIZd4q6137VLxsuUttzyhB3ZxJmjOIvYMSOBzDqGtekTdRwxme1O1s7fU/ qczw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763127505; x=1763732305; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=tunUdZ+Uo3TFHtZ2y2DxEuFXtR8sw55m1IPZhLEhl+o=; b=RDFlFvwRhjvvekOIfJMQP0Lo5bA+TWWxTFE9+IpDJwkIWnl4e97O4fKwPjVbmnj78o vm8O/q8OnrEUwDoMIhibCjdPZqGccfzwNk4kZFToVF9Rphrz6s/0Foh+xqpo0fqC0lyg Bd3GvR9v4geyfJvO5IeMbA2wj3k3IKNuhMgROjt/lJyEm778jfcw7BCSsGUYN8ymjGRR 2snWDrdqU1XFqLKmSYYi8LkpyLZ48FHyn6LUfQzS0EXiU0ncD6Bp3LHPw1jQD4OtxPrD AAIR13qNUGNLjLCwyRFayCgjOAGj3GN1/flmz2ZM2Z21hq2pVsP288coF7eomyPUV5kZ QQCQ== X-Forwarded-Encrypted: i=1; AJvYcCUYsrTbbi7EC8RVPGdtJERKGisTYtYNUK7/EBIsTeOmyPjcJVF4HU3KGa1nLpAg7hxAD9A8IoahRh5wktk=@vger.kernel.org X-Gm-Message-State: AOJu0Yz23HXhdRrZq9ynf4J9NBh+D5mOOB6Q4Z5C3D37Ze0ATFZ7MuTc jcYUsLYmZAHygkVzgJvP584xlAO/1WRyJqJpEx0INthxPxvTuVb6e6e/ X-Gm-Gg: ASbGncu3JzCE7Ua99ZoVylTfvOSh0PLmbdXYgpis8nzJMeTmS3KBPYaE/ujdf2d/JgZ 7ptyY+Bs9b7j0AyubbczN32enq+Zp4uo2lI0kOlS60Jg6B8/hI8tNQuB9Kvp29Ob7sNHyr+EgNc bwEJ42PKBnpzCmSNaA6sch7a5p9Yv0AWyKAQNOOiOjSsnrqAzNjQguRVFA3j3916BAt5AgeQ5h+ g0rfn1dnQCIIR9Z4S8G1gzGEMgoEsiPjIr6Z4z5oUx2uVKexeSmfyZFlSkj95dlEsQFvCEaRSF3 xWXnBrzojgdSPcs5R1vmrqROv5X/r/8m6veiLGvdR/qJfSCkgAIdIR/+cqj08N9MECmyos0GCUz qHIflIwPjYeGCuoW/eHS6a0JHUXW/jelgT9o62/yhEzTLYLExe0wWTi2WQ6WuWwGOoPyTgH4mw+ nflKlV6hGNyqBw97TitnkzWhprOds= X-Google-Smtp-Source: AGHT+IFL+db8xrLuL7QGFf6oOiM4PGKjgJRPl7rpZxY6Gpc3+rpth3N0E++6rvqNnt7UZ+YGTI57Qg== X-Received: by 2002:a17:906:7307:b0:b73:5146:8b7b with SMTP id a640c23a62f3a-b73678e9981mr238611666b.36.1763127504345; Fri, 14 Nov 2025 05:38:24 -0800 (PST) Received: from SMW024614.wbi.nxp.com ([128.77.115.158]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b734fedb2cfsm385330666b.71.2025.11.14.05.38.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Nov 2025 05:38:24 -0800 (PST) From: Laurentiu Mihalcea To: Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Fabio Estevam , Philipp Zabel , Daniel Baluta , Shengjiu Wang , Frank Li Cc: devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Pengutronix Kernel Team Subject: [PATCH v5 3/6] reset: imx8mp-audiomix: Switch to using regmap API Date: Fri, 14 Nov 2025 05:37:35 -0800 Message-ID: <20251114133738.1762-4-laurentiumihalcea111@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251114133738.1762-1-laurentiumihalcea111@gmail.com> References: <20251114133738.1762-1-laurentiumihalcea111@gmail.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" From: Laurentiu Mihalcea Switch to using the regmap API to allow performing register operations under the same lock. This is needed for cases such as i.MX8ULP's SIM LPAV where clock gating, reset control and MUX-ing is performed via the same register (i.e. SYSCTRL0) and different subsystem APIs. Signed-off-by: Laurentiu Mihalcea Reviewed-by: Frank Li Reviewed-by: Philipp Zabel --- drivers/reset/reset-imx8mp-audiomix.c | 92 +++++++++++++++++---------- 1 file changed, 57 insertions(+), 35 deletions(-) diff --git a/drivers/reset/reset-imx8mp-audiomix.c b/drivers/reset/reset-im= x8mp-audiomix.c index d993c294c548..35df9bd5f71a 100644 --- a/drivers/reset/reset-imx8mp-audiomix.c +++ b/drivers/reset/reset-imx8mp-audiomix.c @@ -12,6 +12,7 @@ #include #include #include +#include #include =20 #define IMX8MP_AUDIOMIX_EARC_RESET_OFFSET 0x200 @@ -43,8 +44,7 @@ static const struct imx8mp_reset_map reset_map[] =3D { =20 struct imx8mp_audiomix_reset { struct reset_controller_dev rcdev; - spinlock_t lock; /* protect register read-modify-write cycle */ - void __iomem *base; + struct regmap *regmap; }; =20 static struct imx8mp_audiomix_reset *to_imx8mp_audiomix_reset(struct reset= _controller_dev *rcdev) @@ -56,26 +56,14 @@ static int imx8mp_audiomix_update(struct reset_controll= er_dev *rcdev, unsigned long id, bool assert) { struct imx8mp_audiomix_reset *priv =3D to_imx8mp_audiomix_reset(rcdev); - void __iomem *reg_addr =3D priv->base; - unsigned int mask, offset, active_low; - unsigned long reg, flags; + unsigned int mask, offset, active_low, val; =20 mask =3D BIT(reset_map[id].bit); offset =3D reset_map[id].offset; active_low =3D reset_map[id].active_low; + val =3D (active_low ^ assert) << reset_map[id].bit; =20 - spin_lock_irqsave(&priv->lock, flags); - - reg =3D readl(reg_addr + offset); - if (active_low ^ assert) - reg |=3D mask; - else - reg &=3D ~mask; - writel(reg, reg_addr + offset); - - spin_unlock_irqrestore(&priv->lock, flags); - - return 0; + return regmap_update_bits(priv->regmap, offset, mask, val); } =20 static int imx8mp_audiomix_reset_assert(struct reset_controller_dev *rcdev, @@ -95,6 +83,52 @@ static const struct reset_control_ops imx8mp_audiomix_re= set_ops =3D { .deassert =3D imx8mp_audiomix_reset_deassert, }; =20 +static const struct regmap_config regmap_config =3D { + .reg_bits =3D 32, + .val_bits =3D 32, + .reg_stride =3D 4, +}; + +/* assumption: registered only if not using parent regmap */ +static void imx8mp_audiomix_reset_iounmap(void *data) +{ + void __iomem *base =3D (void __iomem *)data; + + iounmap(base); +} + +static int imx8mp_audiomix_reset_get_regmap(struct imx8mp_audiomix_reset *= priv) +{ + void __iomem *base; + struct device *dev; + int ret; + + dev =3D priv->rcdev.dev; + + /* try to use the parent's regmap */ + priv->regmap =3D dev_get_regmap(dev->parent, NULL); + if (priv->regmap) + return 0; + + /* ... if that's not possible then initialize the regmap right now */ + base =3D of_iomap(dev->parent->of_node, 0); + if (!base) + return dev_err_probe(dev, -ENOMEM, "failed to iomap address space\n"); + + ret =3D devm_add_action_or_reset(dev, + imx8mp_audiomix_reset_iounmap, + (void __force *)base); + if (ret) + return dev_err_probe(dev, ret, "failed to register action\n"); + + priv->regmap =3D devm_regmap_init_mmio(dev, base, ®map_config); + if (IS_ERR(priv->regmap)) + return dev_err_probe(dev, PTR_ERR(priv->regmap), + "failed to initialize regmap\n"); + + return 0; +} + static int imx8mp_audiomix_reset_probe(struct auxiliary_device *adev, const struct auxiliary_device_id *id) { @@ -106,36 +140,25 @@ static int imx8mp_audiomix_reset_probe(struct auxilia= ry_device *adev, if (!priv) return -ENOMEM; =20 - spin_lock_init(&priv->lock); - priv->rcdev.owner =3D THIS_MODULE; priv->rcdev.nr_resets =3D ARRAY_SIZE(reset_map); priv->rcdev.ops =3D &imx8mp_audiomix_reset_ops; priv->rcdev.of_node =3D dev->parent->of_node; priv->rcdev.dev =3D dev; priv->rcdev.of_reset_n_cells =3D 1; - priv->base =3D of_iomap(dev->parent->of_node, 0); - if (!priv->base) - return -ENOMEM; =20 dev_set_drvdata(dev, priv); =20 + ret =3D imx8mp_audiomix_reset_get_regmap(priv); + if (ret) + return dev_err_probe(dev, ret, "failed to get regmap\n"); + ret =3D devm_reset_controller_register(dev, &priv->rcdev); if (ret) - goto out_unmap; + return dev_err_probe(dev, ret, + "failed to register reset controller\n"); =20 return 0; - -out_unmap: - iounmap(priv->base); - return ret; -} - -static void imx8mp_audiomix_reset_remove(struct auxiliary_device *adev) -{ - struct imx8mp_audiomix_reset *priv =3D dev_get_drvdata(&adev->dev); - - iounmap(priv->base); } =20 static const struct auxiliary_device_id imx8mp_audiomix_reset_ids[] =3D { @@ -148,7 +171,6 @@ MODULE_DEVICE_TABLE(auxiliary, imx8mp_audiomix_reset_id= s); =20 static struct auxiliary_driver imx8mp_audiomix_reset_driver =3D { .probe =3D imx8mp_audiomix_reset_probe, - .remove =3D imx8mp_audiomix_reset_remove, .id_table =3D imx8mp_audiomix_reset_ids, }; =20 --=20 2.43.0