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

Daniel Vetter daniel at ffwll.ch
Tue Jun 11 03:24:33 EDT 2013


On Mon, Jun 10, 2013 at 11:23:42PM +0200, Sebastian Hesselbarth wrote:
> 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 at gmail.com>

Hm, I don't have much clue about how dt/of really works, but since of has
this nice probing/auto-instantiation thing I think we could simplify this
some more:
- Create a new drm_i2c_encoder_init_of which only takes a struct
  device_node *of_node argument instead of adap and info.
- I think we could also drop the call to ->set_config since presumably an
  of-enabled driver grabbed any required info already from the dt.

I think this way we could still share encoder slaves across tons of
platforms, only the init sequence (and specifically how they get at their
config data) would be different. That would also be extensible quite
easily (*cough* intel platforms could setup encoder slaves from
information out of the vbt *cough*).

And ofc, a (totally broken) exemplary conversion patch for tilcdc would be
neat ;-)

Cheers, Daniel
> ---
> Cc: David Airlie <airlied at linux.ie>
> Cc: Russell King - ARM Linux <linux at arm.linux.org.uk>
> Cc: Darren Etheridge <darren.etheridge at gmail.com>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: dri-devel at lists.freedesktop.org
> Cc: linux-kernel at vger.kernel.org
> ---
>  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;
> -- 
> 1.7.2.5
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch



More information about the linux-arm-kernel mailing list