 6bb27d7349
			
		
	
	
	6bb27d7349
	
	
	
		
			
			Now that the only field in struct sys_timer is .init, delete the struct, and replace the machine descriptor .timer field with the initialization function itself. This will enable moving timer drivers into drivers/clocksource without having to place a public prototype of each struct sys_timer object into include/linux; the intent is to create a single of_clocksource_init() function that determines which timer driver to initialize by scanning the device dtree, much like the proposed irqchip_init() at: http://www.spinics.net/lists/arm-kernel/msg203686.html Includes mach-omap2 fixes from Igor Grinberg. Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Stephen Warren <swarren@nvidia.com>
		
			
				
	
	
		
			102 lines
		
	
	
	
		
			2.7 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			102 lines
		
	
	
	
		
			2.7 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| #ifndef __ASM_MACH_MMP2_H
 | |
| #define __ASM_MACH_MMP2_H
 | |
| 
 | |
| #include <linux/platform_data/pxa_sdhci.h>
 | |
| 
 | |
| extern void mmp2_timer_init(void);
 | |
| extern void __init mmp2_init_icu(void);
 | |
| extern void __init mmp2_init_irq(void);
 | |
| extern void mmp2_clear_pmic_int(void);
 | |
| 
 | |
| #include <linux/i2c.h>
 | |
| #include <linux/i2c/pxa-i2c.h>
 | |
| #include <mach/devices.h>
 | |
| #include <linux/platform_data/dma-mmp_tdma.h>
 | |
| 
 | |
| extern struct pxa_device_desc mmp2_device_uart1;
 | |
| extern struct pxa_device_desc mmp2_device_uart2;
 | |
| extern struct pxa_device_desc mmp2_device_uart3;
 | |
| extern struct pxa_device_desc mmp2_device_uart4;
 | |
| extern struct pxa_device_desc mmp2_device_twsi1;
 | |
| extern struct pxa_device_desc mmp2_device_twsi2;
 | |
| extern struct pxa_device_desc mmp2_device_twsi3;
 | |
| extern struct pxa_device_desc mmp2_device_twsi4;
 | |
| extern struct pxa_device_desc mmp2_device_twsi5;
 | |
| extern struct pxa_device_desc mmp2_device_twsi6;
 | |
| extern struct pxa_device_desc mmp2_device_sdh0;
 | |
| extern struct pxa_device_desc mmp2_device_sdh1;
 | |
| extern struct pxa_device_desc mmp2_device_sdh2;
 | |
| extern struct pxa_device_desc mmp2_device_sdh3;
 | |
| extern struct pxa_device_desc mmp2_device_asram;
 | |
| extern struct pxa_device_desc mmp2_device_isram;
 | |
| 
 | |
| extern struct platform_device mmp2_device_gpio;
 | |
| 
 | |
| static inline int mmp2_add_uart(int id)
 | |
| {
 | |
| 	struct pxa_device_desc *d = NULL;
 | |
| 
 | |
| 	switch (id) {
 | |
| 	case 1: d = &mmp2_device_uart1; break;
 | |
| 	case 2: d = &mmp2_device_uart2; break;
 | |
| 	case 3: d = &mmp2_device_uart3; break;
 | |
| 	case 4: d = &mmp2_device_uart4; break;
 | |
| 	default:
 | |
| 		return -EINVAL;
 | |
| 	}
 | |
| 
 | |
| 	return pxa_register_device(d, NULL, 0);
 | |
| }
 | |
| 
 | |
| static inline int mmp2_add_twsi(int id, struct i2c_pxa_platform_data *data,
 | |
| 				  struct i2c_board_info *info, unsigned size)
 | |
| {
 | |
| 	struct pxa_device_desc *d = NULL;
 | |
| 	int ret;
 | |
| 
 | |
| 	switch (id) {
 | |
| 	case 1: d = &mmp2_device_twsi1; break;
 | |
| 	case 2: d = &mmp2_device_twsi2; break;
 | |
| 	case 3: d = &mmp2_device_twsi3; break;
 | |
| 	case 4: d = &mmp2_device_twsi4; break;
 | |
| 	case 5: d = &mmp2_device_twsi5; break;
 | |
| 	case 6: d = &mmp2_device_twsi6; break;
 | |
| 	default:
 | |
| 		return -EINVAL;
 | |
| 	}
 | |
| 
 | |
| 	ret = i2c_register_board_info(id - 1, info, size);
 | |
| 	if (ret)
 | |
| 		return ret;
 | |
| 
 | |
| 	return pxa_register_device(d, data, sizeof(*data));
 | |
| }
 | |
| 
 | |
| static inline int mmp2_add_sdhost(int id, struct sdhci_pxa_platdata *data)
 | |
| {
 | |
| 	struct pxa_device_desc *d = NULL;
 | |
| 
 | |
| 	switch (id) {
 | |
| 	case 0: d = &mmp2_device_sdh0; break;
 | |
| 	case 1: d = &mmp2_device_sdh1; break;
 | |
| 	case 2: d = &mmp2_device_sdh2; break;
 | |
| 	case 3: d = &mmp2_device_sdh3; break;
 | |
| 	default:
 | |
| 		return -EINVAL;
 | |
| 	}
 | |
| 
 | |
| 	return pxa_register_device(d, data, sizeof(*data));
 | |
| }
 | |
| 
 | |
| static inline int mmp2_add_asram(struct sram_platdata *data)
 | |
| {
 | |
| 	return pxa_register_device(&mmp2_device_asram, data, sizeof(*data));
 | |
| }
 | |
| 
 | |
| static inline int mmp2_add_isram(struct sram_platdata *data)
 | |
| {
 | |
| 	return pxa_register_device(&mmp2_device_isram, data, sizeof(*data));
 | |
| }
 | |
| 
 | |
| #endif /* __ASM_MACH_MMP2_H */
 | |
| 
 |