diff options
Diffstat (limited to 'arch/avr32/mach-at32ap/at32ap700x.c')
| -rw-r--r-- | arch/avr32/mach-at32ap/at32ap700x.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c index 813b6844cdf..0c6e02f80a3 100644 --- a/arch/avr32/mach-at32ap/at32ap700x.c +++ b/arch/avr32/mach-at32ap/at32ap700x.c @@ -813,7 +813,7 @@ static struct resource pio4_resource[] = { DEFINE_DEV(pio, 4); DEV_CLK(mck, pio4, pba, 14); -void __init at32_add_system_devices(void) +static int __init system_device_init(void) { platform_device_register(&at32_pm0_device); platform_device_register(&at32_intc0_device); @@ -832,7 +832,10 @@ void __init at32_add_system_devices(void) platform_device_register(&pio2_device); platform_device_register(&pio3_device); platform_device_register(&pio4_device); + + return 0; } +core_initcall(system_device_init); /* -------------------------------------------------------------------- * PSIF @@ -1091,7 +1094,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 +1117,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); @@ -1470,7 +1477,7 @@ at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data, pin_mask = ATMEL_LCDC_PRI_24BIT | ATMEL_LCDC_PRI_CONTROL; /* LCDC on port C */ - portc_mask = (pin_mask & 0xfff80000) >> 19; + portc_mask = pin_mask & 0xfff80000; select_peripheral(PIOC, portc_mask, PERIPH_A, 0); /* LCDC on port D */ |