arm: pxa: move init functions into generic.h
In order to have a unique .c file for all pxa variants device-tree definitions, all the initialization functions for MACHINE_START and DT_MACHINE_START have been put together into generic.h. The alternative would have been one pxaXXX-dt.c file per variant. The move is necessary because each include/mach/pxaXXX.h includes the variant register descriptions which intersects and conflicts one with each other. The change is a preparation for pxa-dt.c to support multiple pxa, ie. pxa3xx and pxa27x. The machine files including mach/pxaXXX.h all include generic.h, which guarantees no regression should be introduced. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Acked-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
ef6dbda600
commit
4508f77517
|
@ -13,11 +13,11 @@
|
|||
|
||||
struct irq_data;
|
||||
|
||||
extern void pxa_timer_init(void);
|
||||
|
||||
extern void __init pxa_map_io(void);
|
||||
|
||||
extern unsigned int get_clk_frequency_khz(int info);
|
||||
extern void __init pxa_dt_irq_init(int (*fn)(struct irq_data *,
|
||||
unsigned int));
|
||||
extern void __init pxa_map_io(void);
|
||||
extern void pxa_timer_init(void);
|
||||
|
||||
#define SET_BANK(__nr,__start,__size) \
|
||||
mi->bank[__nr].start = (__start), \
|
||||
|
@ -25,29 +25,21 @@ extern unsigned int get_clk_frequency_khz(int info);
|
|||
|
||||
#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x)
|
||||
|
||||
#ifdef CONFIG_PXA25x
|
||||
extern unsigned pxa25x_get_clk_frequency_khz(int);
|
||||
#else
|
||||
#define pxa25x_get_clk_frequency_khz(x) (0)
|
||||
#endif
|
||||
#define pxa25x_handle_irq icip_handle_irq
|
||||
extern void __init pxa25x_init_irq(void);
|
||||
extern void __init pxa25x_map_io(void);
|
||||
extern void __init pxa26x_init_irq(void);
|
||||
|
||||
#ifdef CONFIG_PXA27x
|
||||
extern unsigned pxa27x_get_clk_frequency_khz(int);
|
||||
#else
|
||||
#define pxa27x_get_clk_frequency_khz(x) (0)
|
||||
#endif
|
||||
#define pxa27x_handle_irq ichp_handle_irq
|
||||
extern void __init pxa27x_dt_init_irq(void);
|
||||
extern unsigned pxa27x_get_clk_frequency_khz(int);
|
||||
extern void __init pxa27x_init_irq(void);
|
||||
extern void __init pxa27x_map_io(void);
|
||||
|
||||
#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x)
|
||||
extern void pxa2xx_clear_reset_status(unsigned int);
|
||||
#else
|
||||
static inline void pxa2xx_clear_reset_status(unsigned int mask) {}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PXA3xx
|
||||
extern unsigned pxa3xx_get_clk_frequency_khz(int);
|
||||
#else
|
||||
#define pxa3xx_get_clk_frequency_khz(x) (0)
|
||||
#endif
|
||||
#define pxa3xx_handle_irq ichp_handle_irq
|
||||
extern void __init pxa3xx_dt_init_irq(void);
|
||||
extern void __init pxa3xx_init_irq(void);
|
||||
extern void __init pxa3xx_map_io(void);
|
||||
|
||||
extern struct syscore_ops pxa_irq_syscore_ops;
|
||||
extern struct syscore_ops pxa2xx_mfp_syscore_ops;
|
||||
|
@ -59,3 +51,30 @@ void __init pxa_set_stuart_info(void *info);
|
|||
void __init pxa_set_hwuart_info(void *info);
|
||||
|
||||
void pxa_restart(enum reboot_mode, const char *);
|
||||
|
||||
#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x)
|
||||
extern void pxa2xx_clear_reset_status(unsigned int);
|
||||
#else
|
||||
static inline void pxa2xx_clear_reset_status(unsigned int mask) {}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Once fully converted to the clock framework, all these functions should be
|
||||
* removed, and replaced with a clk_get(NULL, "core").
|
||||
*/
|
||||
#ifdef CONFIG_PXA25x
|
||||
extern unsigned pxa25x_get_clk_frequency_khz(int);
|
||||
#else
|
||||
#define pxa25x_get_clk_frequency_khz(x) (0)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PXA27x
|
||||
#else
|
||||
#define pxa27x_get_clk_frequency_khz(x) (0)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PXA3xx
|
||||
extern unsigned pxa3xx_get_clk_frequency_khz(int);
|
||||
#else
|
||||
#define pxa3xx_get_clk_frequency_khz(x) (0)
|
||||
#endif
|
||||
|
|
|
@ -6,12 +6,4 @@
|
|||
#include <mach/mfp-pxa25x.h>
|
||||
#include <mach/irqs.h>
|
||||
|
||||
extern void __init pxa25x_map_io(void);
|
||||
extern void __init pxa25x_init_irq(void);
|
||||
#ifdef CONFIG_CPU_PXA26x
|
||||
extern void __init pxa26x_init_irq(void);
|
||||
#endif
|
||||
|
||||
#define pxa25x_handle_irq icip_handle_irq
|
||||
|
||||
#endif /* __MACH_PXA25x_H */
|
||||
|
|
|
@ -19,11 +19,7 @@
|
|||
#define ARB_CORE_PARK (1<<24) /* Be parked with core when idle */
|
||||
#define ARB_LOCK_FLAG (1<<23) /* Only Locking masters gain access to the bus */
|
||||
|
||||
extern void __init pxa27x_map_io(void);
|
||||
extern void __init pxa27x_init_irq(void);
|
||||
extern int __init pxa27x_set_pwrmode(unsigned int mode);
|
||||
extern void pxa27x_cpu_pm_enter(suspend_state_t state);
|
||||
|
||||
#define pxa27x_handle_irq ichp_handle_irq
|
||||
|
||||
#endif /* __MACH_PXA27x_H */
|
||||
|
|
|
@ -5,9 +5,4 @@
|
|||
#include <mach/pxa3xx-regs.h>
|
||||
#include <mach/irqs.h>
|
||||
|
||||
extern void __init pxa3xx_map_io(void);
|
||||
extern void __init pxa3xx_init_irq(void);
|
||||
|
||||
#define pxa3xx_handle_irq ichp_handle_irq
|
||||
|
||||
#endif /* __MACH_PXA3XX_H */
|
||||
|
|
Loading…
Reference in a new issue