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

Commit 610300e8 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Russell King
Browse files

[ARM] 3826/1: iop3xx: remove IOP3??_IRQ_OFS irq offset 



Get rid of the unused IOP3??_IRQ_OFS irq offset define, start IRQ
numbering from zero.

Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 38ce73eb

arch/arm/mach-iop32x/irq.c

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static void 
iop321_irq_mask (unsigned int irq)

{



	iop321_mask &= ~(1 << (irq - IOP321_IRQ_OFS));

	iop321_mask &= ~(1 << irq);



	intctl_write(iop321_mask);

}
@@ -51,7 +51,7 @@ iop321_irq_mask (unsigned int irq) 
static void

iop321_irq_unmask (unsigned int irq)

{

	iop321_mask |= (1 << (irq - IOP321_IRQ_OFS));

	iop321_mask |= (1 << irq);



	intctl_write(iop321_mask);

}
@@ -73,7 +73,7 @@ void __init iop321_init_irq(void) 
	   machine_is_iq31244()) 	// all interrupts are inputs to chip

		*IOP3XX_PCIIRSR = 0x0f;



	for(i = IOP321_IRQ_OFS; i < NR_IRQS; i++)

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

	{

		set_irq_chip(i, &ext_chip);

		set_irq_handler(i, do_level_IRQ);

arch/arm/mach-iop33x/irq.c

+5 −5
Original line number Diff line number Diff line
@@ -60,28 +60,28 @@ static inline void intstr_write1(u32 val) 
static void

iop331_irq_mask1 (unsigned int irq)

{

        iop331_mask0 &= ~(1 << (irq - IOP331_IRQ_OFS));

        iop331_mask0 &= ~(1 << irq);

        intctl_write0(iop331_mask0);

}



static void

iop331_irq_mask2 (unsigned int irq)

{

        iop331_mask1 &= ~(1 << (irq - IOP331_IRQ_OFS - 32));

        iop331_mask1 &= ~(1 << (irq - 32));

        intctl_write1(iop331_mask1);

}



static void

iop331_irq_unmask1(unsigned int irq)

{

        iop331_mask0 |= (1 << (irq - IOP331_IRQ_OFS));

        iop331_mask0 |= (1 << irq);

        intctl_write0(iop331_mask0);

}



static void

iop331_irq_unmask2(unsigned int irq)

{

        iop331_mask1 |= (1 << (irq - IOP331_IRQ_OFS - 32));

        iop331_mask1 |= (1 << (irq - 32));

        intctl_write1(iop331_mask1);

}
@@ -110,7 +110,7 @@ void __init iop331_init_irq(void) 
	if(machine_is_iq80331()) 	// all interrupts are inputs to chip

		*IOP3XX_PCIIRSR = 0x0f;



	for(i = IOP331_IRQ_OFS; i < NR_IRQS; i++)

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

	{

		set_irq_chip(i, (i < 32) ? &iop331_irqchip1 : &iop331_irqchip2);

		set_irq_handler(i, do_level_IRQ);

include/asm-arm/arch-iop32x/entry-macro.S

+0 −1
Original line number Diff line number Diff line
@@ -24,6 +24,5 @@ 
		clz     \irqnr, \irqstat

		mov     \base, #31

		subs    \irqnr,\base,\irqnr

		add     \irqnr,\irqnr,#IRQ_IOP321_DMA0_EOT

1001:

		.endm

include/asm-arm/arch-iop32x/irqs.h

+29 −39
Original line number Diff line number Diff line
@@ -15,46 +15,36 @@ 
/*

 * IOP80321 chipset interrupts

 */

#define IOP321_IRQ_OFS		0

#define IOP321_IRQ(x)		(IOP321_IRQ_OFS + (x))

#define IRQ_IOP321_DMA0_EOT	0

#define IRQ_IOP321_DMA0_EOC	1

#define IRQ_IOP321_DMA1_EOT	2

#define IRQ_IOP321_DMA1_EOC	3

#define IRQ_IOP321_AA_EOT	6

#define IRQ_IOP321_AA_EOC	7

#define IRQ_IOP321_CORE_PMON	8

#define IRQ_IOP321_TIMER0	9

#define IRQ_IOP321_TIMER1	10

#define IRQ_IOP321_I2C_0	11

#define IRQ_IOP321_I2C_1	12

#define IRQ_IOP321_MESSAGING	13

#define IRQ_IOP321_ATU_BIST	14

#define IRQ_IOP321_PERFMON	15

#define IRQ_IOP321_CORE_PMU	16

#define IRQ_IOP321_BIU_ERR	17

#define IRQ_IOP321_ATU_ERR	18

#define IRQ_IOP321_MCU_ERR	19

#define IRQ_IOP321_DMA0_ERR	20

#define IRQ_IOP321_DMA1_ERR	21

#define IRQ_IOP321_AA_ERR	23

#define IRQ_IOP321_MSG_ERR	24

#define IRQ_IOP321_SSP		25

#define IRQ_IOP321_XINT0	27

#define IRQ_IOP321_XINT1	28

#define IRQ_IOP321_XINT2	29

#define IRQ_IOP321_XINT3	30

#define IRQ_IOP321_HPI		31



/*

 * On IRQ or FIQ register

 */

#define IRQ_IOP321_DMA0_EOT	IOP321_IRQ(0)

#define IRQ_IOP321_DMA0_EOC	IOP321_IRQ(1)

#define IRQ_IOP321_DMA1_EOT	IOP321_IRQ(2)

#define IRQ_IOP321_DMA1_EOC	IOP321_IRQ(3)

#define IRQ_IOP321_RSVD_4	IOP321_IRQ(4)

#define IRQ_IOP321_RSVD_5	IOP321_IRQ(5)

#define IRQ_IOP321_AA_EOT	IOP321_IRQ(6)

#define IRQ_IOP321_AA_EOC	IOP321_IRQ(7)

#define IRQ_IOP321_CORE_PMON	IOP321_IRQ(8)

#define IRQ_IOP321_TIMER0	IOP321_IRQ(9)

#define IRQ_IOP321_TIMER1	IOP321_IRQ(10)

#define IRQ_IOP321_I2C_0	IOP321_IRQ(11)

#define IRQ_IOP321_I2C_1	IOP321_IRQ(12)

#define IRQ_IOP321_MESSAGING	IOP321_IRQ(13)

#define IRQ_IOP321_ATU_BIST	IOP321_IRQ(14)

#define IRQ_IOP321_PERFMON	IOP321_IRQ(15)

#define IRQ_IOP321_CORE_PMU	IOP321_IRQ(16)

#define IRQ_IOP321_BIU_ERR	IOP321_IRQ(17)

#define IRQ_IOP321_ATU_ERR	IOP321_IRQ(18)

#define IRQ_IOP321_MCU_ERR	IOP321_IRQ(19)

#define IRQ_IOP321_DMA0_ERR	IOP321_IRQ(20)

#define IRQ_IOP321_DMA1_ERR	IOP321_IRQ(21)

#define IRQ_IOP321_RSVD_22	IOP321_IRQ(22)

#define IRQ_IOP321_AA_ERR	IOP321_IRQ(23)

#define IRQ_IOP321_MSG_ERR	IOP321_IRQ(24)

#define IRQ_IOP321_SSP		IOP321_IRQ(25)

#define IRQ_IOP321_RSVD_26	IOP321_IRQ(26)

#define IRQ_IOP321_XINT0	IOP321_IRQ(27)

#define IRQ_IOP321_XINT1	IOP321_IRQ(28)

#define IRQ_IOP321_XINT2	IOP321_IRQ(29)

#define IRQ_IOP321_XINT3	IOP321_IRQ(30)

#define IRQ_IOP321_HPI		IOP321_IRQ(31)



#define NR_IRQS			(IOP321_IRQ(31) + 1)

#define NR_IRQS			32





/*

include/asm-arm/arch-iop33x/entry-macro.S

+0 −1
Original line number Diff line number Diff line
@@ -30,6 +30,5 @@ 
		b	1001f

1002:		clz     \irqnr, \irqstat

		rsbs    \irqnr,\irqnr,#31   @ recommend by RMK

		add     \irqnr,\irqnr,#IRQ_IOP331_DMA0_EOT

1001:

		.endm