diff options
author | Tony Lindgren <tony@atomide.com> | 2006-04-02 12:46:30 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-04-02 12:46:30 -0400 |
commit | 9b6553cd01ce3ea7a6a532f7b7e62e3535d6b102 (patch) | |
tree | 8b8bf4682ecf602fc35cd98e4ea2e888519b20cb /arch/arm/mach-omap2/devices.c | |
parent | 120db2cba8e40c562e5a4aea44ede2f360a5de75 (diff) |
[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>
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 7181edb8935..def9e5370ed 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -74,6 +74,47 @@ static void omap_init_i2c(void) {} | |||
74 | 74 | ||
75 | #endif | 75 | #endif |
76 | 76 | ||
77 | #if defined(CONFIG_OMAP_STI) | ||
78 | |||
79 | #define OMAP2_STI_BASE IO_ADDRESS(0x48068000) | ||
80 | #define OMAP2_STI_CHANNEL_BASE 0x54000000 | ||
81 | #define OMAP2_STI_IRQ 4 | ||
82 | |||
83 | static struct resource sti_resources[] = { | ||
84 | { | ||
85 | .start = OMAP2_STI_BASE, | ||
86 | .end = OMAP2_STI_BASE + 0x7ff, | ||
87 | .flags = IORESOURCE_MEM, | ||
88 | }, | ||
89 | { | ||
90 | .start = OMAP2_STI_CHANNEL_BASE, | ||
91 | .end = OMAP2_STI_CHANNEL_BASE + SZ_64K - 1, | ||
92 | .flags = IORESOURCE_MEM, | ||
93 | }, | ||
94 | { | ||
95 | .start = OMAP2_STI_IRQ, | ||
96 | .flags = IORESOURCE_IRQ, | ||
97 | } | ||
98 | }; | ||
99 | |||
100 | static struct platform_device sti_device = { | ||
101 | .name = "sti", | ||
102 | .id = -1, | ||
103 | .dev = { | ||
104 | .release = omap_nop_release, | ||
105 | }, | ||
106 | .num_resources = ARRAY_SIZE(sti_resources), | ||
107 | .resource = sti_resources, | ||
108 | }; | ||
109 | |||
110 | static inline void omap_init_sti(void) | ||
111 | { | ||
112 | platform_device_register(&sti_device); | ||
113 | } | ||
114 | #else | ||
115 | static inline void omap_init_sti(void) {} | ||
116 | #endif | ||
117 | |||
77 | /*-------------------------------------------------------------------------*/ | 118 | /*-------------------------------------------------------------------------*/ |
78 | 119 | ||
79 | static int __init omap2_init_devices(void) | 120 | static int __init omap2_init_devices(void) |
@@ -82,6 +123,7 @@ static int __init omap2_init_devices(void) | |||
82 | * in alphabetical order so they're easier to sort through. | 123 | * in alphabetical order so they're easier to sort through. |
83 | */ | 124 | */ |
84 | omap_init_i2c(); | 125 | omap_init_i2c(); |
126 | omap_init_sti(); | ||
85 | 127 | ||
86 | return 0; | 128 | return 0; |
87 | } | 129 | } |