[PATCH v16 03/12] drm: imx: imx-hdmi: convert imx-hdmi to drm_bridge mode

Russell King - ARM Linux linux at arm.linux.org.uk
Wed Dec 3 07:38:47 PST 2014


On Wed, Dec 03, 2014 at 11:29:26PM +0800, Andy Yan wrote:
> +int imx_hdmi_bind(struct device *dev, struct device *master,
> +		  void *data, struct drm_encoder *encoder,
> +		  const struct imx_hdmi_plat_data *plat_data)
>  {
>  	struct platform_device *pdev = to_platform_device(dev);
> -	const struct of_device_id *of_id =
> -				of_match_device(imx_hdmi_dt_ids, dev);
>  	struct drm_device *drm = data;
>  	struct device_node *np = dev->of_node;
>  	struct device_node *ddc_node;
> @@ -1594,19 +1566,16 @@ static int imx_hdmi_bind(struct device *dev, struct device *master, void *data)
>  	struct resource *iores;
>  	int ret, irq;
>  
> -	hdmi = devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL);
> +	hdmi = devm_kzalloc(&pdev->dev, sizeof(*hdmi), GFP_KERNEL);
>  	if (!hdmi)
>  		return -ENOMEM;
>  
> -	hdmi->dev = dev;
> +	hdmi->plat_data = plat_data;
> +	hdmi->dev = &pdev->dev;
> +	hdmi->dev_type = plat_data->dev_type;
>  	hdmi->sample_rate = 48000;
>  	hdmi->ratio = 100;
> -
> -	if (of_id) {
> -		const struct platform_device_id *device_id = of_id->data;
> -
> -		hdmi->dev_type = device_id->driver_data;
> -	}
> +	hdmi->encoder = encoder;

I'd suggest changing imx_hdmi_bind() to take the struct resource and irq
number, and avoiding the platform device stuff altogether in here.

-- 
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up
according to speedtest.net.



More information about the Linux-rockchip mailing list