From nobody Sun Feb 8 09:22:58 2026 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (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 50C0429E11A for ; Tue, 2 Dec 2025 13:21:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764681701; cv=none; b=PSSgUmLzEHzV2l9F4GGk/9ulE2FQBWco8gbrIunz7KGOd4dDDIPAmKO2UhBbgdPj2tRJgz15gMfx8OjoiKEVGRrQZpgKnkbtkTLoyzUqcloQMb6AS3VgzQ1pfbpgqHOefrGZ+leX/280E+w0dTO4DZsADqbN1YNdD1BffJ6Mie0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764681701; c=relaxed/simple; bh=X6h8rILKRfbKIuZ/42DX20qfhAjCc8dGdCsBmMS7EuI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=P6TxC6JNkainu1Xz4VZl4bf5JYrfzxwXflNRL1nvnix2AeLxg6AHosunH8jO2WW/H+GKtMefmRAl/qkufE7ILiLpenapxUtXqwHDYJvhsAfCuNyjpFiQmjCSsmeBf5RqZl7bKLvExC4wAI+moo8vdxtsSLl3M7GDt9XfpkvX98g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vQQJu-0003pJ-No; Tue, 02 Dec 2025 14:21:30 +0100 From: Marco Felsch Date: Tue, 02 Dec 2025 14:21:02 +0100 Subject: [PATCH v2 1/3] pmdomain: imx93-blk-ctrl: cleanup error path Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251202-v6-18-topic-imx93-blkctrl-v2-1-e73501034adc@pengutronix.de> References: <20251202-v6-18-topic-imx93-blkctrl-v2-0-e73501034adc@pengutronix.de> In-Reply-To: <20251202-v6-18-topic-imx93-blkctrl-v2-0-e73501034adc@pengutronix.de> To: Ulf Hansson , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-pm@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Alexander Stein , Frank Li , Marco Felsch X-Mailer: b4 0.14.2 X-SA-Exim-Connect-IP: 2a0a:edc0:0:1101:1d::28 X-SA-Exim-Mail-From: m.felsch@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Call dev_err_probe() directly during return to make the code more compact. Reviewed-by: Alexander Stein Reviewed-by: Frank Li Signed-off-by: Marco Felsch --- drivers/pmdomain/imx/imx93-blk-ctrl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/pmdomain/imx/imx93-blk-ctrl.c b/drivers/pmdomain/imx/i= mx93-blk-ctrl.c index e094fe5a42bf646c712f3eca4e66a313fa5a914c..2aa163aef8de4ee901b9cde76ce= 2aad246c8c08a 100644 --- a/drivers/pmdomain/imx/imx93-blk-ctrl.c +++ b/drivers/pmdomain/imx/imx93-blk-ctrl.c @@ -240,10 +240,8 @@ static int imx93_blk_ctrl_probe(struct platform_device= *pdev) bc->num_clks =3D bc_data->num_clks; =20 ret =3D devm_clk_bulk_get(dev, bc->num_clks, bc->clks); - if (ret) { - dev_err_probe(dev, ret, "failed to get bus clock\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "failed to get bus clock\n"); =20 for (i =3D 0; i < bc_data->num_domains; i++) { const struct imx93_blk_ctrl_domain_data *data =3D &bc_data->domains[i]; --=20 2.47.3 From nobody Sun Feb 8 09:22:58 2026 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (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 50C7530BB8F for ; Tue, 2 Dec 2025 13:21:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764681701; cv=none; b=KG+TW7xHK+ymBBLdYyutfbUA/xFa771zcsoqzyhQyofd5Zu6voOQFz4TQ8kh4+mkDGgt7VQiB6TfVC9DIg92sCIcdDXzhcZQwS+HwQZJaxXkNk5PiC1LIpEbCrobAzvMmbWBOGbl6GuqeJu3PoiG3FkGPe30n4yJXSBUQZLDMgI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764681701; c=relaxed/simple; bh=dcfHatMpMTm4tDIi7xxC79fBMuzf0pzfdh2LonpFAHQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LPGzvDXuhCMJpcidHNMfahZd100bxTNFKbSsxOzrKZ+YpRnq3B6LK8BUqOktMysO01rBlieG5yWQWKT/6lZ3BWJd/EYxD+z/oBz6dhnGnOm6XlUf/z2JVDXWsjW6QPvt59uS7T4FC12OZ18905Tc0+PxYZIpBY67mnZHfXE6aAw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vQQJu-0003pJ-PG; Tue, 02 Dec 2025 14:21:30 +0100 From: Marco Felsch Date: Tue, 02 Dec 2025 14:21:03 +0100 Subject: [PATCH v2 2/3] pmdomain: imx93-blk-ctrl: convert to devm_* only Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251202-v6-18-topic-imx93-blkctrl-v2-2-e73501034adc@pengutronix.de> References: <20251202-v6-18-topic-imx93-blkctrl-v2-0-e73501034adc@pengutronix.de> In-Reply-To: <20251202-v6-18-topic-imx93-blkctrl-v2-0-e73501034adc@pengutronix.de> To: Ulf Hansson , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-pm@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Marco Felsch X-Mailer: b4 0.14.2 X-SA-Exim-Connect-IP: 2a0a:edc0:0:1101:1d::28 X-SA-Exim-Mail-From: m.felsch@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Convert the driver to devm_ APIs only by making use of devm_add_action_or_reset() and devm_pm_runtime_enable() to simplify the probe error path and to drop the .remove() callback. This also ensures that the device release order equals the device probe error path order. Furthermore drop the dev_set_drvdata() usage since the only user was the .remove() callback which is removed by this commit. Signed-off-by: Marco Felsch Reviewed-by: Frank Li --- drivers/pmdomain/imx/imx93-blk-ctrl.c | 66 +++++++++++++++----------------= ---- 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/drivers/pmdomain/imx/imx93-blk-ctrl.c b/drivers/pmdomain/imx/i= mx93-blk-ctrl.c index 2aa163aef8de4ee901b9cde76ce2aad246c8c08a..49610f2389c3bbaf4de4133918f= bcacb7924f672 100644 --- a/drivers/pmdomain/imx/imx93-blk-ctrl.c +++ b/drivers/pmdomain/imx/imx93-blk-ctrl.c @@ -188,6 +188,20 @@ static int imx93_blk_ctrl_power_off(struct generic_pm_= domain *genpd) return 0; } =20 +static void imx93_release_genpd_provider(void *data) +{ + struct device_node *of_node =3D data; + + of_genpd_del_provider(of_node); +} + +static void imx93_release_pm_genpd(void *data) +{ + struct generic_pm_domain *genpd =3D data; + + pm_genpd_remove(genpd); +} + static struct lock_class_key blk_ctrl_genpd_lock_class; =20 static int imx93_blk_ctrl_probe(struct platform_device *pdev) @@ -256,10 +270,8 @@ static int imx93_blk_ctrl_probe(struct platform_device= *pdev) domain->clks[j].id =3D data->clk_names[j]; =20 ret =3D devm_clk_bulk_get(dev, data->num_clks, domain->clks); - if (ret) { - dev_err_probe(dev, ret, "failed to get clock\n"); - goto cleanup_pds; - } + if (ret) + return dev_err_probe(dev, ret, "failed to get clock\n"); =20 domain->genpd.name =3D data->name; domain->genpd.power_on =3D imx93_blk_ctrl_power_on; @@ -267,11 +279,12 @@ static int imx93_blk_ctrl_probe(struct platform_devic= e *pdev) domain->bc =3D bc; =20 ret =3D pm_genpd_init(&domain->genpd, NULL, true); - if (ret) { - dev_err_probe(dev, ret, "failed to init power domain\n"); - goto cleanup_pds; - } + if (ret) + return dev_err_probe(dev, ret, "failed to init power domain\n"); =20 + ret =3D devm_add_action_or_reset(dev, imx93_release_pm_genpd, &domain->g= enpd); + if (ret) + return dev_err_probe(dev, ret, "failed to add pm_genpd release callback= \n"); /* * We use runtime PM to trigger power on/off of the upstream GPC * domain, as a strict hierarchical parent/child power domain @@ -288,39 +301,19 @@ static int imx93_blk_ctrl_probe(struct platform_devic= e *pdev) bc->onecell_data.domains[i] =3D &domain->genpd; } =20 - pm_runtime_enable(dev); + ret =3D devm_pm_runtime_enable(dev); + if (ret) + return dev_err_probe(dev, ret, "failed to enable pm-runtime\n"); =20 ret =3D of_genpd_add_provider_onecell(dev->of_node, &bc->onecell_data); - if (ret) { - dev_err_probe(dev, ret, "failed to add power domain provider\n"); - goto cleanup_pds; - } + if (ret) + return dev_err_probe(dev, ret, "failed to add power domain provider\n"); =20 - dev_set_drvdata(dev, bc); + ret =3D devm_add_action_or_reset(dev, imx93_release_genpd_provider, dev->= of_node); + if (ret) + return dev_err_probe(dev, ret, "failed to add genpd_provider release cal= lback\n"); =20 return 0; - -cleanup_pds: - for (i--; i >=3D 0; i--) - pm_genpd_remove(&bc->domains[i].genpd); - - return ret; -} - -static void imx93_blk_ctrl_remove(struct platform_device *pdev) -{ - struct imx93_blk_ctrl *bc =3D dev_get_drvdata(&pdev->dev); - int i; - - of_genpd_del_provider(pdev->dev.of_node); - - pm_runtime_disable(&pdev->dev); - - for (i =3D 0; i < bc->onecell_data.num_domains; i++) { - struct imx93_blk_ctrl_domain *domain =3D &bc->domains[i]; - - pm_genpd_remove(&domain->genpd); - } } =20 static const struct imx93_blk_ctrl_domain_data imx93_media_blk_ctl_domain_= data[] =3D { @@ -455,7 +448,6 @@ MODULE_DEVICE_TABLE(of, imx93_blk_ctrl_of_match); =20 static struct platform_driver imx93_blk_ctrl_driver =3D { .probe =3D imx93_blk_ctrl_probe, - .remove =3D imx93_blk_ctrl_remove, .driver =3D { .name =3D "imx93-blk-ctrl", .of_match_table =3D imx93_blk_ctrl_of_match, --=20 2.47.3 From nobody Sun Feb 8 09:22:58 2026 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (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 50B8C28D84F for ; Tue, 2 Dec 2025 13:21:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764681701; cv=none; b=fxfZmIvXxNbqW86Cn6sdSRLD6YdoJaFVmPTGDUqe8G4Vps650Pu1PilVcmrnY9K8L12Lc8nFrGgxU2WFFZ22vH/s1kzCWS3yrDUvKjY4H1QMywOH974H3mCrLQiILSzgfBk+IKvp9NhXxFMUdFZJrwHE9GKHgkrnclkCxAaj6Yw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764681701; c=relaxed/simple; bh=PK0hMrcQU8kVrCD+4HsqTvltkXN1ig5I/hLNOTkAYRs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GS2SfUP7kBnB/WdlrxlbYKAVslTZiSBHvxJsQ1+wBy1D8nvL5tKbvZkwzAxoZGn3ZdL862gi6ChnIVFEM7M5Rco3Xv8C5Vly0o46E3Rb/kTzrWQqt1wejgQheiYW6Q+wKQnlbpC/U4aDOCmUWHnp+QW1+GkGRoGpiwLqdmfVEAg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vQQJu-0003pJ-RM; Tue, 02 Dec 2025 14:21:30 +0100 From: Marco Felsch Date: Tue, 02 Dec 2025 14:21:04 +0100 Subject: [PATCH v2 3/3] pmdomain: imx93-blk-ctrl: add support for optional subnodes Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251202-v6-18-topic-imx93-blkctrl-v2-3-e73501034adc@pengutronix.de> References: <20251202-v6-18-topic-imx93-blkctrl-v2-0-e73501034adc@pengutronix.de> In-Reply-To: <20251202-v6-18-topic-imx93-blkctrl-v2-0-e73501034adc@pengutronix.de> To: Ulf Hansson , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-pm@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Alexander Stein , Frank Li , Marco Felsch X-Mailer: b4 0.14.2 X-SA-Exim-Connect-IP: 2a0a:edc0:0:1101:1d::28 X-SA-Exim-Mail-From: m.felsch@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org This particular block can have DT subnodes describing the LVDS LDB, MIPI DSI and parallel DPI bridge. Scan for possible sub-devices within the driver, instead of misusing the simple-bus to perform the scan. Reviewed-by: Alexander Stein Reviewed-by: Frank Li Signed-off-by: Marco Felsch --- drivers/pmdomain/imx/imx93-blk-ctrl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/pmdomain/imx/imx93-blk-ctrl.c b/drivers/pmdomain/imx/i= mx93-blk-ctrl.c index 49610f2389c3bbaf4de4133918fbcacb7924f672..1afc78b034fad8fa09a3e852758= 6387156fc2543 100644 --- a/drivers/pmdomain/imx/imx93-blk-ctrl.c +++ b/drivers/pmdomain/imx/imx93-blk-ctrl.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -313,6 +314,10 @@ static int imx93_blk_ctrl_probe(struct platform_device= *pdev) if (ret) return dev_err_probe(dev, ret, "failed to add genpd_provider release cal= lback\n"); =20 + ret =3D devm_of_platform_populate(dev); + if (ret) + return dev_err_probe(dev, ret, "failed to populate blk-ctrl sub-devices\= n"); + return 0; } =20 --=20 2.47.3