Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d39e0fd authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD
Browse files

arm: at91: use macro to declare soc boot data 



Instead of check the pointer of the init function, check the new builtin bool
to known if the soc is enabled.

This is needed as with the switch to the pinctrl the init will be NULL on pure
DT SoC.

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
parent 4d7127da

arch/arm/mach-at91/at91rm9200.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -361,10 +361,10 @@ static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = { 
	0	/* Advanced Interrupt Controller (IRQ6) */

	0	/* Advanced Interrupt Controller (IRQ6) */

};

};





struct at91_init_soc __initdata at91rm9200_soc = {

AT91_SOC_START(rm9200)

	.map_io = at91rm9200_map_io,

	.map_io = at91rm9200_map_io,

	.default_irq_priority = at91rm9200_default_irq_priority,

	.default_irq_priority = at91rm9200_default_irq_priority,

	.ioremap_registers = at91rm9200_ioremap_registers,

	.ioremap_registers = at91rm9200_ioremap_registers,

	.register_clocks = at91rm9200_register_clocks,

	.register_clocks = at91rm9200_register_clocks,

	.init = at91rm9200_initialize,

	.init = at91rm9200_initialize,

};
 
AT91_SOC_END

arch/arm/mach-at91/at91sam9260.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -390,10 +390,10 @@ static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = { 
	0,	/* Advanced Interrupt Controller */

	0,	/* Advanced Interrupt Controller */

};

};





struct at91_init_soc __initdata at91sam9260_soc = {

AT91_SOC_START(sam9260)

	.map_io = at91sam9260_map_io,

	.map_io = at91sam9260_map_io,

	.default_irq_priority = at91sam9260_default_irq_priority,

	.default_irq_priority = at91sam9260_default_irq_priority,

	.ioremap_registers = at91sam9260_ioremap_registers,

	.ioremap_registers = at91sam9260_ioremap_registers,

	.register_clocks = at91sam9260_register_clocks,

	.register_clocks = at91sam9260_register_clocks,

	.init = at91sam9260_initialize,

	.init = at91sam9260_initialize,

};
 
AT91_SOC_END

arch/arm/mach-at91/at91sam9261.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -334,10 +334,10 @@ static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = { 
	0,	/* Advanced Interrupt Controller */

	0,	/* Advanced Interrupt Controller */

};

};





struct at91_init_soc __initdata at91sam9261_soc = {

AT91_SOC_START(sam9261)

	.map_io = at91sam9261_map_io,

	.map_io = at91sam9261_map_io,

	.default_irq_priority = at91sam9261_default_irq_priority,

	.default_irq_priority = at91sam9261_default_irq_priority,

	.ioremap_registers = at91sam9261_ioremap_registers,

	.ioremap_registers = at91sam9261_ioremap_registers,

	.register_clocks = at91sam9261_register_clocks,

	.register_clocks = at91sam9261_register_clocks,

	.init = at91sam9261_initialize,

	.init = at91sam9261_initialize,

};
 
AT91_SOC_END

arch/arm/mach-at91/at91sam9263.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -365,10 +365,10 @@ static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = { 
	0,	/* Advanced Interrupt Controller (IRQ1) */

	0,	/* Advanced Interrupt Controller (IRQ1) */

};

};





struct at91_init_soc __initdata at91sam9263_soc = {

AT91_SOC_START(sam9263)

	.map_io = at91sam9263_map_io,

	.map_io = at91sam9263_map_io,

	.default_irq_priority = at91sam9263_default_irq_priority,

	.default_irq_priority = at91sam9263_default_irq_priority,

	.ioremap_registers = at91sam9263_ioremap_registers,

	.ioremap_registers = at91sam9263_ioremap_registers,

	.register_clocks = at91sam9263_register_clocks,

	.register_clocks = at91sam9263_register_clocks,

	.init = at91sam9263_initialize,

	.init = at91sam9263_initialize,

};
 
AT91_SOC_END

arch/arm/mach-at91/at91sam9g45.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -409,10 +409,10 @@ static unsigned int at91sam9g45_default_irq_priority[NR_AIC_IRQS] __initdata = { 
	0,	/* Advanced Interrupt Controller (IRQ0) */

	0,	/* Advanced Interrupt Controller (IRQ0) */

};

};





struct at91_init_soc __initdata at91sam9g45_soc = {

AT91_SOC_START(sam9g45)

	.map_io = at91sam9g45_map_io,

	.map_io = at91sam9g45_map_io,

	.default_irq_priority = at91sam9g45_default_irq_priority,

	.default_irq_priority = at91sam9g45_default_irq_priority,

	.ioremap_registers = at91sam9g45_ioremap_registers,

	.ioremap_registers = at91sam9g45_ioremap_registers,

	.register_clocks = at91sam9g45_register_clocks,

	.register_clocks = at91sam9g45_register_clocks,

	.init = at91sam9g45_initialize,

	.init = at91sam9g45_initialize,

};
 
AT91_SOC_END