@@ -356,13 +356,16 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
return ret;
}
-static int meson_drv_bind(struct device *dev)
+static int meson_drv_bind(struct aggregate_device *adev)
{
+ struct device *dev = adev->parent;
+
return meson_drv_bind_master(dev, true);
}
-static void meson_drv_unbind(struct device *dev)
+static void meson_drv_unbind(struct aggregate_device *adev)
{
+ struct device *dev = adev->parent;
struct meson_drm *priv = dev_get_drvdata(dev);
struct drm_device *drm = priv->drm;
@@ -386,9 +389,13 @@ static void meson_drv_unbind(struct device *dev)
}
}
-static const struct component_master_ops meson_drv_master_ops = {
- .bind = meson_drv_bind,
- .unbind = meson_drv_unbind,
+static struct aggregate_driver meson_aggregate_drv = {
+ .probe = meson_drv_bind,
+ .remove = meson_drv_unbind,
+ .driver = {
+ .name = "meson_drm",
+ .owner = THIS_MODULE,
+ },
};
static int __maybe_unused meson_drv_pm_suspend(struct device *dev)
@@ -502,9 +509,7 @@ static int meson_drv_probe(struct platform_device *pdev)
if (count) {
dev_info(&pdev->dev, "Queued %d outputs on vpu\n", count);
- return component_master_add_with_match(&pdev->dev,
- &meson_drv_master_ops,
- match);
+ return component_aggregate_register(&pdev->dev, &meson_aggregate_drv, match);
}
/* If no output endpoints were available, simply bail out */
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: Neil Armstrong <narmstrong@baylibre.com> 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/gpu/drm/meson/meson_drv.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)