Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cb582ca authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Paul Mundt
Browse files

SH: convert migor to soc-camera as platform-device 



Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 194a1730

arch/sh/boards/mach-migor/setup.c

+52 −27
Original line number Original line Diff line number Diff line
@@ -381,21 +381,6 @@ static struct platform_device migor_ceu_device = { 
	},

	},

};

};





static struct ov772x_camera_info ov7725_info = {

	.buswidth  = SOCAM_DATAWIDTH_8,

	.link = {

		.power  = ov7725_power,

	},

};



static struct tw9910_video_info tw9910_info = {

	.buswidth = SOCAM_DATAWIDTH_8,

	.mpout    = TW9910_MPO_FIELD,

	.link = {

		.power  = tw9910_power,

	}

};



struct spi_gpio_platform_data sdcard_cn9_platform_data = {

struct spi_gpio_platform_data sdcard_cn9_platform_data = {

	.sck = GPIO_PTD0,

	.sck = GPIO_PTD0,

	.mosi = GPIO_PTD1,

	.mosi = GPIO_PTD1,
@@ -410,16 +395,6 @@ static struct platform_device sdcard_cn9_device = { 
	},

	},

};

};





static struct platform_device *migor_devices[] __initdata = {

	&smc91x_eth_device,

	&sh_keysc_device,

	&migor_lcdc_device,

	&migor_ceu_device,

	&migor_nor_flash_device,

	&migor_nand_flash_device,

	&sdcard_cn9_device,

};



static struct i2c_board_info migor_i2c_devices[] = {

static struct i2c_board_info migor_i2c_devices[] = {

	{

	{

		I2C_BOARD_INFO("rs5c372b", 0x32),

		I2C_BOARD_INFO("rs5c372b", 0x32),
@@ -428,14 +403,64 @@ static struct i2c_board_info migor_i2c_devices[] = { 
		I2C_BOARD_INFO("migor_ts", 0x51),

		I2C_BOARD_INFO("migor_ts", 0x51),

		.irq = 38, /* IRQ6 */

		.irq = 38, /* IRQ6 */

	},

	},

};



static struct i2c_board_info migor_i2c_camera[] = {

	{

	{

		I2C_BOARD_INFO("ov772x", 0x21),

		I2C_BOARD_INFO("ov772x", 0x21),

		.platform_data = &ov7725_info.link,

	},

	},

	{

	{

		I2C_BOARD_INFO("tw9910", 0x45),

		I2C_BOARD_INFO("tw9910", 0x45),

	},

};



static struct ov772x_camera_info ov7725_info = {

	.buswidth	= SOCAM_DATAWIDTH_8,

	.link = {

		.power		= ov7725_power,

		.board_info	= &migor_i2c_camera[0],

		.i2c_adapter_id	= 0,

		.module_name	= "ov772x",

	},

};



static struct tw9910_video_info tw9910_info = {

	.buswidth	= SOCAM_DATAWIDTH_8,

	.mpout		= TW9910_MPO_FIELD,

	.link = {

		.power		= tw9910_power,

		.board_info	= &migor_i2c_camera[1],

		.i2c_adapter_id	= 0,

		.module_name	= "tw9910",

	}

};



static struct platform_device migor_camera[] = {

	{

		.name	= "soc-camera-pdrv",

		.id	= 0,

		.dev	= {

			.platform_data = &ov7725_info.link,

		},

	}, {

		.name	= "soc-camera-pdrv",

		.id	= 1,

		.dev	= {

			.platform_data = &tw9910_info.link,

			.platform_data = &tw9910_info.link,

		},

		},

	},

};



static struct platform_device *migor_devices[] __initdata = {

	&smc91x_eth_device,

	&sh_keysc_device,

	&migor_lcdc_device,

	&migor_ceu_device,

	&migor_nor_flash_device,

	&migor_nand_flash_device,

	&sdcard_cn9_device,

	&migor_camera[0],

	&migor_camera[1],

};

};





static struct spi_board_info migor_spi_devices[] = {

static struct spi_board_info migor_spi_devices[] = {