Re: [PATCH 02/10 v2] ARM: convert pcm037 to the new platform-device soc-camera interface

From: Sascha Hauer <s.hauer@pengutronix.de>
To: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Linux Media Mailing List <linux-media@vger.kernel.org>,
	Hans Verkuil <hverkuil@xs4all.nl>,
	Magnus Damm <magnus.damm@gmail.com>,
	Robert Jarzmik <robert.jarzmik@free.fr>,
	Darius Augulis <augulis.darius@gmail.com>,
	Paul Mundt <lethal@linux-sh.org>
Subject: Re: [PATCH 02/10 v2] ARM: convert pcm037 to the new platform-device soc-camera interface
Date: Wed, 20 May 2009 09:38:44 +0200	[thread overview]
Message-ID: <20090520073844.GP9288@pengutronix.de> (raw)
In-Reply-To: <Pine.LNX.4.64.0905151824040.4658@axis700.grange>

On Fri, May 15, 2009 at 07:19:10PM +0200, Guennadi Liakhovetski wrote:
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> ---
> 
> This is actually a completion to the other single patches I've sent 
> earlier for various boards. As I said, pcm037 doesn't have all its 
> outstanding patches in next yet, so, you'll need to collect them from 
> trees / lists, or get them when I upload them.

As I haven't got camera support for pcm037 in my tree yet, you can
combine this with the patch which adds camera support. How are we going
to sync this with the according changes to soc-camera?

Sascha

> 
>  arch/arm/mach-mx3/pcm037.c |   26 ++++++++++++++++++--------
>  1 files changed, 18 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/mach-mx3/pcm037.c b/arch/arm/mach-mx3/pcm037.c
> index bfa814d..af49f03 100644
> --- a/arch/arm/mach-mx3/pcm037.c
> +++ b/arch/arm/mach-mx3/pcm037.c
> @@ -293,9 +293,18 @@ static int pcm037_camera_power(struct device *dev, int on)
>  	return 0;
>  }
>  
> +static struct i2c_board_info pcm037_i2c_2_devices[] = {
> +	{
> +		I2C_BOARD_INFO("mt9t031", 0x5d),
> +	},
> +};
> +
>  static struct soc_camera_link iclink = {
> -	.bus_id	= 0,			/* Must match with the camera ID */
> -	.power = pcm037_camera_power,
> +	.bus_id		= 0,		/* Must match with the camera ID */
> +	.power		= pcm037_camera_power,
> +	.board_info	= &pcm037_i2c_2_devices[0],
> +	.i2c_adapter_id	= 2,
> +	.module_name	= "mt9t031",
>  };
>  
>  static struct i2c_board_info pcm037_i2c_devices[] = {
> @@ -308,9 +317,10 @@ static struct i2c_board_info pcm037_i2c_devices[] = {
>  	}
>  };
>  
> -static struct i2c_board_info pcm037_i2c_2_devices[] = {
> -	{
> -		I2C_BOARD_INFO("mt9t031", 0x5d),
> +static struct platform_device pcm037_camera = {
> +	.name	= "soc-camera-pdrv",
> +	.id	= 0,
> +	.dev	= {
>  		.platform_data = &iclink,
>  	},
>  };
> @@ -390,6 +400,9 @@ static struct platform_device *devices[] __initdata = {
>  	&pcm037_flash,
>  	&pcm037_eth,
>  	&pcm037_sram_device,
> +#if defined(CONFIG_I2C_IMX) || defined(CONFIG_I2C_IMX_MODULE)
> +	&pcm037_camera,
> +#endif
>  };
>  
>  static struct ipu_platform_data mx3_ipu_data = {
> @@ -447,9 +460,6 @@ static void __init mxc_board_init(void)
>  	i2c_register_board_info(1, pcm037_i2c_devices,
>  			ARRAY_SIZE(pcm037_i2c_devices));
>  
> -	i2c_register_board_info(2, pcm037_i2c_2_devices,
> -			ARRAY_SIZE(pcm037_i2c_2_devices));
> -
>  	mxc_register_device(&mxc_i2c_device1, &pcm037_i2c_1_data);
>  	mxc_register_device(&mxc_i2c_device2, &pcm037_i2c_2_data);
>  #endif
> -- 
> 1.6.2.4
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |