renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 20:23:57 +08:00
Code

sh: I2C fix for AP325RXA and Migo-R

Browse Source 
Fix recently introduced I2C build breakage on AP325RXA and Migo-R.

Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Magnus Damm 2008-07-29 20:57:38 +09:00 committed by Paul Mundt
parent da2014a2b0
commit e565b518ec
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sh/boards/mach-ap325rxa/setup.c
View File

@ -165,6 +165,7 @@ static struct platform_device lcdc_device = {
},
};
#ifdef CONFIG_I2C
static unsigned char camera_ncm03j_magic[] =
{
0x87, 0x00, 0x88, 0x08, 0x89, 0x01, 0x8A, 0xE8,
@ -234,6 +235,7 @@ static struct platform_device camera_device = {
.platform_data = &camera_info,
},
};
#endif /* CONFIG_I2C */
static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
.flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
@ -270,7 +272,9 @@ static struct platform_device *ap325rxa_devices[] __initdata = {
&ap325rxa_nor_flash_device,
&lcdc_device,
&ceu_device,
#ifdef CONFIG_I2C
&camera_device,
#endif
};
static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {

4
arch/sh/boards/mach-migor/setup.c
View File

@ -304,6 +304,7 @@ static void camera_power_off(void)
ctrl_outb(ctrl_inb(PORT_PTDR) & ~0x08, PORT_PTDR);
}
#ifdef CONFIG_I2C
static unsigned char camera_ov772x_magic[] =
{
0x09, 0x01, 0x0c, 0x10, 0x0d, 0x41, 0x0e, 0x01,
@ -391,6 +392,7 @@ static struct platform_device migor_camera_device = {
.platform_data = &ov772x_info,
},
};
#endif /* CONFIG_I2C */
static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
.flags = SOCAM_MASTER | SOCAM_DATAWIDTH_8 | SOCAM_PCLK_SAMPLE_RISING \
@ -429,7 +431,9 @@ static struct platform_device *migor_devices[] __initdata = {
&sh_keysc_device,
&migor_lcdc_device,
&migor_ceu_device,
#ifdef CONFIG_I2C
&migor_camera_device,
#endif
&migor_nor_flash_device,
&migor_nand_flash_device,
};