ARM: at91: change name template in AT91_SOC_START macro
New devices are no more prefixed with at91 so remove the at91 and _name concatenation. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
This commit is contained in:
		
							parent
							
								
									9317960fa3
								
							
						
					
					
						commit
						84ddb08763
					
				| @ -384,7 +384,7 @@ static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = { | ||||
| 	0	/* Advanced Interrupt Controller (IRQ6) */ | ||||
| }; | ||||
| 
 | ||||
| AT91_SOC_START(rm9200) | ||||
| AT91_SOC_START(at91rm9200) | ||||
| 	.map_io = at91rm9200_map_io, | ||||
| 	.default_irq_priority = at91rm9200_default_irq_priority, | ||||
| 	.ioremap_registers = at91rm9200_ioremap_registers, | ||||
|  | ||||
| @ -395,7 +395,7 @@ static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = { | ||||
| 	0,	/* Advanced Interrupt Controller */ | ||||
| }; | ||||
| 
 | ||||
| AT91_SOC_START(sam9260) | ||||
| AT91_SOC_START(at91sam9260) | ||||
| 	.map_io = at91sam9260_map_io, | ||||
| 	.default_irq_priority = at91sam9260_default_irq_priority, | ||||
| 	.ioremap_registers = at91sam9260_ioremap_registers, | ||||
|  | ||||
| @ -337,7 +337,7 @@ static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = { | ||||
| 	0,	/* Advanced Interrupt Controller */ | ||||
| }; | ||||
| 
 | ||||
| AT91_SOC_START(sam9261) | ||||
| AT91_SOC_START(at91sam9261) | ||||
| 	.map_io = at91sam9261_map_io, | ||||
| 	.default_irq_priority = at91sam9261_default_irq_priority, | ||||
| 	.ioremap_registers = at91sam9261_ioremap_registers, | ||||
|  | ||||
| @ -374,7 +374,7 @@ static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = { | ||||
| 	0,	/* Advanced Interrupt Controller (IRQ1) */ | ||||
| }; | ||||
| 
 | ||||
| AT91_SOC_START(sam9263) | ||||
| AT91_SOC_START(at91sam9263) | ||||
| 	.map_io = at91sam9263_map_io, | ||||
| 	.default_irq_priority = at91sam9263_default_irq_priority, | ||||
| 	.ioremap_registers = at91sam9263_ioremap_registers, | ||||
|  | ||||
| @ -418,7 +418,7 @@ static unsigned int at91sam9g45_default_irq_priority[NR_AIC_IRQS] __initdata = { | ||||
| 	0,	/* Advanced Interrupt Controller (IRQ0) */ | ||||
| }; | ||||
| 
 | ||||
| AT91_SOC_START(sam9g45) | ||||
| AT91_SOC_START(at91sam9g45) | ||||
| 	.map_io = at91sam9g45_map_io, | ||||
| 	.default_irq_priority = at91sam9g45_default_irq_priority, | ||||
| 	.ioremap_registers = at91sam9g45_ioremap_registers, | ||||
|  | ||||
| @ -226,7 +226,7 @@ void __init at91sam9n12_initialize(void) | ||||
| 	at91_extern_irq = (1 << AT91SAM9N12_ID_IRQ0); | ||||
| } | ||||
| 
 | ||||
| AT91_SOC_START(sam9n12) | ||||
| AT91_SOC_START(at91sam9n12) | ||||
| 	.map_io = at91sam9n12_map_io, | ||||
| 	.register_clocks = at91sam9n12_register_clocks, | ||||
| 	.init = at91sam9n12_initialize, | ||||
|  | ||||
| @ -340,7 +340,7 @@ static unsigned int at91sam9rl_default_irq_priority[NR_AIC_IRQS] __initdata = { | ||||
| 	0,	/* Advanced Interrupt Controller */ | ||||
| }; | ||||
| 
 | ||||
| AT91_SOC_START(sam9rl) | ||||
| AT91_SOC_START(at91sam9rl) | ||||
| 	.map_io = at91sam9rl_map_io, | ||||
| 	.default_irq_priority = at91sam9rl_default_irq_priority, | ||||
| 	.ioremap_registers = at91sam9rl_ioremap_registers, | ||||
|  | ||||
| @ -320,7 +320,7 @@ static void __init at91sam9x5_map_io(void) | ||||
|  *  Interrupt initialization | ||||
|  * -------------------------------------------------------------------- */ | ||||
| 
 | ||||
| AT91_SOC_START(sam9x5) | ||||
| AT91_SOC_START(at91sam9x5) | ||||
| 	.map_io = at91sam9x5_map_io, | ||||
| 	.register_clocks = at91sam9x5_register_clocks, | ||||
| AT91_SOC_END | ||||
|  | ||||
| @ -24,7 +24,7 @@ extern struct at91_init_soc at91sam9x5_soc; | ||||
| extern struct at91_init_soc at91sam9n12_soc; | ||||
| 
 | ||||
| #define AT91_SOC_START(_name)				\ | ||||
| struct at91_init_soc __initdata at91##_name##_soc	\ | ||||
| struct at91_init_soc __initdata _name##_soc		\ | ||||
|  __used							\ | ||||
| 						= {	\ | ||||
| 	.builtin	= 1,				\ | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user