aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-shmobile/board-genmai.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/arch/arm/mach-shmobile/board-genmai.c b/arch/arm/mach-shmobile/board-genmai.c
index e240980cc227..6c328d63b819 100644
--- a/arch/arm/mach-shmobile/board-genmai.c
+++ b/arch/arm/mach-shmobile/board-genmai.c
@@ -1,8 +1,9 @@
1/* 1/*
2 * Genmai board support 2 * Genmai board support
3 * 3 *
4 * Copyright (C) 2013 Renesas Solutions Corp. 4 * Copyright (C) 2013-2014 Renesas Solutions Corp.
5 * Copyright (C) 2013 Magnus Damm 5 * Copyright (C) 2013 Magnus Damm
6 * Copyright (C) 2014 Cogent Embedded, Inc.
6 * 7 *
7 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
@@ -43,6 +44,17 @@ static const struct resource ether_resources[] __initconst = {
43 DEFINE_RES_IRQ(gic_iid(359)), 44 DEFINE_RES_IRQ(gic_iid(359)),
44}; 45};
45 46
47static const struct platform_device_info ether_info __initconst = {
48 .parent = &platform_bus,
49 .name = "r7s72100-ether",
50 .id = -1,
51 .res = ether_resources,
52 .num_res = ARRAY_SIZE(ether_resources),
53 .data = &ether_pdata,
54 .size_data = sizeof(ether_pdata),
55 .dma_mask = DMA_BIT_MASK(32),
56};
57
46/* RSPI */ 58/* RSPI */
47#define RSPI_RESOURCE(idx, baseaddr, irq) \ 59#define RSPI_RESOURCE(idx, baseaddr, irq) \
48static const struct resource rspi##idx##_resources[] __initconst = { \ 60static const struct resource rspi##idx##_resources[] __initconst = { \
@@ -82,10 +94,7 @@ static void __init genmai_add_standard_devices(void)
82 r7s72100_clock_init(); 94 r7s72100_clock_init();
83 r7s72100_add_dt_devices(); 95 r7s72100_add_dt_devices();
84 96
85 platform_device_register_resndata(&platform_bus, "r7s72100-ether", -1, 97 platform_device_register_full(&ether_info);
86 ether_resources,
87 ARRAY_SIZE(ether_resources),
88 &ether_pdata, sizeof(ether_pdata));
89 98
90 r7s72100_register_rspi(0); 99 r7s72100_register_rspi(0);
91 r7s72100_register_rspi(1); 100 r7s72100_register_rspi(1);