|
@@ -1092,8 +1092,6 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
|
|
goto err_free_connector;
|
|
goto err_free_connector;
|
|
}
|
|
}
|
|
|
|
|
|
- cdn_dp_audio_codec_init(dp, dev);
|
|
|
|
-
|
|
|
|
for (i = 0; i < dp->ports; i++) {
|
|
for (i = 0; i < dp->ports; i++) {
|
|
port = dp->port[i];
|
|
port = dp->port[i];
|
|
|
|
|
|
@@ -1128,7 +1126,6 @@ static void cdn_dp_unbind(struct device *dev, struct device *master, void *data)
|
|
struct drm_connector *connector = &dp->connector;
|
|
struct drm_connector *connector = &dp->connector;
|
|
|
|
|
|
cancel_work_sync(&dp->event_work);
|
|
cancel_work_sync(&dp->event_work);
|
|
- platform_device_unregister(dp->audio_pdev);
|
|
|
|
cdn_dp_encoder_disable(encoder);
|
|
cdn_dp_encoder_disable(encoder);
|
|
encoder->funcs->destroy(encoder);
|
|
encoder->funcs->destroy(encoder);
|
|
connector->funcs->destroy(connector);
|
|
connector->funcs->destroy(connector);
|
|
@@ -1221,6 +1218,8 @@ static int cdn_dp_probe(struct platform_device *pdev)
|
|
mutex_init(&dp->lock);
|
|
mutex_init(&dp->lock);
|
|
dev_set_drvdata(dev, dp);
|
|
dev_set_drvdata(dev, dp);
|
|
|
|
|
|
|
|
+ cdn_dp_audio_codec_init(dp, dev);
|
|
|
|
+
|
|
return component_add(dev, &cdn_dp_component_ops);
|
|
return component_add(dev, &cdn_dp_component_ops);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1228,6 +1227,7 @@ static int cdn_dp_remove(struct platform_device *pdev)
|
|
{
|
|
{
|
|
struct cdn_dp_device *dp = platform_get_drvdata(pdev);
|
|
struct cdn_dp_device *dp = platform_get_drvdata(pdev);
|
|
|
|
|
|
|
|
+ platform_device_unregister(dp->audio_pdev);
|
|
cdn_dp_suspend(dp->dev);
|
|
cdn_dp_suspend(dp->dev);
|
|
component_del(&pdev->dev, &cdn_dp_component_ops);
|
|
component_del(&pdev->dev, &cdn_dp_component_ops);
|
|
|
|
|