ARM: Merge next-samsung (b7a5b7ac) · Commits · e / devices / android_kernel_teracube_2e

arch/arm/mach-s5p6440/include/mach/irqs.h

+8 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,14 @@
		#define S5P_IRQ_EINT_BASE (S5P_IRQ_VIC1(31) + 6)

		#define S5P_EINT(x) ((x) + S5P_IRQ_EINT_BASE)
		#define IRQ_EINT(x) S5P_EINT(x)

		#define S5P_EINT_BASE1 (S5P_IRQ_EINT_BASE)
		/*
		* S5P6440 has 0-15 external interrupts in group 0. Only these can be used
		* to wake up from sleep. If request is beyond this range, by mistake, a large
		* return value for an irq number should be indication of something amiss.
		*/
		#define S5P_EINT_BASE2 (0xf0000000)

		/*
		* Next the external interrupt groups. These are similar to the IRQ_EINT(x)

+3 −2

Original line number	Diff line number	Diff line
		@@ -77,8 +77,9 @@

		#define S5P_IRQ_EINT_BASE (IRQ_VIC_END + 1)

		#define IRQ_EINT(x) ((x) < 16 ? S5P_IRQ_VIC0(x) : \
		(S5P_IRQ_EINT_BASE + (x)-16))
		#define S5P_EINT_BASE1 (S5P_IRQ_VIC0(0))
		#define S5P_EINT_BASE2 (S5P_IRQ_EINT_BASE)

		/* Set the default NR_IRQS */

		#define NR_IRQS (IRQ_EINT(31) + 1)

+0 −3

Original line number	Diff line number	Diff line
		@@ -100,9 +100,6 @@
		#define S5P_EINT_BASE1 (S5P_IRQ_VIC0(0))
		#define S5P_EINT_BASE2 (IRQ_VIC_END + 1)

		#define IRQ_EINT(x) ((x) < 16 ? S5P_IRQ_VIC0(x) : \
		(S5P_EINT_BASE2 + (x) - 16))

		#define S3C_IRQ_GPIO_BASE (IRQ_EINT(31) + 1)
		#define S3C_IRQ_GPIO(x) (S3C_IRQ_GPIO_BASE + (x))

+2 −5

Original line number	Diff line number	Diff line
		@@ -60,12 +60,9 @@
		#define S5PC100EINT30PEND (S5P_VA_GPIO + 0xF40)
		#define S5P_EINT_PEND(x) (S5PC100EINT30PEND + ((x) * 0x4))

		#define eint_offset(irq) ((irq) < IRQ_EINT16_31 ? ((irq) - IRQ_EINT(0)) : \
		(((irq) - S5P_EINT_BASE2)))
		#define EINT_REG_NR(x) (EINT_OFFSET(x) >> 3)

		#define EINT_REG_NR(x) (eint_offset(x) >> 3)

		#define eint_irq_to_bit(irq) (1 << (eint_offset(irq) & 0x7))
		#define eint_irq_to_bit(irq) (1 << (EINT_OFFSET(irq) & 0x7))

		/* values for S5P_EXTINT0 */
		#define S5P_EXTINT_LOWLEV (0x00)

+2 −12

Original line number	Diff line number	Diff line
		@@ -118,22 +118,12 @@
		#define IRQ_MDNIE3 S5P_IRQ_VIC3(8)
		#define IRQ_VIC_END S5P_IRQ_VIC3(31)

		#define S5P_EINT_16_31_BASE (IRQ_VIC_END + 1)

		#define EINT_MODE S3C_GPIO_SFN(0xf)

		#define IRQ_EINT(x) ((x) < 16 ? ((x) + S5P_IRQ_VIC0(0)) \
		: ((x) + S5P_EINT_16_31_BASE))
		#define S5P_EINT_BASE1 (S5P_IRQ_VIC0(0))
		#define S5P_EINT_BASE2 (IRQ_VIC_END + 1)

		/* Set the default NR_IRQS */

		#define NR_IRQS (IRQ_EINT(31) + 1)

		#define EINT_GPIO_0(x) S5PV210_GPH0(x)
		#define EINT_GPIO_1(x) S5PV210_GPH1(x)
		#define EINT_GPIO_2(x) S5PV210_GPH2(x)
		#define EINT_GPIO_3(x) S5PV210_GPH3(x)

		/* Compatibility */
		#define IRQ_LCD_FIFO IRQ_LCD0
		#define IRQ_LCD_VSYNC IRQ_LCD1