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

Commit 4dbd2b42 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'pxa-fixes-4.18' of https://github.com/rjarzmik/linux into fixes 

This is the fixes set for v4.18 cycle.

This is a fix for suspending all pxa3xx platforms, where high
number interrupts are not reenabled.

* tag 'pxa-fixes-4.18' of https://github.com/rjarzmik/linux

:
  ARM: pxa: irq: fix handling of ICMR registers in suspend/resume

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f0463f36 0c1049dc

arch/arm/mach-pxa/irq.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -185,7 +185,7 @@ static int pxa_irq_suspend(void) 
{

{

	int i;

	int i;





	for (i = 0; i < pxa_internal_irq_nr / 32; i++) {

	for (i = 0; i < DIV_ROUND_UP(pxa_internal_irq_nr, 32); i++) {

		void __iomem *base = irq_base(i);

		void __iomem *base = irq_base(i);





		saved_icmr[i] = __raw_readl(base + ICMR);

		saved_icmr[i] = __raw_readl(base + ICMR);
@@ -204,7 +204,7 @@ static void pxa_irq_resume(void) 
{

{

	int i;

	int i;





	for (i = 0; i < pxa_internal_irq_nr / 32; i++) {

	for (i = 0; i < DIV_ROUND_UP(pxa_internal_irq_nr, 32); i++) {

		void __iomem *base = irq_base(i);

		void __iomem *base = irq_base(i);





		__raw_writel(saved_icmr[i], base + ICMR);

		__raw_writel(saved_icmr[i], base + ICMR);