diff options
author | Tony Lindgren <tony@atomide.com> | 2012-05-09 12:59:25 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-05-09 17:33:18 -0400 |
commit | 49b1a616a77d02b2b0034e0a5ad4bc2e565f2c58 (patch) | |
tree | 9c50704373f5c24d166220a23329b3d5bbe4ebf1 /arch/arm/plat-omap/devices.c | |
parent | fcc76a85061d4dbc0accabe252c8f3496e72efe1 (diff) |
ARM: OMAP1: Move omap_init_uwire to mach-omap1
This hardware exists on omap1 only and there's no need to keep it
in plat-omap/devices.c. No functional changes.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/devices.c')
-rw-r--r-- | arch/arm/plat-omap/devices.c | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 09b07d252892..16c9ebed8b66 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c | |||
@@ -109,50 +109,6 @@ static void omap_init_rng(void) | |||
109 | static inline void omap_init_rng(void) {} | 109 | static inline void omap_init_rng(void) {} |
110 | #endif | 110 | #endif |
111 | 111 | ||
112 | /*-------------------------------------------------------------------------*/ | ||
113 | |||
114 | /* Numbering for the SPI-capable controllers when used for SPI: | ||
115 | * spi = 1 | ||
116 | * uwire = 2 | ||
117 | * mmc1..2 = 3..4 | ||
118 | * mcbsp1..3 = 5..7 | ||
119 | */ | ||
120 | |||
121 | #if defined(CONFIG_SPI_OMAP_UWIRE) || defined(CONFIG_SPI_OMAP_UWIRE_MODULE) | ||
122 | |||
123 | #define OMAP_UWIRE_BASE 0xfffb3000 | ||
124 | |||
125 | static struct resource uwire_resources[] = { | ||
126 | { | ||
127 | .start = OMAP_UWIRE_BASE, | ||
128 | .end = OMAP_UWIRE_BASE + 0x20, | ||
129 | .flags = IORESOURCE_MEM, | ||
130 | }, | ||
131 | }; | ||
132 | |||
133 | static struct platform_device omap_uwire_device = { | ||
134 | .name = "omap_uwire", | ||
135 | .id = -1, | ||
136 | .num_resources = ARRAY_SIZE(uwire_resources), | ||
137 | .resource = uwire_resources, | ||
138 | }; | ||
139 | |||
140 | static void omap_init_uwire(void) | ||
141 | { | ||
142 | /* FIXME define and use a boot tag; not all boards will be hooking | ||
143 | * up devices to the microwire controller, and multi-board configs | ||
144 | * mean that CONFIG_SPI_OMAP_UWIRE may be configured anyway... | ||
145 | */ | ||
146 | |||
147 | /* board-specific code must configure chipselects (only a few | ||
148 | * are normally used) and SCLK/SDI/SDO (each has two choices). | ||
149 | */ | ||
150 | (void) platform_device_register(&omap_uwire_device); | ||
151 | } | ||
152 | #else | ||
153 | static inline void omap_init_uwire(void) {} | ||
154 | #endif | ||
155 | |||
156 | #if defined(CONFIG_TIDSPBRIDGE) || defined(CONFIG_TIDSPBRIDGE_MODULE) | 112 | #if defined(CONFIG_TIDSPBRIDGE) || defined(CONFIG_TIDSPBRIDGE_MODULE) |
157 | 113 | ||
158 | static phys_addr_t omap_dsp_phys_mempool_base; | 114 | static phys_addr_t omap_dsp_phys_mempool_base; |
@@ -208,7 +164,6 @@ static int __init omap_init_devices(void) | |||
208 | * in alphabetical order so they're easier to sort through. | 164 | * in alphabetical order so they're easier to sort through. |
209 | */ | 165 | */ |
210 | omap_init_rng(); | 166 | omap_init_rng(); |
211 | omap_init_uwire(); | ||
212 | return 0; | 167 | return 0; |
213 | } | 168 | } |
214 | arch_initcall(omap_init_devices); | 169 | arch_initcall(omap_init_devices); |