diff options
Diffstat (limited to 'arch/arm/mach-s3c2412/mach-jive.c')
-rw-r--r-- | arch/arm/mach-s3c2412/mach-jive.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c index 72c266aee141..8f0d37d43b43 100644 --- a/arch/arm/mach-s3c2412/mach-jive.c +++ b/arch/arm/mach-s3c2412/mach-jive.c | |||
@@ -52,7 +52,6 @@ | |||
52 | #include <plat/cpu.h> | 52 | #include <plat/cpu.h> |
53 | #include <plat/pm.h> | 53 | #include <plat/pm.h> |
54 | #include <plat/udc.h> | 54 | #include <plat/udc.h> |
55 | #include <plat/iic.h> | ||
56 | 55 | ||
57 | static struct map_desc jive_iodesc[] __initdata = { | 56 | static struct map_desc jive_iodesc[] __initdata = { |
58 | }; | 57 | }; |
@@ -278,7 +277,7 @@ __setup("mtdset=", jive_mtdset); | |||
278 | #define LCD_HTOT (LCD_HSYNC + LCD_LEFT_MARGIN + LCD_XRES + LCD_RIGHT_MARGIN) | 277 | #define LCD_HTOT (LCD_HSYNC + LCD_LEFT_MARGIN + LCD_XRES + LCD_RIGHT_MARGIN) |
279 | #define LCD_VTOT (LCD_VSYNC + LCD_LOWER_MARGIN + LCD_YRES + LCD_UPPER_MARGIN) | 278 | #define LCD_VTOT (LCD_VSYNC + LCD_LOWER_MARGIN + LCD_YRES + LCD_UPPER_MARGIN) |
280 | 279 | ||
281 | struct s3c2410fb_display jive_vgg2432a4_display[] = { | 280 | static struct s3c2410fb_display jive_vgg2432a4_display[] = { |
282 | [0] = { | 281 | [0] = { |
283 | .width = LCD_XRES, | 282 | .width = LCD_XRES, |
284 | .height = LCD_YRES, | 283 | .height = LCD_YRES, |
@@ -311,7 +310,7 @@ struct s3c2410fb_display jive_vgg2432a4_display[] = { | |||
311 | #define S3C2410_GPCCON_MASK(x) (3 << ((x) * 2)) | 310 | #define S3C2410_GPCCON_MASK(x) (3 << ((x) * 2)) |
312 | #define S3C2410_GPDCON_MASK(x) (3 << ((x) * 2)) | 311 | #define S3C2410_GPDCON_MASK(x) (3 << ((x) * 2)) |
313 | 312 | ||
314 | struct s3c2410fb_mach_info jive_lcd_config = { | 313 | static struct s3c2410fb_mach_info jive_lcd_config = { |
315 | .displays = jive_vgg2432a4_display, | 314 | .displays = jive_vgg2432a4_display, |
316 | .num_displays = ARRAY_SIZE(jive_vgg2432a4_display), | 315 | .num_displays = ARRAY_SIZE(jive_vgg2432a4_display), |
317 | .default_display = 0, | 316 | .default_display = 0, |
@@ -453,8 +452,7 @@ static struct spi_board_info __initdata jive_spi_devs[] = { | |||
453 | /* I2C bus and device configuration. */ | 452 | /* I2C bus and device configuration. */ |
454 | 453 | ||
455 | static struct s3c2410_platform_i2c jive_i2c_cfg __initdata = { | 454 | static struct s3c2410_platform_i2c jive_i2c_cfg __initdata = { |
456 | .max_freq = 80 * 1000, | 455 | .frequency = 80 * 1000, |
457 | .bus_freq = 50 * 1000, | ||
458 | .flags = S3C_IICFLG_FILTER, | 456 | .flags = S3C_IICFLG_FILTER, |
459 | .sda_delay = 2, | 457 | .sda_delay = 2, |
460 | }; | 458 | }; |