diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/blackfin/mach-bf518/boards/ezbrd.c | 44 | ||||
-rw-r--r-- | arch/blackfin/mach-bf518/boards/tcm-bf518.c | 24 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/cm_bf527.c | 24 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezbrd.c | 24 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 24 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/tll6527m.c | 24 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/cm_bf537e.c | 24 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/cm_bf537u.c | 24 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/minotaur.c | 24 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/pnav10.c | 24 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 24 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/tcm_bf537.c | 24 |
12 files changed, 296 insertions, 12 deletions
diff --git a/arch/blackfin/mach-bf518/boards/ezbrd.c b/arch/blackfin/mach-bf518/boards/ezbrd.c index f95e6096719b..b894c8abe7ec 100644 --- a/arch/blackfin/mach-bf518/boards/ezbrd.c +++ b/arch/blackfin/mach-bf518/boards/ezbrd.c | |||
@@ -87,13 +87,55 @@ static struct platform_device rtc_device = { | |||
87 | #endif | 87 | #endif |
88 | 88 | ||
89 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 89 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
90 | #include <linux/bfin_mac.h> | ||
91 | static const unsigned short bfin_mac_peripherals[] = { | ||
92 | P_MII0_ETxD0, | ||
93 | P_MII0_ETxD1, | ||
94 | P_MII0_ETxEN, | ||
95 | P_MII0_ERxD0, | ||
96 | P_MII0_ERxD1, | ||
97 | P_MII0_TxCLK, | ||
98 | P_MII0_PHYINT, | ||
99 | P_MII0_CRS, | ||
100 | P_MII0_MDC, | ||
101 | P_MII0_MDIO, | ||
102 | 0 | ||
103 | }; | ||
104 | |||
105 | static struct bfin_phydev_platform_data bfin_phydev_data[] = { | ||
106 | { | ||
107 | .addr = 1, | ||
108 | .irq = IRQ_MAC_PHYINT, | ||
109 | }, | ||
110 | { | ||
111 | .addr = 2, | ||
112 | .irq = IRQ_MAC_PHYINT, | ||
113 | }, | ||
114 | { | ||
115 | .addr = 3, | ||
116 | .irq = IRQ_MAC_PHYINT, | ||
117 | }, | ||
118 | }; | ||
119 | |||
120 | static struct bfin_mii_bus_platform_data bfin_mii_bus_data = { | ||
121 | .phydev_number = 3, | ||
122 | .phydev_data = bfin_phydev_data, | ||
123 | .phy_mode = PHY_INTERFACE_MODE_MII, | ||
124 | .mac_peripherals = bfin_mac_peripherals, | ||
125 | }; | ||
126 | |||
90 | static struct platform_device bfin_mii_bus = { | 127 | static struct platform_device bfin_mii_bus = { |
91 | .name = "bfin_mii_bus", | 128 | .name = "bfin_mii_bus", |
129 | .dev = { | ||
130 | .platform_data = &bfin_mii_bus_data, | ||
131 | } | ||
92 | }; | 132 | }; |
93 | 133 | ||
94 | static struct platform_device bfin_mac_device = { | 134 | static struct platform_device bfin_mac_device = { |
95 | .name = "bfin_mac", | 135 | .name = "bfin_mac", |
96 | .dev.platform_data = &bfin_mii_bus, | 136 | .dev = { |
137 | .platform_data = &bfin_mii_bus, | ||
138 | } | ||
97 | }; | 139 | }; |
98 | 140 | ||
99 | #if defined(CONFIG_NET_DSA_KSZ8893M) || defined(CONFIG_NET_DSA_KSZ8893M_MODULE) | 141 | #if defined(CONFIG_NET_DSA_KSZ8893M) || defined(CONFIG_NET_DSA_KSZ8893M_MODULE) |
diff --git a/arch/blackfin/mach-bf518/boards/tcm-bf518.c b/arch/blackfin/mach-bf518/boards/tcm-bf518.c index bead810a6546..e6ce1d7c523a 100644 --- a/arch/blackfin/mach-bf518/boards/tcm-bf518.c +++ b/arch/blackfin/mach-bf518/boards/tcm-bf518.c | |||
@@ -81,13 +81,35 @@ static struct platform_device rtc_device = { | |||
81 | #endif | 81 | #endif |
82 | 82 | ||
83 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 83 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
84 | #include <linux/bfin_mac.h> | ||
85 | static const unsigned short bfin_mac_peripherals[] = P_MII0; | ||
86 | |||
87 | static struct bfin_phydev_platform_data bfin_phydev_data[] = { | ||
88 | { | ||
89 | .addr = 1, | ||
90 | .irq = IRQ_MAC_PHYINT, | ||
91 | }, | ||
92 | }; | ||
93 | |||
94 | static struct bfin_mii_bus_platform_data bfin_mii_bus_data = { | ||
95 | .phydev_number = 1, | ||
96 | .phydev_data = bfin_phydev_data, | ||
97 | .phy_mode = PHY_INTERFACE_MODE_MII, | ||
98 | .mac_peripherals = bfin_mac_peripherals, | ||
99 | }; | ||
100 | |||
84 | static struct platform_device bfin_mii_bus = { | 101 | static struct platform_device bfin_mii_bus = { |
85 | .name = "bfin_mii_bus", | 102 | .name = "bfin_mii_bus", |
103 | .dev = { | ||
104 | .platform_data = &bfin_mii_bus_data, | ||
105 | } | ||
86 | }; | 106 | }; |
87 | 107 | ||
88 | static struct platform_device bfin_mac_device = { | 108 | static struct platform_device bfin_mac_device = { |
89 | .name = "bfin_mac", | 109 | .name = "bfin_mac", |
90 | .dev.platform_data = &bfin_mii_bus, | 110 | .dev = { |
111 | .platform_data = &bfin_mii_bus, | ||
112 | } | ||
91 | }; | 113 | }; |
92 | #endif | 114 | #endif |
93 | 115 | ||
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c index 38037c7e125a..2c31af7a320a 100644 --- a/arch/blackfin/mach-bf527/boards/cm_bf527.c +++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c | |||
@@ -273,13 +273,35 @@ static struct platform_device dm9000_device = { | |||
273 | #endif | 273 | #endif |
274 | 274 | ||
275 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 275 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
276 | #include <linux/bfin_mac.h> | ||
277 | static const unsigned short bfin_mac_peripherals[] = P_RMII0; | ||
278 | |||
279 | static struct bfin_phydev_platform_data bfin_phydev_data[] = { | ||
280 | { | ||
281 | .addr = 1, | ||
282 | .irq = IRQ_MAC_PHYINT, | ||
283 | }, | ||
284 | }; | ||
285 | |||
286 | static struct bfin_mii_bus_platform_data bfin_mii_bus_data = { | ||
287 | .phydev_number = 1, | ||
288 | .phydev_data = bfin_phydev_data, | ||
289 | .phy_mode = PHY_INTERFACE_MODE_RMII, | ||
290 | .mac_peripherals = bfin_mac_peripherals, | ||
291 | }; | ||
292 | |||
276 | static struct platform_device bfin_mii_bus = { | 293 | static struct platform_device bfin_mii_bus = { |
277 | .name = "bfin_mii_bus", | 294 | .name = "bfin_mii_bus", |
295 | .dev = { | ||
296 | .platform_data = &bfin_mii_bus_data, | ||
297 | } | ||
278 | }; | 298 | }; |
279 | 299 | ||
280 | static struct platform_device bfin_mac_device = { | 300 | static struct platform_device bfin_mac_device = { |
281 | .name = "bfin_mac", | 301 | .name = "bfin_mac", |
282 | .dev.platform_data = &bfin_mii_bus, | 302 | .dev = { |
303 | .platform_data = &bfin_mii_bus, | ||
304 | } | ||
283 | }; | 305 | }; |
284 | #endif | 306 | #endif |
285 | 307 | ||
diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c index 6cc64a1e78b9..9a736a850c5c 100644 --- a/arch/blackfin/mach-bf527/boards/ezbrd.c +++ b/arch/blackfin/mach-bf527/boards/ezbrd.c | |||
@@ -193,13 +193,35 @@ static struct platform_device rtc_device = { | |||
193 | 193 | ||
194 | 194 | ||
195 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 195 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
196 | #include <linux/bfin_mac.h> | ||
197 | static const unsigned short bfin_mac_peripherals[] = P_RMII0; | ||
198 | |||
199 | static struct bfin_phydev_platform_data bfin_phydev_data[] = { | ||
200 | { | ||
201 | .addr = 1, | ||
202 | .irq = IRQ_MAC_PHYINT, | ||
203 | }, | ||
204 | }; | ||
205 | |||
206 | static struct bfin_mii_bus_platform_data bfin_mii_bus_data = { | ||
207 | .phydev_number = 1, | ||
208 | .phydev_data = bfin_phydev_data, | ||
209 | .phy_mode = PHY_INTERFACE_MODE_RMII, | ||
210 | .mac_peripherals = bfin_mac_peripherals, | ||
211 | }; | ||
212 | |||
196 | static struct platform_device bfin_mii_bus = { | 213 | static struct platform_device bfin_mii_bus = { |
197 | .name = "bfin_mii_bus", | 214 | .name = "bfin_mii_bus", |
215 | .dev = { | ||
216 | .platform_data = &bfin_mii_bus_data, | ||
217 | } | ||
198 | }; | 218 | }; |
199 | 219 | ||
200 | static struct platform_device bfin_mac_device = { | 220 | static struct platform_device bfin_mac_device = { |
201 | .name = "bfin_mac", | 221 | .name = "bfin_mac", |
202 | .dev.platform_data = &bfin_mii_bus, | 222 | .dev = { |
223 | .platform_data = &bfin_mii_bus, | ||
224 | } | ||
203 | }; | 225 | }; |
204 | #endif | 226 | #endif |
205 | 227 | ||
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index df82723fb504..9222bc00bbd3 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -366,13 +366,35 @@ static struct platform_device dm9000_device = { | |||
366 | #endif | 366 | #endif |
367 | 367 | ||
368 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 368 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
369 | #include <linux/bfin_mac.h> | ||
370 | static const unsigned short bfin_mac_peripherals[] = P_RMII0; | ||
371 | |||
372 | static struct bfin_phydev_platform_data bfin_phydev_data[] = { | ||
373 | { | ||
374 | .addr = 1, | ||
375 | .irq = IRQ_MAC_PHYINT, | ||
376 | }, | ||
377 | }; | ||
378 | |||
379 | static struct bfin_mii_bus_platform_data bfin_mii_bus_data = { | ||
380 | .phydev_number = 1, | ||
381 | .phydev_data = bfin_phydev_data, | ||
382 | .phy_mode = PHY_INTERFACE_MODE_RMII, | ||
383 | .mac_peripherals = bfin_mac_peripherals, | ||
384 | }; | ||
385 | |||
369 | static struct platform_device bfin_mii_bus = { | 386 | static struct platform_device bfin_mii_bus = { |
370 | .name = "bfin_mii_bus", | 387 | .name = "bfin_mii_bus", |
388 | .dev = { | ||
389 | .platform_data = &bfin_mii_bus_data, | ||
390 | } | ||
371 | }; | 391 | }; |
372 | 392 | ||
373 | static struct platform_device bfin_mac_device = { | 393 | static struct platform_device bfin_mac_device = { |
374 | .name = "bfin_mac", | 394 | .name = "bfin_mac", |
375 | .dev.platform_data = &bfin_mii_bus, | 395 | .dev = { |
396 | .platform_data = &bfin_mii_bus, | ||
397 | } | ||
376 | }; | 398 | }; |
377 | #endif | 399 | #endif |
378 | 400 | ||
diff --git a/arch/blackfin/mach-bf527/boards/tll6527m.c b/arch/blackfin/mach-bf527/boards/tll6527m.c index ae4130e97c01..9ec575729e2c 100644 --- a/arch/blackfin/mach-bf527/boards/tll6527m.c +++ b/arch/blackfin/mach-bf527/boards/tll6527m.c | |||
@@ -257,13 +257,35 @@ static struct platform_device rtc_device = { | |||
257 | #endif | 257 | #endif |
258 | 258 | ||
259 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 259 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
260 | #include <linux/bfin_mac.h> | ||
261 | static const unsigned short bfin_mac_peripherals[] = P_RMII0; | ||
262 | |||
263 | static struct bfin_phydev_platform_data bfin_phydev_data[] = { | ||
264 | { | ||
265 | .addr = 1, | ||
266 | .irq = IRQ_MAC_PHYINT, | ||
267 | }, | ||
268 | }; | ||
269 | |||
270 | static struct bfin_mii_bus_platform_data bfin_mii_bus_data = { | ||
271 | .phydev_number = 1, | ||
272 | .phydev_data = bfin_phydev_data, | ||
273 | .phy_mode = PHY_INTERFACE_MODE_RMII, | ||
274 | .mac_peripherals = bfin_mac_peripherals, | ||
275 | }; | ||
276 | |||
260 | static struct platform_device bfin_mii_bus = { | 277 | static struct platform_device bfin_mii_bus = { |
261 | .name = "bfin_mii_bus", | 278 | .name = "bfin_mii_bus", |
279 | .dev = { | ||
280 | .platform_data = &bfin_mii_bus_data, | ||
281 | } | ||
262 | }; | 282 | }; |
263 | 283 | ||
264 | static struct platform_device bfin_mac_device = { | 284 | static struct platform_device bfin_mac_device = { |
265 | .name = "bfin_mac", | 285 | .name = "bfin_mac", |
266 | .dev.platform_data = &bfin_mii_bus, | 286 | .dev = { |
287 | .platform_data = &bfin_mii_bus, | ||
288 | } | ||
267 | }; | 289 | }; |
268 | #endif | 290 | #endif |
269 | 291 | ||
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c b/arch/blackfin/mach-bf537/boards/cm_bf537e.c index e2e7be40ef44..836698c4ee54 100644 --- a/arch/blackfin/mach-bf537/boards/cm_bf537e.c +++ b/arch/blackfin/mach-bf537/boards/cm_bf537e.c | |||
@@ -597,13 +597,35 @@ static struct platform_device bfin_sport1_uart_device = { | |||
597 | #endif | 597 | #endif |
598 | 598 | ||
599 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 599 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
600 | #include <linux/bfin_mac.h> | ||
601 | static const unsigned short bfin_mac_peripherals[] = P_MII0; | ||
602 | |||
603 | static struct bfin_phydev_platform_data bfin_phydev_data[] = { | ||
604 | { | ||
605 | .addr = 1, | ||
606 | .irq = IRQ_MAC_PHYINT, | ||
607 | }, | ||
608 | }; | ||
609 | |||
610 | static struct bfin_mii_bus_platform_data bfin_mii_bus_data = { | ||
611 | .phydev_number = 1, | ||
612 | .phydev_data = bfin_phydev_data, | ||
613 | .phy_mode = PHY_INTERFACE_MODE_MII, | ||
614 | .mac_peripherals = bfin_mac_peripherals, | ||
615 | }; | ||
616 | |||
600 | static struct platform_device bfin_mii_bus = { | 617 | static struct platform_device bfin_mii_bus = { |
601 | .name = "bfin_mii_bus", | 618 | .name = "bfin_mii_bus", |
619 | .dev = { | ||
620 | .platform_data = &bfin_mii_bus_data, | ||
621 | } | ||
602 | }; | 622 | }; |
603 | 623 | ||
604 | static struct platform_device bfin_mac_device = { | 624 | static struct platform_device bfin_mac_device = { |
605 | .name = "bfin_mac", | 625 | .name = "bfin_mac", |
606 | .dev.platform_data = &bfin_mii_bus, | 626 | .dev = { |
627 | .platform_data = &bfin_mii_bus, | ||
628 | } | ||
607 | }; | 629 | }; |
608 | #endif | 630 | #endif |
609 | 631 | ||
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c b/arch/blackfin/mach-bf537/boards/cm_bf537u.c index 752c833f7ca8..2a85670273cb 100644 --- a/arch/blackfin/mach-bf537/boards/cm_bf537u.c +++ b/arch/blackfin/mach-bf537/boards/cm_bf537u.c | |||
@@ -562,13 +562,35 @@ static struct platform_device bfin_sport1_uart_device = { | |||
562 | #endif | 562 | #endif |
563 | 563 | ||
564 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 564 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
565 | #include <linux/bfin_mac.h> | ||
566 | static const unsigned short bfin_mac_peripherals[] = P_MII0; | ||
567 | |||
568 | static struct bfin_phydev_platform_data bfin_phydev_data[] = { | ||
569 | { | ||
570 | .addr = 1, | ||
571 | .irq = IRQ_MAC_PHYINT, | ||
572 | }, | ||
573 | }; | ||
574 | |||
575 | static struct bfin_mii_bus_platform_data bfin_mii_bus_data = { | ||
576 | .phydev_number = 1, | ||
577 | .phydev_data = bfin_phydev_data, | ||
578 | .phy_mode = PHY_INTERFACE_MODE_MII, | ||
579 | .mac_peripherals = bfin_mac_peripherals, | ||
580 | }; | ||
581 | |||
565 | static struct platform_device bfin_mii_bus = { | 582 | static struct platform_device bfin_mii_bus = { |
566 | .name = "bfin_mii_bus", | 583 | .name = "bfin_mii_bus", |
584 | .dev = { | ||
585 | .platform_data = &bfin_mii_bus_data, | ||
586 | } | ||
567 | }; | 587 | }; |
568 | 588 | ||
569 | static struct platform_device bfin_mac_device = { | 589 | static struct platform_device bfin_mac_device = { |
570 | .name = "bfin_mac", | 590 | .name = "bfin_mac", |
571 | .dev.platform_data = &bfin_mii_bus, | 591 | .dev = { |
592 | .platform_data = &bfin_mii_bus, | ||
593 | } | ||
572 | }; | 594 | }; |
573 | #endif | 595 | #endif |
574 | 596 | ||
diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c b/arch/blackfin/mach-bf537/boards/minotaur.c index 05d45994480e..49800518412c 100644 --- a/arch/blackfin/mach-bf537/boards/minotaur.c +++ b/arch/blackfin/mach-bf537/boards/minotaur.c | |||
@@ -68,13 +68,35 @@ static struct platform_device rtc_device = { | |||
68 | #endif | 68 | #endif |
69 | 69 | ||
70 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 70 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
71 | #include <linux/bfin_mac.h> | ||
72 | static const unsigned short bfin_mac_peripherals[] = P_MII0; | ||
73 | |||
74 | static struct bfin_phydev_platform_data bfin_phydev_data[] = { | ||
75 | { | ||
76 | .addr = 1, | ||
77 | .irq = IRQ_MAC_PHYINT, | ||
78 | }, | ||
79 | }; | ||
80 | |||
81 | static struct bfin_mii_bus_platform_data bfin_mii_bus_data = { | ||
82 | .phydev_number = 1, | ||
83 | .phydev_data = bfin_phydev_data, | ||
84 | .phy_mode = PHY_INTERFACE_MODE_MII, | ||
85 | .mac_peripherals = bfin_mac_peripherals, | ||
86 | }; | ||
87 | |||
71 | static struct platform_device bfin_mii_bus = { | 88 | static struct platform_device bfin_mii_bus = { |
72 | .name = "bfin_mii_bus", | 89 | .name = "bfin_mii_bus", |
90 | .dev = { | ||
91 | .platform_data = &bfin_mii_bus_data, | ||
92 | } | ||
73 | }; | 93 | }; |
74 | 94 | ||
75 | static struct platform_device bfin_mac_device = { | 95 | static struct platform_device bfin_mac_device = { |
76 | .name = "bfin_mac", | 96 | .name = "bfin_mac", |
77 | .dev.platform_data = &bfin_mii_bus, | 97 | .dev = { |
98 | .platform_data = &bfin_mii_bus, | ||
99 | } | ||
78 | }; | 100 | }; |
79 | #endif | 101 | #endif |
80 | 102 | ||
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c index 6b03808800a6..b95807894e25 100644 --- a/arch/blackfin/mach-bf537/boards/pnav10.c +++ b/arch/blackfin/mach-bf537/boards/pnav10.c | |||
@@ -99,13 +99,35 @@ static struct platform_device smc91x_device = { | |||
99 | #endif | 99 | #endif |
100 | 100 | ||
101 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 101 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
102 | #include <linux/bfin_mac.h> | ||
103 | static const unsigned short bfin_mac_peripherals[] = P_RMII0; | ||
104 | |||
105 | static struct bfin_phydev_platform_data bfin_phydev_data[] = { | ||
106 | { | ||
107 | .addr = 1, | ||
108 | .irq = IRQ_MAC_PHYINT, | ||
109 | }, | ||
110 | }; | ||
111 | |||
112 | static struct bfin_mii_bus_platform_data bfin_mii_bus_data = { | ||
113 | .phydev_number = 1, | ||
114 | .phydev_data = bfin_phydev_data, | ||
115 | .phy_mode = PHY_INTERFACE_MODE_RMII, | ||
116 | .mac_peripherals = bfin_mac_peripherals, | ||
117 | }; | ||
118 | |||
102 | static struct platform_device bfin_mii_bus = { | 119 | static struct platform_device bfin_mii_bus = { |
103 | .name = "bfin_mii_bus", | 120 | .name = "bfin_mii_bus", |
121 | .dev = { | ||
122 | .platform_data = &bfin_mii_bus_data, | ||
123 | } | ||
104 | }; | 124 | }; |
105 | 125 | ||
106 | static struct platform_device bfin_mac_device = { | 126 | static struct platform_device bfin_mac_device = { |
107 | .name = "bfin_mac", | 127 | .name = "bfin_mac", |
108 | .dev.platform_data = &bfin_mii_bus, | 128 | .dev = { |
129 | .platform_data = &bfin_mii_bus, | ||
130 | } | ||
109 | }; | 131 | }; |
110 | #endif | 132 | #endif |
111 | 133 | ||
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index cd2c797c8c9f..3aa344ce8e52 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -327,13 +327,35 @@ static struct platform_device bfin_can_device = { | |||
327 | #endif | 327 | #endif |
328 | 328 | ||
329 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 329 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
330 | #include <linux/bfin_mac.h> | ||
331 | static const unsigned short bfin_mac_peripherals[] = P_MII0; | ||
332 | |||
333 | static struct bfin_phydev_platform_data bfin_phydev_data[] = { | ||
334 | { | ||
335 | .addr = 1, | ||
336 | .irq = PHY_POLL, /* IRQ_MAC_PHYINT */ | ||
337 | }, | ||
338 | }; | ||
339 | |||
340 | static struct bfin_mii_bus_platform_data bfin_mii_bus_data = { | ||
341 | .phydev_number = 1, | ||
342 | .phydev_data = bfin_phydev_data, | ||
343 | .phy_mode = PHY_INTERFACE_MODE_MII, | ||
344 | .mac_peripherals = bfin_mac_peripherals, | ||
345 | }; | ||
346 | |||
330 | static struct platform_device bfin_mii_bus = { | 347 | static struct platform_device bfin_mii_bus = { |
331 | .name = "bfin_mii_bus", | 348 | .name = "bfin_mii_bus", |
349 | .dev = { | ||
350 | .platform_data = &bfin_mii_bus_data, | ||
351 | } | ||
332 | }; | 352 | }; |
333 | 353 | ||
334 | static struct platform_device bfin_mac_device = { | 354 | static struct platform_device bfin_mac_device = { |
335 | .name = "bfin_mac", | 355 | .name = "bfin_mac", |
336 | .dev.platform_data = &bfin_mii_bus, | 356 | .dev = { |
357 | .platform_data = &bfin_mii_bus, | ||
358 | } | ||
337 | }; | 359 | }; |
338 | #endif | 360 | #endif |
339 | 361 | ||
diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c index a4d62b5fc7ba..31498add1a42 100644 --- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c +++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c | |||
@@ -564,13 +564,35 @@ static struct platform_device bfin_sport1_uart_device = { | |||
564 | #endif | 564 | #endif |
565 | 565 | ||
566 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 566 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
567 | #include <linux/bfin_mac.h> | ||
568 | static const unsigned short bfin_mac_peripherals[] = P_MII0; | ||
569 | |||
570 | static struct bfin_phydev_platform_data bfin_phydev_data[] = { | ||
571 | { | ||
572 | .addr = 1, | ||
573 | .irq = IRQ_MAC_PHYINT, | ||
574 | }, | ||
575 | }; | ||
576 | |||
577 | static struct bfin_mii_bus_platform_data bfin_mii_bus_data = { | ||
578 | .phydev_number = 1, | ||
579 | .phydev_data = bfin_phydev_data, | ||
580 | .phy_mode = PHY_INTERFACE_MODE_MII, | ||
581 | .mac_peripherals = bfin_mac_peripherals, | ||
582 | }; | ||
583 | |||
567 | static struct platform_device bfin_mii_bus = { | 584 | static struct platform_device bfin_mii_bus = { |
568 | .name = "bfin_mii_bus", | 585 | .name = "bfin_mii_bus", |
586 | .dev = { | ||
587 | .platform_data = &bfin_mii_bus_data, | ||
588 | } | ||
569 | }; | 589 | }; |
570 | 590 | ||
571 | static struct platform_device bfin_mac_device = { | 591 | static struct platform_device bfin_mac_device = { |
572 | .name = "bfin_mac", | 592 | .name = "bfin_mac", |
573 | .dev.platform_data = &bfin_mii_bus, | 593 | .dev = { |
594 | .platform_data = &bfin_mii_bus, | ||
595 | } | ||
574 | }; | 596 | }; |
575 | #endif | 597 | #endif |
576 | 598 | ||