diff options
Diffstat (limited to 'arch/arm/mach-shmobile/setup-r8a7778.c')
-rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7778.c | 50 |
1 files changed, 1 insertions, 49 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c index 6a2657ebd197..468ee6551184 100644 --- a/arch/arm/mach-shmobile/setup-r8a7778.c +++ b/arch/arm/mach-shmobile/setup-r8a7778.c | |||
@@ -174,20 +174,6 @@ static struct platform_device_info hci##_info __initdata = { \ | |||
174 | USB_PLATFORM_INFO(ehci); | 174 | USB_PLATFORM_INFO(ehci); |
175 | USB_PLATFORM_INFO(ohci); | 175 | USB_PLATFORM_INFO(ohci); |
176 | 176 | ||
177 | /* Ether */ | ||
178 | static struct resource ether_resources[] __initdata = { | ||
179 | DEFINE_RES_MEM(0xfde00000, 0x400), | ||
180 | DEFINE_RES_IRQ(gic_iid(0x89)), | ||
181 | }; | ||
182 | |||
183 | void __init r8a7778_add_ether_device(struct sh_eth_plat_data *pdata) | ||
184 | { | ||
185 | platform_device_register_resndata(&platform_bus, "r8a777x-ether", -1, | ||
186 | ether_resources, | ||
187 | ARRAY_SIZE(ether_resources), | ||
188 | pdata, sizeof(*pdata)); | ||
189 | } | ||
190 | |||
191 | /* PFC/GPIO */ | 177 | /* PFC/GPIO */ |
192 | static struct resource pfc_resources[] __initdata = { | 178 | static struct resource pfc_resources[] __initdata = { |
193 | DEFINE_RES_MEM(0xfffc0000, 0x118), | 179 | DEFINE_RES_MEM(0xfffc0000, 0x118), |
@@ -272,7 +258,7 @@ static struct resource hspi_resources[] __initdata = { | |||
272 | DEFINE_RES_IRQ(gic_iid(0x75)), | 258 | DEFINE_RES_IRQ(gic_iid(0x75)), |
273 | }; | 259 | }; |
274 | 260 | ||
275 | void __init r8a7778_register_hspi(int id) | 261 | static void __init r8a7778_register_hspi(int id) |
276 | { | 262 | { |
277 | BUG_ON(id < 0 || id > 2); | 263 | BUG_ON(id < 0 || id > 2); |
278 | 264 | ||
@@ -281,40 +267,6 @@ void __init r8a7778_register_hspi(int id) | |||
281 | hspi_resources + (2 * id), 2); | 267 | hspi_resources + (2 * id), 2); |
282 | } | 268 | } |
283 | 269 | ||
284 | /* VIN */ | ||
285 | #define R8A7778_VIN(idx) \ | ||
286 | static struct resource vin##idx##_resources[] __initdata = { \ | ||
287 | DEFINE_RES_MEM(0xffc50000 + 0x1000 * (idx), 0x1000), \ | ||
288 | DEFINE_RES_IRQ(gic_iid(0x5a)), \ | ||
289 | }; \ | ||
290 | \ | ||
291 | static struct platform_device_info vin##idx##_info __initdata = { \ | ||
292 | .parent = &platform_bus, \ | ||
293 | .name = "r8a7778-vin", \ | ||
294 | .id = idx, \ | ||
295 | .res = vin##idx##_resources, \ | ||
296 | .num_res = ARRAY_SIZE(vin##idx##_resources), \ | ||
297 | .dma_mask = DMA_BIT_MASK(32), \ | ||
298 | } | ||
299 | |||
300 | R8A7778_VIN(0); | ||
301 | R8A7778_VIN(1); | ||
302 | |||
303 | static struct platform_device_info *vin_info_table[] __initdata = { | ||
304 | &vin0_info, | ||
305 | &vin1_info, | ||
306 | }; | ||
307 | |||
308 | void __init r8a7778_add_vin_device(int id, struct rcar_vin_platform_data *pdata) | ||
309 | { | ||
310 | BUG_ON(id < 0 || id > 1); | ||
311 | |||
312 | vin_info_table[id]->data = pdata; | ||
313 | vin_info_table[id]->size_data = sizeof(*pdata); | ||
314 | |||
315 | platform_device_register_full(vin_info_table[id]); | ||
316 | } | ||
317 | |||
318 | void __init r8a7778_add_dt_devices(void) | 270 | void __init r8a7778_add_dt_devices(void) |
319 | { | 271 | { |
320 | int i; | 272 | int i; |