@@ -292,6 +292,7 @@ config DRM_TI_SN65DSI86
select DRM_PANEL
select DRM_MIPI_DSI
select AUXILIARY_BUS
+ select DRM_DP_AUX_BUS
help
Texas Instruments SN65DSI86 DSI to eDP Bridge driver
@@ -23,6 +23,7 @@
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_bridge.h>
+#include <drm/drm_dp_aux_bus.h>
#include <drm/drm_dp_helper.h>
#include <drm/drm_mipi_dsi.h>
#include <drm/drm_of.h>
@@ -1448,19 +1449,27 @@ static int ti_sn_aux_probe(struct auxiliary_device *adev,
pdata->aux.transfer = ti_sn_aux_transfer;
drm_dp_aux_init(&pdata->aux);
+ ret = devm_of_dp_aux_populate_ep_devices(&pdata->aux);
+ if (ret)
+ goto err;
+
/*
* The eDP to MIPI bridge parts don't work until the AUX channel is
* setup so we don't add it in the main driver probe, we add it now.
*/
ret = ti_sn65dsi86_add_aux_device(pdata, &pdata->bridge_aux, "bridge");
+ if (ret)
+ goto err;
+
+ return 0;
+err:
/*
* Clear of_node on any errors. Really this only matters if the error
* is -EPROBE_DEFER to avoid (again) keep pinctrl from claiming when
* it tries the probe again, but it shouldn't hurt on any error.
*/
- if (ret)
- adev->dev.of_node = NULL;
+ adev->dev.of_node = NULL;
return ret;
}