From 42479a27abe9c1f3e6e0486198b0da2ad3b10ff1 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Fri, 31 Oct 2008 16:14:29 +0000 Subject: [ARM] SMDK6410: Add HSMMC0 device Add HSMMC0 device to SMDK6410. Signed-off-by: Ben Dooks --- arch/arm/mach-s3c6410/mach-smdk6410.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/mach-s3c6410/mach-smdk6410.c') diff --git a/arch/arm/mach-s3c6410/mach-smdk6410.c b/arch/arm/mach-s3c6410/mach-smdk6410.c index 35d42e8cab9..609d5bd0812 100644 --- a/arch/arm/mach-s3c6410/mach-smdk6410.c +++ b/arch/arm/mach-s3c6410/mach-smdk6410.c @@ -62,6 +62,7 @@ static struct s3c2410_uartcfg smdk6410_uartcfgs[] __initdata = { struct map_desc smdk6410_iodesc[] = {}; static struct platform_device *smdk6410_devices[] __initdata = { + &s3c_device_hsmmc0, }; extern void s3c64xx_init_io(struct map_desc *, int); -- cgit v1.2.3 From 093c8a04da1dff0899a2ac669f1824b6da94aebb Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Fri, 31 Oct 2008 16:14:52 +0000 Subject: [ARM] SMDK6410: Add i2c device Add i2c bus 0 to the configuration Signed-off-by: Ben Dooks --- arch/arm/mach-s3c6410/mach-smdk6410.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/arm/mach-s3c6410/mach-smdk6410.c') diff --git a/arch/arm/mach-s3c6410/mach-smdk6410.c b/arch/arm/mach-s3c6410/mach-smdk6410.c index 609d5bd0812..d58c83d31a0 100644 --- a/arch/arm/mach-s3c6410/mach-smdk6410.c +++ b/arch/arm/mach-s3c6410/mach-smdk6410.c @@ -32,6 +32,7 @@ #include #include +#include #include #include @@ -63,6 +64,7 @@ struct map_desc smdk6410_iodesc[] = {}; static struct platform_device *smdk6410_devices[] __initdata = { &s3c_device_hsmmc0, + &s3c_device_i2c0, }; extern void s3c64xx_init_io(struct map_desc *, int); @@ -76,6 +78,7 @@ static void __init smdk6410_map_io(void) static void __init smdk6410_machine_init(void) { + s3c_i2c0_set_platdata(NULL); platform_add_devices(smdk6410_devices, ARRAY_SIZE(smdk6410_devices)); } -- cgit v1.2.3 From 22c50fdd366599a9de9d7b0ec5f8784df5039769 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Fri, 31 Oct 2008 16:14:57 +0000 Subject: [ARM] SMDK6410: Add second I2C channel. Add the second I2C channel on the SMDK6410. Signed-off-by: Ben Dooks --- arch/arm/mach-s3c6410/mach-smdk6410.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/mach-s3c6410/mach-smdk6410.c') diff --git a/arch/arm/mach-s3c6410/mach-smdk6410.c b/arch/arm/mach-s3c6410/mach-smdk6410.c index d58c83d31a0..8d7101aab75 100644 --- a/arch/arm/mach-s3c6410/mach-smdk6410.c +++ b/arch/arm/mach-s3c6410/mach-smdk6410.c @@ -65,6 +65,7 @@ struct map_desc smdk6410_iodesc[] = {}; static struct platform_device *smdk6410_devices[] __initdata = { &s3c_device_hsmmc0, &s3c_device_i2c0, + &s3c_device_i2c1, }; extern void s3c64xx_init_io(struct map_desc *, int); @@ -79,6 +80,7 @@ static void __init smdk6410_map_io(void) static void __init smdk6410_machine_init(void) { s3c_i2c0_set_platdata(NULL); + s3c_i2c1_set_platdata(NULL); platform_add_devices(smdk6410_devices, ARRAY_SIZE(smdk6410_devices)); } -- cgit v1.2.3 From 9d9e31b2855c3d34a920babcb5e862919f3fdf7e Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Fri, 31 Oct 2008 16:14:59 +0000 Subject: [ARM] SMDK6410: Add I2C device board information Add the I2C devices on the SMDK6410. Signed-off-by: Ben Dooks --- arch/arm/mach-s3c6410/mach-smdk6410.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'arch/arm/mach-s3c6410/mach-smdk6410.c') diff --git a/arch/arm/mach-s3c6410/mach-smdk6410.c b/arch/arm/mach-s3c6410/mach-smdk6410.c index 8d7101aab75..e845b2a1bec 100644 --- a/arch/arm/mach-s3c6410/mach-smdk6410.c +++ b/arch/arm/mach-s3c6410/mach-smdk6410.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -68,6 +69,16 @@ static struct platform_device *smdk6410_devices[] __initdata = { &s3c_device_i2c1, }; + +static struct i2c_board_info i2c_devs0[] __initdata = { + { I2C_BOARD_INFO("24c08", 0x50), }, + { I2C_BOARD_INFO("WM8580", 0X1b), }, +}; + +static struct i2c_board_info i2c_devs1[] __initdata = { + { I2C_BOARD_INFO("24c128", 0x57), }, /* Samsung S524AD0XD1 */ +}; + extern void s3c64xx_init_io(struct map_desc *, int); static void __init smdk6410_map_io(void) @@ -81,6 +92,10 @@ static void __init smdk6410_machine_init(void) { s3c_i2c0_set_platdata(NULL); s3c_i2c1_set_platdata(NULL); + + i2c_register_board_info(0, i2c_devs0, ARRAY_SIZE(i2c_devs0)); + i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1)); + platform_add_devices(smdk6410_devices, ARRAY_SIZE(smdk6410_devices)); } -- cgit v1.2.3 From 54f677944dcf6df99030ca4797aaf3023c728f26 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Fri, 31 Oct 2008 16:15:01 +0000 Subject: [ARM] S3C64XX: Fix missing definition of s3c64xx_init_io() The function s3c64xx_init_io was missing from and was masked by the SMDK6410 having an local definition. Fix by removing the SMDK6410 variant and adding it to the relevant file. Signed-off-by: Ben Dooks --- arch/arm/mach-s3c6410/mach-smdk6410.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'arch/arm/mach-s3c6410/mach-smdk6410.c') diff --git a/arch/arm/mach-s3c6410/mach-smdk6410.c b/arch/arm/mach-s3c6410/mach-smdk6410.c index e845b2a1bec..b5d24df436a 100644 --- a/arch/arm/mach-s3c6410/mach-smdk6410.c +++ b/arch/arm/mach-s3c6410/mach-smdk6410.c @@ -79,8 +79,6 @@ static struct i2c_board_info i2c_devs1[] __initdata = { { I2C_BOARD_INFO("24c128", 0x57), }, /* Samsung S524AD0XD1 */ }; -extern void s3c64xx_init_io(struct map_desc *, int); - static void __init smdk6410_map_io(void) { s3c64xx_init_io(smdk6410_iodesc, ARRAY_SIZE(smdk6410_iodesc)); -- cgit v1.2.3