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: Daniel Vetter <daniel.vetter@xxxxxxxx>
Cc: "Rafael J. Wysocki" <rafael@xxxxxxxxxx>
Cc: Rob Clark <robdclark@xxxxxxxxx>
Cc: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Cc: Saravana Kannan <saravanak@xxxxxxxxxx>
Signed-off-by: Stephen Boyd <swboyd@xxxxxxxxxxxx>
---
drivers/gpu/drm/zte/zx_drm_drv.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/zte/zx_drm_drv.c b/drivers/gpu/drm/zte/zx_drm_drv.c
index 064056503ebb..b46f677ea51d 100644
--- a/drivers/gpu/drm/zte/zx_drm_drv.c
+++ b/drivers/gpu/drm/zte/zx_drm_drv.c
@@ -45,8 +45,9 @@ static const struct drm_driver zx_drm_driver = {
.minor = 0,
};
-static int zx_drm_bind(struct device *dev)
+static int zx_drm_bind(struct aggregate_device *adev)
{
+ struct device *dev = adev->parent;
struct drm_device *drm;
int ret;
@@ -97,8 +98,9 @@ static int zx_drm_bind(struct device *dev)
return ret;
}
-static void zx_drm_unbind(struct device *dev)
+static void zx_drm_unbind(struct aggregate_device *adev)
{
+ struct device *dev = adev->parent;
struct drm_device *drm = dev_get_drvdata(dev);
drm_dev_unregister(drm);
@@ -110,9 +112,13 @@ static void zx_drm_unbind(struct device *dev)
drm_dev_put(drm);
}
-static const struct component_master_ops zx_drm_master_ops = {
- .bind = zx_drm_bind,
- .unbind = zx_drm_unbind,
+static struct aggregate_driver zx_aggregate_driver = {
+ .probe = zx_drm_bind,
+ .remove = zx_drm_unbind,
+ .driver = {
+ .name = "zx_drm",
+ .owner = THIS_MODULE,
+ },
};
static int compare_of(struct device *dev, void *data)
@@ -135,12 +141,12 @@ static int zx_drm_probe(struct platform_device *pdev)
for_each_available_child_of_node(parent, child)
component_match_add(dev, &match, compare_of, child);
- return component_master_add_with_match(dev, &zx_drm_master_ops, match);
+ return component_aggregate_register(dev, &zx_aggregate_driver, match);
}
static int zx_drm_remove(struct platform_device *pdev)
{
- component_master_del(&pdev->dev, &zx_drm_master_ops);
+ component_aggregate_unregister(&pdev->dev, &zx_aggregate_driver);
return 0;
}
--
https://chromeos.dev
