Merge branch 'omap4-i2c-init' into omap-for-linus

1 files changed, 8 insertions, 13 deletions

diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 3dc0a88712eb..383478116ef5 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -450,11 +450,6 @@ void __init dm355_init_spi0(unsigned chipselect_mask,
 
 /*----------------------------------------------------------------------*/
 
-#define PINMUX0         0x00
-#define PINMUX1         0x04
-#define PINMUX2         0x08
-#define PINMUX3         0x0c
-#define PINMUX4         0x10
 #define INTMUX          0x18
 #define EVTMUX          0x1c
 
@@ -788,9 +783,7 @@ static struct davinci_id dm355_ids[] = {
         },
 };
 
-static void __iomem *dm355_psc_bases[] = {
-        IO_ADDRESS(DAVINCI_PWR_SLEEP_CNTRL_BASE),
-};
+static u32 dm355_psc_bases[] = { DAVINCI_PWR_SLEEP_CNTRL_BASE };
 
 /*
  * T0_BOT: Timer 0, bottom:  clockevent source for hrtimers
@@ -798,7 +791,7 @@ static void __iomem *dm355_psc_bases[] = {
  * T1_BOT: Timer 1, bottom:  (used by DSP in TI DSPLink code)
  * T1_TOP: Timer 1, top   :  <unused>
  */
-struct davinci_timer_info dm355_timer_info = {
+static struct davinci_timer_info dm355_timer_info = {
         .timers         = davinci_timer_instance,
         .clockevent_id  = T0_BOT,
         .clocksource_id = T0_TOP,
@@ -845,26 +838,28 @@ static struct platform_device dm355_serial_device = {
 static struct davinci_soc_info davinci_soc_info_dm355 = {
         .io_desc                = dm355_io_desc,
         .io_desc_num            = ARRAY_SIZE(dm355_io_desc),
-        .jtag_id_base           = IO_ADDRESS(0x01c40028),
+        .jtag_id_reg            = 0x01c40028,
         .ids                    = dm355_ids,
         .ids_num                = ARRAY_SIZE(dm355_ids),
         .cpu_clks               = dm355_clks,
         .psc_bases              = dm355_psc_bases,
         .psc_bases_num          = ARRAY_SIZE(dm355_psc_bases),
-        .pinmux_base            = IO_ADDRESS(DAVINCI_SYSTEM_MODULE_BASE),
+        .pinmux_base            = DAVINCI_SYSTEM_MODULE_BASE,
         .pinmux_pins            = dm355_pins,
         .pinmux_pins_num        = ARRAY_SIZE(dm355_pins),
-        .intc_base              = IO_ADDRESS(DAVINCI_ARM_INTC_BASE),
+        .intc_base              = DAVINCI_ARM_INTC_BASE,
         .intc_type              = DAVINCI_INTC_TYPE_AINTC,
         .intc_irq_prios         = dm355_default_priorities,
         .intc_irq_num           = DAVINCI_N_AINTC_IRQ,
         .timer_info             = &dm355_timer_info,
-        .gpio_base              = IO_ADDRESS(DAVINCI_GPIO_BASE),
+        .gpio_type              = GPIO_TYPE_DAVINCI,
+        .gpio_base              = DAVINCI_GPIO_BASE,
         .gpio_num               = 104,
         .gpio_irq               = IRQ_DM355_GPIOBNK0,
         .serial_dev             = &dm355_serial_device,
         .sram_dma               = 0x00010000,
         .sram_len               = SZ_32K,
+        .reset_device           = &davinci_wdt_device,
 };
 
 void __init dm355_init_asp1(u32 evt_enable, struct snd_platform_data *pdata)