1 files changed, 55 insertions, 12 deletions

diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c
index 2e8d3e176bc7..f4535a7dadf5 100644
--- a/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/arch/arm/mach-nomadik/board-nhk8815.c
@@ -14,12 +14,14 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/amba/bus.h>
+#include <linux/amba/mmci.h>
 #include <linux/interrupt.h>
 #include <linux/gpio.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/onenand.h>
 #include <linux/mtd/partitions.h>
+#include <linux/i2c.h>
 #include <linux/io.h>
 #include <asm/hardware/vic.h>
 #include <asm/sizes.h>
@@ -185,16 +187,28 @@ static void __init nhk8815_onenand_init(void)
 #endif
 }
 
-static AMBA_APB_DEVICE(uart0, "uart0", 0, NOMADIK_UART0_BASE,
-        { IRQ_UART0 }, NULL);
+static struct mmci_platform_data mmcsd_plat_data = {
+        .ocr_mask = MMC_VDD_29_30,
+        .f_max = 48000000,
+        .gpio_wp = -1,
+        .gpio_cd = 111,
+        .cd_invert = true,
+        .capabilities = MMC_CAP_MMC_HIGHSPEED |
+        MMC_CAP_SD_HIGHSPEED | MMC_CAP_4_BIT_DATA,
+};
 
-static AMBA_APB_DEVICE(uart1, "uart1", 0, NOMADIK_UART1_BASE,
-        { IRQ_UART1 }, NULL);
+static int __init nhk8815_mmcsd_init(void)
+{
+        int ret;
 
-static struct amba_device *amba_devs[] __initdata = {
-        &uart0_device,
-        &uart1_device,
-};
+        ret = gpio_request(112, "card detect bias");
+        if (ret)
+                return ret;
+        gpio_direction_output(112, 0);
+        amba_apb_device_add(NULL, "mmci", NOMADIK_SDI_BASE, SZ_4K, IRQ_SDMMC, 0, &mmcsd_plat_data, 0x10180180);
+        return 0;
+}
+module_init(nhk8815_mmcsd_init);
 
 static struct resource nhk8815_eth_resources[] = {
         {
@@ -253,17 +267,46 @@ static struct sys_timer nomadik_timer = {
         .init   = nomadik_timer_init,
 };
 
+static struct i2c_board_info __initdata nhk8815_i2c0_devices[] = {
+        {
+                I2C_BOARD_INFO("stw4811", 0x2d),
+        },
+};
+
+static struct i2c_board_info __initdata nhk8815_i2c1_devices[] = {
+        {
+                I2C_BOARD_INFO("camera", 0x10),
+        },
+        {
+                I2C_BOARD_INFO("stw5095", 0x1a),
+        },
+        {
+                I2C_BOARD_INFO("lis3lv02dl", 0x1d),
+        },
+};
+
+static struct i2c_board_info __initdata nhk8815_i2c2_devices[] = {
+        {
+                I2C_BOARD_INFO("stw4811-usb", 0x2d),
+        },
+};
+
 static void __init nhk8815_platform_init(void)
 {
-        int i;
-
         cpu8815_platform_init();
         nhk8815_onenand_init();
         platform_add_devices(nhk8815_platform_devices,
                              ARRAY_SIZE(nhk8815_platform_devices));
 
-        for (i = 0; i < ARRAY_SIZE(amba_devs); i++)
-                amba_device_register(amba_devs[i], &iomem_resource);
+        amba_apb_device_add(NULL, "uart0", NOMADIK_UART0_BASE, SZ_4K, IRQ_UART0, 0, NULL, 0);
+        amba_apb_device_add(NULL, "uart1", NOMADIK_UART1_BASE, SZ_4K, IRQ_UART1, 0, NULL, 0);
+
+        i2c_register_board_info(0, nhk8815_i2c0_devices,
+                                ARRAY_SIZE(nhk8815_i2c0_devices));
+        i2c_register_board_info(1, nhk8815_i2c1_devices,
+                                ARRAY_SIZE(nhk8815_i2c1_devices));
+        i2c_register_board_info(2, nhk8815_i2c2_devices,
+                                ARRAY_SIZE(nhk8815_i2c2_devices));
 }
 
 MACHINE_START(NOMADIK, "NHK8815")