All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Boyd <swboyd@chromium.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
	dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org,
	linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	"Rafael J. Wysocki" <rafael@kernel.org>,
	Rob Clark <robdclark@gmail.com>,
	Russell King <rmk+kernel@arm.linux.org.uk>,
	Saravana Kannan <saravanak@google.com>
Subject: [PATCH v3 30/34] fbdev: omap2: Migrate to aggregate driver
Date: Mon, 25 Oct 2021 17:00:40 -0700	[thread overview]
Message-ID: <20211026000044.885195-31-swboyd@chromium.org> (raw)
In-Reply-To: <20211026000044.885195-1-swboyd@chromium.org>

Use an aggregate driver instead of component ops so that we can get
proper driver probe ordering of the aggregate device with respect to all
the component devices that make up the aggregate device.

Cc: <linux-omap@vger.kernel.org>
Cc: <linux-fbdev@vger.kernel.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Saravana Kannan <saravanak@google.com>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
 drivers/video/fbdev/omap2/omapfb/dss/dss.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c
index a6b1c1598040..f12663c39ceb 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c
@@ -1067,8 +1067,9 @@ static int dss_video_pll_probe(struct platform_device *pdev)
 }
 
 /* DSS HW IP initialisation */
-static int dss_bind(struct device *dev)
+static int dss_bind(struct aggregate_device *adev)
 {
+	struct device *dev = adev->parent;
 	struct platform_device *pdev = to_platform_device(dev);
 	struct resource *dss_mem;
 	u32 rev;
@@ -1167,8 +1168,9 @@ static int dss_bind(struct device *dev)
 	return r;
 }
 
-static void dss_unbind(struct device *dev)
+static void dss_unbind(struct aggregate_device *adev)
 {
+	struct device *dev = adev->parent;
 	struct platform_device *pdev = to_platform_device(dev);
 
 	dss_initialized = false;
@@ -1188,9 +1190,13 @@ static void dss_unbind(struct device *dev)
 	dss_put_clocks();
 }
 
-static const struct component_master_ops dss_component_ops = {
-	.bind = dss_bind,
-	.unbind = dss_unbind,
+static struct aggregate_driver dss_aggregate_driver = {
+	.probe = dss_bind,
+	.remove = dss_unbind,
+	.driver = {
+		.name = "dss_fbdev",
+		.owner = THIS_MODULE,
+	},
 };
 
 static int dss_component_compare(struct device *dev, void *data)
@@ -1225,7 +1231,7 @@ static int dss_probe(struct platform_device *pdev)
 	/* add all the child devices as components */
 	device_for_each_child(&pdev->dev, &match, dss_add_child_component);
 
-	r = component_master_add_with_match(&pdev->dev, &dss_component_ops, match);
+	r = component_aggregate_register(&pdev->dev, &dss_aggregate_driver, match);
 	if (r)
 		return r;
 
@@ -1234,7 +1240,7 @@ static int dss_probe(struct platform_device *pdev)
 
 static int dss_remove(struct platform_device *pdev)
 {
-	component_master_del(&pdev->dev, &dss_component_ops);
+	component_aggregate_unregister(&pdev->dev, &dss_aggregate_driver);
 	return 0;
 }
 
-- 
https://chromeos.dev


  parent reply	other threads:[~2021-10-26  0:01 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-26  0:00 [PATCH v3 00/34] component: Make into an aggregate bus Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 01/34] component: Introduce struct aggregate_device Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 02/34] component: Remove most references to 'master' Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 03/34] component: Introduce the aggregate bus_type Stephen Boyd
2021-10-26  4:40   ` kernel test robot
2021-10-26  4:40     ` kernel test robot
2021-10-26 14:02   ` kernel test robot
2021-10-26 14:02     ` kernel test robot
2021-10-26 19:33     ` Stephen Boyd
2021-10-26 19:33       ` Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 04/34] component: Move struct aggregate_device out to header file Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 05/34] component: Add {bind,unbind}_component() ops that take aggregate device Stephen Boyd
2021-10-26  0:00   ` [PATCH v3 05/34] component: Add {bind, unbind}_component() " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 06/34] drm/of: Add a drm_of_aggregate_probe() API Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 07/34] drm/msm: Migrate to aggregate driver Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 08/34] drm/komeda: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 09/34] drm/arm/hdlcd: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 10/34] drm/malidp: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 11/34] drm/armada: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 12/34] drm/etnaviv: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 13/34] drm/kirin: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 14/34] drm/exynos: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 15/34] drm/imx: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 16/34] drm/ingenic: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 17/34] drm/mcde: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 18/34] drm/mediatek: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 19/34] drm/meson: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 20/34] drm/omap: " Stephen Boyd
2021-10-26 23:52   ` kernel test robot
2021-10-26 23:52     ` kernel test robot
2021-10-26  0:00 ` [PATCH v3 21/34] drm/rockchip: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 22/34] drm/sti: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 23/34] drm/sun4i: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 24/34] drm/tilcdc: " Stephen Boyd
2021-11-01 19:35   ` Jyri Sarha
2021-11-01 19:35     ` Jyri Sarha
2021-10-26  0:00 ` [PATCH v3 25/34] drm/vc4: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 26/34] drm/zte: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 27/34] iommu/mtk: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 28/34] mei: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 29/34] power: supply: ab8500: " Stephen Boyd
2021-10-26  0:00 ` Stephen Boyd [this message]
2021-10-26  0:00 ` [PATCH v3 31/34] sound: hdac: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 32/34] ASoC: codecs: wcd938x: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 33/34] component: Get rid of drm_of_component_probe() Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 34/34] component: Remove component_master_ops and friends Stephen Boyd

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211026000044.885195-31-swboyd@chromium.org \
    --to=swboyd@chromium.org \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=freedreno@lists.freedesktop.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=rafael@kernel.org \
    --cc=rmk+kernel@arm.linux.org.uk \
    --cc=robdclark@gmail.com \
    --cc=saravanak@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.