From 3fe05478c81e7b15900010be1ce1f8ad6f6fa9f9 Mon Sep 17 00:00:00 2001 From: Douglas Anderson Date: Wed, 2 Sep 2015 11:04:11 -0700 Subject: [PATCH] CHROMIUM: drm: bridge/dw_hdmi: Provide an of_node to DDC i2c bus In (3b9ba9a FROMLIST: drm: bridge/dw_hdmi: add dw hdmi i2c bus adapter support) we added a new i2c bus adapter but no of_node was provided to the adapter. This made it difficult to assign a bus number to the adapter in the device tree. Because of the fact that dynamic bus numbering of i2c starts at 0 and the fact that i2c busses are no longer allowed to be loaded extra-early at boot (because deferred probe solves the boot order problem), it's possible that this could cause the DDC i2c bus to get ID 0 and could cause later SoC i2c busses to fail to probe because they're expecting to get ID 0. Note that probe ordering of mickey is slightly different than probe ordering of other veyron devices, which is why this only shows up on mickey. BUG=chrome-os-partner:44802 TEST=With dts patch can now boot mickey again Change-Id: I8f971a967f398ab58a6713a2b6471a4a2fe61dc6 Signed-off-by: Douglas Anderson Reviewed-on: https://chromium-review.googlesource.com/297040 Reviewed-by: Alexandru Stan Signed-off-by: Yakir Yang --- drivers/gpu/drm/bridge/dw-hdmi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c index a01d357aca01..8bf46d863bd3 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/dw-hdmi.c @@ -445,6 +445,7 @@ static struct i2c_adapter *dw_hdmi_i2c_adapter(struct dw_hdmi *hdmi) adap->class = I2C_CLASS_DDC; adap->owner = THIS_MODULE; adap->dev.parent = hdmi->dev; + adap->dev.of_node = hdmi->dev->of_node; adap->algo = &dw_hdmi_algorithm; strlcpy(adap->name, "DesignWare HDMI", sizeof(adap->name)); i2c_set_adapdata(adap, hdmi); -- 2.34.1