diff options
| -rw-r--r-- | arch/avr32/boards/atngw100/setup.c | 2 | ||||
| -rw-r--r-- | arch/avr32/boards/atstk1000/atstk1002.c | 2 | ||||
| -rw-r--r-- | arch/avr32/boards/atstk1000/atstk1003.c | 2 | ||||
| -rw-r--r-- | arch/avr32/boards/atstk1000/atstk1004.c | 2 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/at32ap700x.c | 5 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/include/mach/board.h | 10 |
6 files changed, 12 insertions, 11 deletions
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c index 6c54580a66d..259ceee02b6 100644 --- a/arch/avr32/boards/atngw100/setup.c +++ b/arch/avr32/boards/atngw100/setup.c @@ -172,8 +172,6 @@ static int __init atngw100_init(void) * reserve any pins for it. */ - at32_add_system_devices(); - at32_add_device_usart(0); set_hw_addr(at32_add_device_eth(0, ð_data[0])); diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c index 29e5b51a7fd..5c5cdf3b464 100644 --- a/arch/avr32/boards/atstk1000/atstk1002.c +++ b/arch/avr32/boards/atstk1000/atstk1002.c @@ -305,8 +305,6 @@ static int __init atstk1002_init(void) at32_reserve_pin(GPIO_PIN_PE(15)); /* DATA[31] */ at32_reserve_pin(GPIO_PIN_PE(26)); /* SDCS */ - at32_add_system_devices(); - #ifdef CONFIG_BOARD_ATSTK1006 smc_set_timing(&nand_config, &nand_timing); smc_set_configuration(3, &nand_config); diff --git a/arch/avr32/boards/atstk1000/atstk1003.c b/arch/avr32/boards/atstk1000/atstk1003.c index be089d7f37e..134b566630b 100644 --- a/arch/avr32/boards/atstk1000/atstk1003.c +++ b/arch/avr32/boards/atstk1000/atstk1003.c @@ -149,8 +149,6 @@ static int __init atstk1003_init(void) at32_reserve_pin(GPIO_PIN_PE(15)); /* DATA[31] */ at32_reserve_pin(GPIO_PIN_PE(26)); /* SDCS */ - at32_add_system_devices(); - #ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM at32_add_device_usart(1); #else diff --git a/arch/avr32/boards/atstk1000/atstk1004.c b/arch/avr32/boards/atstk1000/atstk1004.c index 248ef237c16..cb32eb844aa 100644 --- a/arch/avr32/boards/atstk1000/atstk1004.c +++ b/arch/avr32/boards/atstk1000/atstk1004.c @@ -132,8 +132,6 @@ void __init setup_board(void) static int __init atstk1004_init(void) { - at32_add_system_devices(); - #ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM at32_add_device_usart(1); #else diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c index 8c435a6f4a6..748ac68c73d 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 diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h index c48386d66bc..aafaf7a7888 100644 --- a/arch/avr32/mach-at32ap/include/mach/board.h +++ b/arch/avr32/mach-at32ap/include/mach/board.h @@ -14,8 +14,14 @@ */ extern unsigned long at32_board_osc_rates[]; -/* Add basic devices: system manager, interrupt controller, portmuxes, etc. */ -void at32_add_system_devices(void); +/* + * This used to add essential system devices, but this is now done + * automatically. Please don't use it in new board code. + */ +static inline void __deprecated at32_add_system_devices(void) +{ + +} #define ATMEL_MAX_UART 4 extern struct platform_device *atmel_default_console_device; |