[ARM] 3433/1: ARM: OMAP: 8/8 Update board files

Patch from Tony Lindgren

This patch syncs OMAP board support with linux-omap tree.
The highlights of the patch are:
- Add support for Nokia 770 by Juha Yrjola
- Add support for Samsung Apollon by Kyungmin Park
- Add support for Amstrad E3 videophone by Jonathan McDowell
- Remove board-netstar.c board support as requested by Ladislav Michl
- Do platform_device registration in board files by Komal Shah et al.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 40 insertions, 0 deletions

diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index ecbc47514adc..876c38da14f7 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -99,6 +99,45 @@ static void omap_init_rtc(void)
 static inline void omap_init_rtc(void) {}
 #endif
 
+#if defined(CONFIG_OMAP_STI)
+
+#define OMAP1_STI_BASE          IO_ADDRESS(0xfffea000)
+#define OMAP1_STI_CHANNEL_BASE  (OMAP1_STI_BASE + 0x400)
+
+static struct resource sti_resources[] = {
+        {
+                .start          = OMAP1_STI_BASE,
+                .end            = OMAP1_STI_BASE + SZ_1K - 1,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = OMAP1_STI_CHANNEL_BASE,
+                .end            = OMAP1_STI_CHANNEL_BASE + SZ_1K - 1,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = INT_1610_STI,
+                .flags          = IORESOURCE_IRQ,
+        }
+};
+
+static struct platform_device sti_device = {
+        .name           = "sti",
+        .id             = -1,
+        .dev = {
+                .release        = omap_nop_release,
+        },
+        .num_resources  = ARRAY_SIZE(sti_resources),
+        .resource       = sti_resources,
+};
+
+static inline void omap_init_sti(void)
+{
+        platform_device_register(&sti_device);
+}
+#else
+static inline void omap_init_sti(void) {}
+#endif
 
 /*-------------------------------------------------------------------------*/
 
@@ -129,6 +168,7 @@ static int __init omap1_init_devices(void)
          */
         omap_init_irda();
         omap_init_rtc();
+        omap_init_sti();
 
         return 0;
 }