avr32: Move setup_platform() into chip-specific file
Combine at32_clock_init() and at32_portmux_init() into setup_platform() and remove setup_platform() from at32ap.c. No functional change since all setup_platform() ever did was call those two functions. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
This commit is contained in:
parent
d704fb0cc0
commit
65033ed740
|
@ -11,14 +11,6 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include <asm/arch/init.h>
|
||||
|
||||
void __init setup_platform(void)
|
||||
{
|
||||
at32_clock_init();
|
||||
at32_portmux_init();
|
||||
}
|
||||
|
||||
static int __init pdc_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct clk *pclk, *hclk;
|
||||
|
|
|
@ -2048,16 +2048,7 @@ struct clk *at32_clock_list[] = {
|
|||
};
|
||||
unsigned int at32_nr_clocks = ARRAY_SIZE(at32_clock_list);
|
||||
|
||||
void __init at32_portmux_init(void)
|
||||
{
|
||||
at32_init_pio(&pio0_device);
|
||||
at32_init_pio(&pio1_device);
|
||||
at32_init_pio(&pio2_device);
|
||||
at32_init_pio(&pio3_device);
|
||||
at32_init_pio(&pio4_device);
|
||||
}
|
||||
|
||||
void __init at32_clock_init(void)
|
||||
void __init setup_platform(void)
|
||||
{
|
||||
u32 cpu_mask = 0, hsb_mask = 0, pba_mask = 0, pbb_mask = 0;
|
||||
int i;
|
||||
|
@ -2112,4 +2103,11 @@ void __init at32_clock_init(void)
|
|||
pm_writel(HSB_MASK, hsb_mask);
|
||||
pm_writel(PBA_MASK, pba_mask);
|
||||
pm_writel(PBB_MASK, pbb_mask);
|
||||
|
||||
/* Initialize the port muxes */
|
||||
at32_init_pio(&pio0_device);
|
||||
at32_init_pio(&pio1_device);
|
||||
at32_init_pio(&pio2_device);
|
||||
at32_init_pio(&pio3_device);
|
||||
at32_init_pio(&pio4_device);
|
||||
}
|
||||
|
|
|
@ -13,10 +13,6 @@
|
|||
void setup_platform(void);
|
||||
void setup_board(void);
|
||||
|
||||
/* Called by setup_platform */
|
||||
void at32_clock_init(void);
|
||||
void at32_portmux_init(void);
|
||||
|
||||
void at32_setup_serial_console(unsigned int usart_id);
|
||||
|
||||
#endif /* __ASM_AVR32_AT32AP_INIT_H__ */
|
||||
|
|
Loading…
Reference in New Issue