Commit 6b9a39de authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into next/fixes-non-critical 

From Nicolas Ferre:

Several fixes for:
- external irq on non-DT boards
- cpuidle code in some circumstances
- PMC code in relation with PLLB/PLL_UTMI/USB:
  mainly for SAMA5D3 and AT91SAM9N12

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91

:
  ARM: at91/PMC: use at91_usb_rate() for UTMI PLL
  ARM: at91/PMC: fix at91sam9n12 USB FS init
  ARM: at91/PMC: at91sam9n12 family has a PLLB
  ARM: at91/PMC: sama5d3 family doesn't have a PLLB
  ARM: at91: cpuidle: Fix target_residency
  ARM: at91: fix at91_extern_irq usage for non-dt boards

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1d54e089 bd2da9ca

arch/arm/mach-at91/at91rm9200.c

+4 −4
Original line number Diff line number Diff line
@@ -332,10 +332,6 @@ static void __init at91rm9200_initialize(void) 
{

	arm_pm_idle = at91rm9200_idle;

	arm_pm_restart = at91rm9200_restart;

	at91_extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1)

			| (1 << AT91RM9200_ID_IRQ2) | (1 << AT91RM9200_ID_IRQ3)

			| (1 << AT91RM9200_ID_IRQ4) | (1 << AT91RM9200_ID_IRQ5)

			| (1 << AT91RM9200_ID_IRQ6);



	/* Initialize GPIO subsystem */

	at91_gpio_init(at91rm9200_gpio,
@@ -388,6 +384,10 @@ static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = { 
AT91_SOC_START(at91rm9200)

	.map_io = at91rm9200_map_io,

	.default_irq_priority = at91rm9200_default_irq_priority,

	.extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1)

		    | (1 << AT91RM9200_ID_IRQ2) | (1 << AT91RM9200_ID_IRQ3)

		    | (1 << AT91RM9200_ID_IRQ4) | (1 << AT91RM9200_ID_IRQ5)

		    | (1 << AT91RM9200_ID_IRQ6),

	.ioremap_registers = at91rm9200_ioremap_registers,

	.register_clocks = at91rm9200_register_clocks,

	.init = at91rm9200_initialize,

arch/arm/mach-at91/at91sam9260.c

+2 −2
Original line number Diff line number Diff line
@@ -348,8 +348,6 @@ static void __init at91sam9260_initialize(void) 
{

	arm_pm_idle = at91sam9_idle;

	arm_pm_restart = at91sam9_alt_restart;

	at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1)

			| (1 << AT91SAM9260_ID_IRQ2);



	/* Register GPIO subsystem */

	at91_gpio_init(at91sam9260_gpio, 3);
@@ -400,6 +398,8 @@ static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = { 
AT91_SOC_START(at91sam9260)

	.map_io = at91sam9260_map_io,

	.default_irq_priority = at91sam9260_default_irq_priority,

	.extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1)

		    | (1 << AT91SAM9260_ID_IRQ2),

	.ioremap_registers = at91sam9260_ioremap_registers,

	.register_clocks = at91sam9260_register_clocks,

	.init = at91sam9260_initialize,

arch/arm/mach-at91/at91sam9261.c

+2 −2
Original line number Diff line number Diff line
@@ -290,8 +290,6 @@ static void __init at91sam9261_initialize(void) 
{

	arm_pm_idle = at91sam9_idle;

	arm_pm_restart = at91sam9_alt_restart;

	at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1)

			| (1 << AT91SAM9261_ID_IRQ2);



	/* Register GPIO subsystem */

	at91_gpio_init(at91sam9261_gpio, 3);
@@ -342,6 +340,8 @@ static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = { 
AT91_SOC_START(at91sam9261)

	.map_io = at91sam9261_map_io,

	.default_irq_priority = at91sam9261_default_irq_priority,

	.extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1)

		    | (1 << AT91SAM9261_ID_IRQ2),

	.ioremap_registers = at91sam9261_ioremap_registers,

	.register_clocks = at91sam9261_register_clocks,

	.init = at91sam9261_initialize,

arch/arm/mach-at91/at91sam9263.c

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,6 @@ static void __init at91sam9263_initialize(void) 
{

	arm_pm_idle = at91sam9_idle;

	arm_pm_restart = at91sam9_alt_restart;

	at91_extern_irq = (1 << AT91SAM9263_ID_IRQ0) | (1 << AT91SAM9263_ID_IRQ1);



	/* Register GPIO subsystem */

	at91_gpio_init(at91sam9263_gpio, 5);
@@ -378,6 +377,7 @@ static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = { 
AT91_SOC_START(at91sam9263)

	.map_io = at91sam9263_map_io,

	.default_irq_priority = at91sam9263_default_irq_priority,

	.extern_irq = (1 << AT91SAM9263_ID_IRQ0) | (1 << AT91SAM9263_ID_IRQ1),

	.ioremap_registers = at91sam9263_ioremap_registers,

	.register_clocks = at91sam9263_register_clocks,

	.init = at91sam9263_initialize,

arch/arm/mach-at91/at91sam9g45.c

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,6 @@ static void __init at91sam9g45_initialize(void) 
{

	arm_pm_idle = at91sam9_idle;

	arm_pm_restart = at91sam9g45_restart;

	at91_extern_irq = (1 << AT91SAM9G45_ID_IRQ0);



	/* Register GPIO subsystem */

	at91_gpio_init(at91sam9g45_gpio, 5);
@@ -425,6 +424,7 @@ static unsigned int at91sam9g45_default_irq_priority[NR_AIC_IRQS] __initdata = { 
AT91_SOC_START(at91sam9g45)

	.map_io = at91sam9g45_map_io,

	.default_irq_priority = at91sam9g45_default_irq_priority,

	.extern_irq = (1 << AT91SAM9G45_ID_IRQ0),

	.ioremap_registers = at91sam9g45_ioremap_registers,

	.register_clocks = at91sam9g45_register_clocks,

	.init = at91sam9g45_initialize,

CRA Git | Maintained and supported by SUSTech CRA and CCSE