[PATCH] drm: encoder_slave: respect of_node on i2c encoder init

From: Sebastian Hesselbarth
Date: Mon Jun 10 2013 - 17:23:58 EST

Current DRM slave encoder API conflicts with auto-registration of i2c client
when using DT probed clients. To allow DRM slave encoders passed by DT, this
patch adds a check to drm_i2c_encoder_init for a non-NULL .of_node on
i2c_board_info and calls an of_i2c helper to get the i2c client device
instead of registering a new device.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@xxxxxxxxx>
Cc: David Airlie <airlied@xxxxxxxx>
Cc: Russell King - ARM Linux <linux@xxxxxxxxxxxxxxxx>
Cc: Darren Etheridge <darren.etheridge@xxxxxxxxx>
Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
drivers/gpu/drm/drm_encoder_slave.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/drm_encoder_slave.c b/drivers/gpu/drm/drm_encoder_slave.c
index 0cfb60f..36c0aa7 100644
--- a/drivers/gpu/drm/drm_encoder_slave.c
+++ b/drivers/gpu/drm/drm_encoder_slave.c
@@ -25,6 +25,7 @@

#include <linux/module.h>
+#include <linux/of_i2c.h>

#include <drm/drm_encoder_slave.h>

@@ -61,7 +62,10 @@ int drm_i2c_encoder_init(struct drm_device *dev,

request_module("%s%s", I2C_MODULE_PREFIX, info->type);

- client = i2c_new_device(adap, info);
+ if (info->of_node)
+ client = of_find_i2c_device_by_node(info->of_node);
+ else
+ client = i2c_new_device(adap, info);
if (!client) {
err = -ENOMEM;
goto fail;

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/