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

Commit 2329e7cc authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Kevin Hilman
Browse files

OMAP3: PM: Fix INTC context save/restore 



Wrong index was used for ILR.

Signed-off-by: default avatarAaro Koskinen <Aaro.Koskinen@nokia.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 0795a75a

arch/arm/mach-omap2/irq.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -241,7 +241,7 @@ void omap_intc_save_context(void) 
			intc_bank_read_reg(bank, INTC_THRESHOLD);

			intc_bank_read_reg(bank, INTC_THRESHOLD);

		for (i = 0; i < INTCPS_NR_IRQS; i++)

		for (i = 0; i < INTCPS_NR_IRQS; i++)

			intc_context[ind].ilr[i] =

			intc_context[ind].ilr[i] =

				intc_bank_read_reg(bank, (0x100 + 0x4*ind));

				intc_bank_read_reg(bank, (0x100 + 0x4*i));

		for (i = 0; i < INTCPS_NR_MIR_REGS; i++)

		for (i = 0; i < INTCPS_NR_MIR_REGS; i++)

			intc_context[ind].mir[i] =

			intc_context[ind].mir[i] =

				intc_bank_read_reg(&irq_banks[0], INTC_MIR0 +

				intc_bank_read_reg(&irq_banks[0], INTC_MIR0 +
@@ -267,7 +267,7 @@ void omap_intc_restore_context(void) 
					bank, INTC_THRESHOLD);

					bank, INTC_THRESHOLD);

		for (i = 0; i < INTCPS_NR_IRQS; i++)

		for (i = 0; i < INTCPS_NR_IRQS; i++)

			intc_bank_write_reg(intc_context[ind].ilr[i],

			intc_bank_write_reg(intc_context[ind].ilr[i],

				bank, (0x100 + 0x4*ind));

				bank, (0x100 + 0x4*i));

		for (i = 0; i < INTCPS_NR_MIR_REGS; i++)

		for (i = 0; i < INTCPS_NR_MIR_REGS; i++)

			intc_bank_write_reg(intc_context[ind].mir[i],

			intc_bank_write_reg(intc_context[ind].mir[i],

				 &irq_banks[0], INTC_MIR0 + (0x20 * i));

				 &irq_banks[0], INTC_MIR0 + (0x20 * i));