Commit 19a64d9d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'soc-core' of... 

Merge branch 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc

Repeat pull of soc-core to bring in a bugfix.

* 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas:
  ARM: mach-shmobile: sh73a0: fixup PINT/IRQ16-IRQ31 irq number conflict
parents 815acebf 4da77319

arch/arm/mach-shmobile/include/mach/sh73a0.h

+31 −3
Original line number Diff line number Diff line
@@ -515,8 +515,36 @@ enum { 
	SHDMA_SLAVE_MMCIF_RX,

};



/* PINT interrupts are located at Linux IRQ 800 and up */

#define SH73A0_PINT0_IRQ(irq) ((irq) + 800)

#define SH73A0_PINT1_IRQ(irq) ((irq) + 832)

/*

 *		SH73A0 IRQ LOCATION TABLE

 *

 * 416	-----------------------------------------

 *		IRQ0-IRQ15

 * 431	-----------------------------------------

 * ...

 * 448	-----------------------------------------

 *		sh73a0-intcs

 *		sh73a0-intca-irq-pins

 * 680	-----------------------------------------

 * ...

 * 700	-----------------------------------------

 *		sh73a0-pint0

 * 731	-----------------------------------------

 * 732	-----------------------------------------

 *		sh73a0-pint1

 * 739	-----------------------------------------

 * ...

 * 800	-----------------------------------------

 *		IRQ16-IRQ31

 * 815	-----------------------------------------

 * ...

 * 928	-----------------------------------------

 *		sh73a0-intca-irq-pins

 * 943	-----------------------------------------

 */



/* PINT interrupts are located at Linux IRQ 700 and up */

#define SH73A0_PINT0_IRQ(irq) ((irq) + 700)

#define SH73A0_PINT1_IRQ(irq) ((irq) + 732)



#endif /* __ASM_SH73A0_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE