]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
avr32: Fix MIMC200 board use of SPD network pins
authorMark Jackson <mpfj@mimc.co.uk>
Mon, 13 Oct 2008 10:46:27 +0000 (10:46 +0000)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Mon, 13 Oct 2008 14:36:11 +0000 (16:36 +0200)
The MIMC200 board uses the SPD output pin from the Ethernet MACs for
other purposes.

One of these is as a board-reset, so I've had to #define off the SPD
output pin declaration.

This is probably not the best way of achieving this, but works in the
current framework.

Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
arch/avr32/mach-at32ap/at32ap700x.c

index 813b6844cdf67a1ec485ccc4f3839baa42c2682d..caec25a2eec62a34041ebee39ac5e45641c85484 100644 (file)
@@ -1091,7 +1091,9 @@ at32_add_device_eth(unsigned int id, struct eth_platform_data *data)
                        pin_mask |= (1 << 11);  /* RXD2 */
                        pin_mask |= (1 << 12);  /* RXD3 */
                        pin_mask |= (1 << 14);  /* RXCK */
+#ifndef CONFIG_BOARD_MIMC200
                        pin_mask |= (1 << 18);  /* SPD  */
+#endif
                }
 
                select_peripheral(PIOC, pin_mask, PERIPH_A, 0);
@@ -1112,8 +1114,10 @@ at32_add_device_eth(unsigned int id, struct eth_platform_data *data)
                pin_mask |= (1 << 3);   /* MDC  */
                pin_mask |= (1 << 2);   /* MDIO */
 
+#ifndef CONFIG_BOARD_MIMC200
                if (!data->is_rmii)
                        pin_mask |= (1 << 15);  /* SPD  */
+#endif
 
                select_peripheral(PIOD, pin_mask, PERIPH_B, 0);