aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300/core.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@stericsson.com>2009-08-13 21:42:01 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-08-15 15:36:29 +0100
commit6be2a0cacc1ed6899a53172e2e9b7a3587be0bea (patch)
tree2b68c9b5e06c8f7601f3145ea0c3eb34811c6dff /arch/arm/mach-u300/core.c
parentc7c8c78fdf6e9bd65d8ee879115dc2cd5d9fd0dc (diff)
downloadkernel_samsung_smdk4412-6be2a0cacc1ed6899a53172e2e9b7a3587be0bea.zip
kernel_samsung_smdk4412-6be2a0cacc1ed6899a53172e2e9b7a3587be0bea.tar.gz
kernel_samsung_smdk4412-6be2a0cacc1ed6899a53172e2e9b7a3587be0bea.tar.bz2
ARM: 5668/2: U300 I2C board setup
This sets up the U300 I2C subdevices so that the AB3100 analog baseband ASIC is properly detected and also the camera devices in the U335 reference design get properly registered. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-u300/core.c')
-rw-r--r--arch/arm/mach-u300/core.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 38d08a1..bad1ba2 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -33,6 +33,7 @@
#include "clock.h"
#include "mmc.h"
#include "spi.h"
+#include "i2c.h"
/*
* Static I/O mappings that are needed for booting the U300 platforms. The
@@ -379,14 +380,14 @@ static struct platform_device wdog_device = {
};
static struct platform_device i2c0_device = {
- .name = "stddci2c",
+ .name = "stu300",
.id = 0,
.num_resources = ARRAY_SIZE(i2c0_resources),
.resource = i2c0_resources,
};
static struct platform_device i2c1_device = {
- .name = "stddci2c",
+ .name = "stu300",
.id = 1,
.num_resources = ARRAY_SIZE(i2c1_resources),
.resource = i2c1_resources,
@@ -625,6 +626,9 @@ void __init u300_init_devices(void)
u300_assign_physmem();
+ /* Register subdevices on the I2C buses */
+ u300_i2c_register_board_devices();
+
/* Register subdevices on the SPI bus */
u300_spi_register_board_devices();