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

Commit 3e1b776c authored by Ben Dooks's avatar Ben Dooks
Browse files

[ARM] S3C: Make i2c device definition common to plat-s3c 



Make the device i2c0 common to plat-s3c and move the
definitions from arch/arm/plat-s3c24xx/devs.c

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent a2205cd2

arch/arm/mach-s3c2410/include/mach/map.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ 
#define S3C24XX_PA_TIMER    S3C2410_PA_TIMER

#define S3C24XX_PA_USBDEV   S3C2410_PA_USBDEV

#define S3C24XX_PA_WATCHDOG S3C2410_PA_WATCHDOG

#define S3C24XX_PA_IIC      S3C2410_PA_IIC

#define S3C24XX_PA_IIS      S3C2410_PA_IIS

#define S3C24XX_PA_GPIO     S3C2410_PA_GPIO

#define S3C24XX_PA_RTC      S3C2410_PA_RTC
@@ -101,6 +100,7 @@ 
#define S3C24XX_PA_SDI      S3C2410_PA_SDI

#define S3C24XX_PA_NAND	    S3C2410_PA_NAND



#define S3C_PA_IIC          S3C2410_PA_IIC

#define S3C_PA_UART	    S3C24XX_PA_UART

#define S3C_PA_HSMMC0	    S3C2443_PA_HSMMC

arch/arm/mach-s3c2410/mach-amlm5900.c

+3 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include <mach/regs-lcd.h>

#include <mach/regs-gpio.h>



#include <plat/iic.h>

#include <plat/devs.h>

#include <plat/cpu.h>
@@ -150,7 +151,7 @@ static struct platform_device *amlm5900_devices[] __initdata = { 
#endif

	&s3c_device_adc,

	&s3c_device_wdt,

	&s3c_device_i2c,

	&s3c_device_i2c0,

	&s3c_device_usb,

 	&s3c_device_rtc,

	&s3c_device_usbgadget,
@@ -233,6 +234,7 @@ static void __init amlm5900_init(void) 
#ifdef CONFIG_FB_S3C2410

	s3c24xx_fb_set_platdata(&amlm5900_fb_info);

#endif

	s3c_i2c0_set_platdata(NULL);

	platform_add_devices(amlm5900_devices, ARRAY_SIZE(amlm5900_devices));

}

arch/arm/mach-s3c2410/mach-bast.c

+4 −3
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ static struct platform_device bast_sio = { 
 * standard 100KHz i2c bus frequency

*/



static struct s3c2410_platform_i2c bast_i2c_info = {

static struct s3c2410_platform_i2c __initdata bast_i2c_info = {

	.flags		= 0,

	.slave_addr	= 0x10,

	.bus_freq	= 100*1000,
@@ -553,7 +553,7 @@ static struct platform_device *bast_devices[] __initdata = { 
	&s3c_device_usb,

	&s3c_device_lcd,

	&s3c_device_wdt,

	&s3c_device_i2c,

	&s3c_device_i2c0,

 	&s3c_device_rtc,

	&s3c_device_nand,

	&bast_device_dm9k,
@@ -588,7 +588,8 @@ static void __init bast_map_io(void) 
	s3c24xx_register_clocks(bast_clocks, ARRAY_SIZE(bast_clocks));



	s3c_device_nand.dev.platform_data = &bast_nand_info;

	s3c_device_i2c.dev.platform_data = &bast_i2c_info;



	s3c_i2c0_set_platdata(&bast_i2c_info);



	s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc));

	s3c24xx_init_clocks(0);

arch/arm/mach-s3c2410/mach-h1940.c

+3 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <mach/h1940-latch.h>

#include <mach/fb.h>

#include <plat/udc.h>

#include <plat/iic.h>



#include <plat/clock.h>

#include <plat/devs.h>
@@ -184,7 +185,7 @@ static struct platform_device *h1940_devices[] __initdata = { 
	&s3c_device_usb,

	&s3c_device_lcd,

	&s3c_device_wdt,

	&s3c_device_i2c,

	&s3c_device_i2c0,

	&s3c_device_iis,

	&s3c_device_usbgadget,

	&s3c_device_leds,
@@ -216,6 +217,7 @@ static void __init h1940_init(void) 


	s3c24xx_fb_set_platdata(&h1940_fb_info);

 	s3c24xx_udc_set_platdata(&h1940_udc_cfg);

	s3c_i2c0_set_platdata(NULL);



	/* Turn off suspend on both USB ports, and switch the

	 * selectable USB port to USB device mode. */

arch/arm/mach-s3c2410/mach-n30.c

+3 −3
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static struct s3c2410fb_mach_info n30_fb_info __initdata = { 
static struct platform_device *n30_devices[] __initdata = {

	&s3c_device_lcd,

	&s3c_device_wdt,

	&s3c_device_i2c,

	&s3c_device_i2c0,

	&s3c_device_iis,

	&s3c_device_usb,

	&s3c_device_usbgadget,
@@ -332,7 +332,7 @@ static struct platform_device *n30_devices[] __initdata = { 
static struct platform_device *n35_devices[] __initdata = {

	&s3c_device_lcd,

	&s3c_device_wdt,

	&s3c_device_i2c,

	&s3c_device_i2c0,

	&s3c_device_iis,

	&s3c_device_usbgadget,

	&n35_button_device,
@@ -501,7 +501,7 @@ static void __init n30_init_irq(void) 
static void __init n30_init(void)

{

	s3c24xx_fb_set_platdata(&n30_fb_info);

	s3c_device_i2c.dev.platform_data = &n30_i2ccfg;

	s3c_device_i2c0.dev.platform_data = &n30_i2ccfg;

	s3c24xx_udc_set_platdata(&n30_udc_cfg);



	/* Turn off suspend on both USB ports, and switch the