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

Commit ca439c9b authored by Olof Johansson's avatar Olof Johansson
Browse files

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

From Nicolas Ferre, fixes for early boot hangs on at91:

Fixes for RTT & RTC interrupts that can fire early during boot process
and kill the system.

* tag 'at91-fixes-non-critical' of git://github.com/at91linux/linux-at91:
  ARM: at91: fix hanged boot due to early rtt-interrupt
  ARM: at91: fix hanged boot due to early rtc-interrupt
parents ba52b7d4 94c4c79f

arch/arm/mach-at91/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for the linux kernel.

#



obj-y		:= irq.o gpio.o setup.o

obj-y		:= irq.o gpio.o setup.o sysirq_mask.o

obj-m		:=

obj-n		:=

obj-		:=

arch/arm/mach-at91/at91sam9260.c

+2 −0
Original line number Diff line number Diff line
@@ -349,6 +349,8 @@ static void __init at91sam9260_initialize(void) 
	arm_pm_idle = at91sam9_idle;

	arm_pm_restart = at91sam9_alt_restart;



	at91_sysirq_mask_rtt(AT91SAM9260_BASE_RTT);



	/* Register GPIO subsystem */

	at91_gpio_init(at91sam9260_gpio, 3);

}

arch/arm/mach-at91/at91sam9261.c

+2 −0
Original line number Diff line number Diff line
@@ -291,6 +291,8 @@ static void __init at91sam9261_initialize(void) 
	arm_pm_idle = at91sam9_idle;

	arm_pm_restart = at91sam9_alt_restart;



	at91_sysirq_mask_rtt(AT91SAM9261_BASE_RTT);



	/* Register GPIO subsystem */

	at91_gpio_init(at91sam9261_gpio, 3);

}

arch/arm/mach-at91/at91sam9263.c

+3 −0
Original line number Diff line number Diff line
@@ -328,6 +328,9 @@ static void __init at91sam9263_initialize(void) 
	arm_pm_idle = at91sam9_idle;

	arm_pm_restart = at91sam9_alt_restart;



	at91_sysirq_mask_rtt(AT91SAM9263_BASE_RTT0);

	at91_sysirq_mask_rtt(AT91SAM9263_BASE_RTT1);



	/* Register GPIO subsystem */

	at91_gpio_init(at91sam9263_gpio, 5);

}

arch/arm/mach-at91/at91sam9g45.c

+3 −0
Original line number Diff line number Diff line
@@ -377,6 +377,9 @@ static void __init at91sam9g45_initialize(void) 
	arm_pm_idle = at91sam9_idle;

	arm_pm_restart = at91sam9g45_restart;



	at91_sysirq_mask_rtc(AT91SAM9G45_BASE_RTC);

	at91_sysirq_mask_rtt(AT91SAM9G45_BASE_RTT);



	/* Register GPIO subsystem */

	at91_gpio_init(at91sam9g45_gpio, 5);

}