Merge branch 'next-samsung-irq_data' into for-next (f651ef65) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/arm/mach-s3c2410/bast-irq.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -75,38 +75,38 @@ static unsigned char bast_pc104_irqmasks[] = {
		static unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };

		static void
		bast_pc104_mask(unsigned int irqno)
		bast_pc104_mask(struct irq_data *data)
		{
		unsigned long temp;

		temp = __raw_readb(BAST_VA_PC104_IRQMASK);
		temp &= ~bast_pc104_irqmasks[irqno];
		temp &= ~bast_pc104_irqmasks[data->irq];
		__raw_writeb(temp, BAST_VA_PC104_IRQMASK);
		}

		static void
		bast_pc104_maskack(unsigned int irqno)
		bast_pc104_maskack(struct irq_data *data)
		{
		struct irq_desc *desc = irq_desc + IRQ_ISA;

		bast_pc104_mask(irqno);
		desc->chip->ack(IRQ_ISA);
		bast_pc104_mask(data);
		desc->irq_data.chip->irq_ack(&desc->irq_data);
		}

		static void
		bast_pc104_unmask(unsigned int irqno)
		bast_pc104_unmask(struct irq_data *data)
		{
		unsigned long temp;

		temp = __raw_readb(BAST_VA_PC104_IRQMASK);
		temp \|= bast_pc104_irqmasks[irqno];
		temp \|= bast_pc104_irqmasks[data->irq];
		__raw_writeb(temp, BAST_VA_PC104_IRQMASK);
		}

		static struct irq_chip bast_pc104_chip = {
		.mask = bast_pc104_mask,
		.unmask = bast_pc104_unmask,
		.ack = bast_pc104_maskack
		.irq_mask = bast_pc104_mask,
		.irq_unmask = bast_pc104_unmask,
		.irq_ack = bast_pc104_maskack
		};

		static void
		@@ -123,7 +123,7 @@ bast_irq_pc104_demux(unsigned int irq,
		/* ack if we get an irq with nothing (ie, startup) */

		desc = irq_desc + IRQ_ISA;
		desc->chip->ack(IRQ_ISA);
		desc->irq_data.chip->irq_ack(&desc->irq_data);
		} else {
		/* handle the IRQ */

arch/arm/mach-s3c2412/irq.c

+25 −25

Original line number	Diff line number	Diff line
		@@ -49,9 +49,9 @@
		*/

		static void
		s3c2412_irq_mask(unsigned int irqno)
		s3c2412_irq_mask(struct irq_data *data)
		{
		unsigned long bitval = 1UL << (irqno - IRQ_EINT0);
		unsigned long bitval = 1UL << (data->irq - IRQ_EINT0);
		unsigned long mask;

		mask = __raw_readl(S3C2410_INTMSK);
		@@ -62,9 +62,9 @@ s3c2412_irq_mask(unsigned int irqno)
		}

		static inline void
		s3c2412_irq_ack(unsigned int irqno)
		s3c2412_irq_ack(struct irq_data *data)
		{
		unsigned long bitval = 1UL << (irqno - IRQ_EINT0);
		unsigned long bitval = 1UL << (data->irq - IRQ_EINT0);

		__raw_writel(bitval, S3C2412_EINTPEND);
		__raw_writel(bitval, S3C2410_SRCPND);
		@@ -72,9 +72,9 @@ s3c2412_irq_ack(unsigned int irqno)
		}

		static inline void
		s3c2412_irq_maskack(unsigned int irqno)
		s3c2412_irq_maskack(struct irq_data *data)
		{
		unsigned long bitval = 1UL << (irqno - IRQ_EINT0);
		unsigned long bitval = 1UL << (data->irq - IRQ_EINT0);
		unsigned long mask;

		mask = __raw_readl(S3C2410_INTMSK);
		@@ -89,9 +89,9 @@ s3c2412_irq_maskack(unsigned int irqno)
		}

		static void
		s3c2412_irq_unmask(unsigned int irqno)
		s3c2412_irq_unmask(struct irq_data *data)
		{
		unsigned long bitval = 1UL << (irqno - IRQ_EINT0);
		unsigned long bitval = 1UL << (data->irq - IRQ_EINT0);
		unsigned long mask;

		mask = __raw_readl(S3C2412_EINTMASK);
		@@ -102,11 +102,11 @@ s3c2412_irq_unmask(unsigned int irqno)
		}

		static struct irq_chip s3c2412_irq_eint0t4 = {
		.ack = s3c2412_irq_ack,
		.mask = s3c2412_irq_mask,
		.unmask = s3c2412_irq_unmask,
		.set_wake = s3c_irq_wake,
		.set_type = s3c_irqext_type,
		.irq_ack = s3c2412_irq_ack,
		.irq_mask = s3c2412_irq_mask,
		.irq_unmask = s3c2412_irq_unmask,
		.irq_set_wake = s3c_irq_wake,
		.irq_set_type = s3c_irqext_type,
		};

		#define INTBIT(x) (1 << ((x) - S3C2410_IRQSUB(0)))
		@@ -132,29 +132,29 @@ static void s3c2412_irq_demux_cfsdi(unsigned int irq, struct irq_desc *desc)
		#define INTMSK_CFSDI (1UL << (IRQ_S3C2412_CFSDI - IRQ_EINT0))
		#define SUBMSK_CFSDI INTMSK_SUB(IRQ_S3C2412_SDI, IRQ_S3C2412_CF)

		static void s3c2412_irq_cfsdi_mask(unsigned int irqno)
		static void s3c2412_irq_cfsdi_mask(struct irq_data *data)
		{
		s3c_irqsub_mask(irqno, INTMSK_CFSDI, SUBMSK_CFSDI);
		s3c_irqsub_mask(data->irq, INTMSK_CFSDI, SUBMSK_CFSDI);
		}

		static void s3c2412_irq_cfsdi_unmask(unsigned int irqno)
		static void s3c2412_irq_cfsdi_unmask(struct irq_data *data)
		{
		s3c_irqsub_unmask(irqno, INTMSK_CFSDI);
		s3c_irqsub_unmask(data->irq, INTMSK_CFSDI);
		}

		static void s3c2412_irq_cfsdi_ack(unsigned int irqno)
		static void s3c2412_irq_cfsdi_ack(struct irq_data *data)
		{
		s3c_irqsub_maskack(irqno, INTMSK_CFSDI, SUBMSK_CFSDI);
		s3c_irqsub_maskack(data->irq, INTMSK_CFSDI, SUBMSK_CFSDI);
		}

		static struct irq_chip s3c2412_irq_cfsdi = {
		.name = "s3c2412-cfsdi",
		.ack = s3c2412_irq_cfsdi_ack,
		.mask = s3c2412_irq_cfsdi_mask,
		.unmask = s3c2412_irq_cfsdi_unmask,
		.irq_ack = s3c2412_irq_cfsdi_ack,
		.irq_mask = s3c2412_irq_cfsdi_mask,
		.irq_unmask = s3c2412_irq_cfsdi_unmask,
		};

		static int s3c2412_irq_rtc_wake(unsigned int irqno, unsigned int state)
		static int s3c2412_irq_rtc_wake(struct irq_data *data, unsigned int state)
		{
		unsigned long pwrcfg;

		@@ -165,7 +165,7 @@ static int s3c2412_irq_rtc_wake(unsigned int irqno, unsigned int state)
		pwrcfg \|= S3C2412_PWRCFG_RTC_MASKIRQ;
		__raw_writel(pwrcfg, S3C2412_PWRCFG);

		return s3c_irq_chip.set_wake(irqno, state);
		return s3c_irq_chip.irq_set_wake(data, state);
		}

		static struct irq_chip s3c2412_irq_rtc_chip;
		@@ -193,7 +193,7 @@ static int s3c2412_irq_add(struct sys_device *sysdev)
		/* change RTC IRQ's set wake method */

		s3c2412_irq_rtc_chip = s3c_irq_chip;
		s3c2412_irq_rtc_chip.set_wake = s3c2412_irq_rtc_wake;
		s3c2412_irq_rtc_chip.irq_set_wake = s3c2412_irq_rtc_wake;

		set_irq_chip(IRQ_RTC, &s3c2412_irq_rtc_chip);

arch/arm/mach-s3c2416/irq.c

+36 −40

Original line number	Diff line number	Diff line
		@@ -77,28 +77,27 @@ static void s3c2416_irq_demux_wdtac97(unsigned int irq, struct irq_desc *desc)
		#define INTMSK_WDTAC97 (1UL << (IRQ_WDT - IRQ_EINT0))
		#define SUBMSK_WDTAC97 INTMSK(IRQ_S3C2443_WDT, IRQ_S3C2443_AC97)

		static void s3c2416_irq_wdtac97_mask(unsigned int irqno)
		static void s3c2416_irq_wdtac97_mask(struct irq_data *data)
		{
		s3c_irqsub_mask(irqno, INTMSK_WDTAC97, SUBMSK_WDTAC97);
		s3c_irqsub_mask(data->irq, INTMSK_WDTAC97, SUBMSK_WDTAC97);
		}

		static void s3c2416_irq_wdtac97_unmask(unsigned int irqno)
		static void s3c2416_irq_wdtac97_unmask(struct irq_data *data)
		{
		s3c_irqsub_unmask(irqno, INTMSK_WDTAC97);
		s3c_irqsub_unmask(data->irq, INTMSK_WDTAC97);
		}

		static void s3c2416_irq_wdtac97_ack(unsigned int irqno)
		static void s3c2416_irq_wdtac97_ack(struct irq_data *data)
		{
		s3c_irqsub_maskack(irqno, INTMSK_WDTAC97, SUBMSK_WDTAC97);
		s3c_irqsub_maskack(data->irq, INTMSK_WDTAC97, SUBMSK_WDTAC97);
		}

		static struct irq_chip s3c2416_irq_wdtac97 = {
		.mask = s3c2416_irq_wdtac97_mask,
		.unmask = s3c2416_irq_wdtac97_unmask,
		.ack = s3c2416_irq_wdtac97_ack,
		.irq_mask = s3c2416_irq_wdtac97_mask,
		.irq_unmask = s3c2416_irq_wdtac97_unmask,
		.irq_ack = s3c2416_irq_wdtac97_ack,
		};


		/* LCD sub interrupts */

		static void s3c2416_irq_demux_lcd(unsigned int irq, struct irq_desc *desc)
		@@ -109,28 +108,27 @@ static void s3c2416_irq_demux_lcd(unsigned int irq, struct irq_desc *desc)
		#define INTMSK_LCD (1UL << (IRQ_LCD - IRQ_EINT0))
		#define SUBMSK_LCD INTMSK(IRQ_S3C2443_LCD1, IRQ_S3C2443_LCD4)

		static void s3c2416_irq_lcd_mask(unsigned int irqno)
		static void s3c2416_irq_lcd_mask(struct irq_data *data)
		{
		s3c_irqsub_mask(irqno, INTMSK_LCD, SUBMSK_LCD);
		s3c_irqsub_mask(data->irq, INTMSK_LCD, SUBMSK_LCD);
		}

		static void s3c2416_irq_lcd_unmask(unsigned int irqno)
		static void s3c2416_irq_lcd_unmask(struct irq_data *data)
		{
		s3c_irqsub_unmask(irqno, INTMSK_LCD);
		s3c_irqsub_unmask(data->irq, INTMSK_LCD);
		}

		static void s3c2416_irq_lcd_ack(unsigned int irqno)
		static void s3c2416_irq_lcd_ack(struct irq_data *data)
		{
		s3c_irqsub_maskack(irqno, INTMSK_LCD, SUBMSK_LCD);
		s3c_irqsub_maskack(data->irq, INTMSK_LCD, SUBMSK_LCD);
		}

		static struct irq_chip s3c2416_irq_lcd = {
		.mask = s3c2416_irq_lcd_mask,
		.unmask = s3c2416_irq_lcd_unmask,
		.ack = s3c2416_irq_lcd_ack,
		.irq_mask = s3c2416_irq_lcd_mask,
		.irq_unmask = s3c2416_irq_lcd_unmask,
		.irq_ack = s3c2416_irq_lcd_ack,
		};


		/* DMA sub interrupts */

		static void s3c2416_irq_demux_dma(unsigned int irq, struct irq_desc *desc)
		@@ -142,28 +140,27 @@ static void s3c2416_irq_demux_dma(unsigned int irq, struct irq_desc *desc)
		#define SUBMSK_DMA INTMSK(IRQ_S3C2443_DMA0, IRQ_S3C2443_DMA5)


		static void s3c2416_irq_dma_mask(unsigned int irqno)
		static void s3c2416_irq_dma_mask(struct irq_data *data)
		{
		s3c_irqsub_mask(irqno, INTMSK_DMA, SUBMSK_DMA);
		s3c_irqsub_mask(data->irq, INTMSK_DMA, SUBMSK_DMA);
		}

		static void s3c2416_irq_dma_unmask(unsigned int irqno)
		static void s3c2416_irq_dma_unmask(struct irq_data *data)
		{
		s3c_irqsub_unmask(irqno, INTMSK_DMA);
		s3c_irqsub_unmask(data->irq, INTMSK_DMA);
		}

		static void s3c2416_irq_dma_ack(unsigned int irqno)
		static void s3c2416_irq_dma_ack(struct irq_data *data)
		{
		s3c_irqsub_maskack(irqno, INTMSK_DMA, SUBMSK_DMA);
		s3c_irqsub_maskack(data->irq, INTMSK_DMA, SUBMSK_DMA);
		}

		static struct irq_chip s3c2416_irq_dma = {
		.mask = s3c2416_irq_dma_mask,
		.unmask = s3c2416_irq_dma_unmask,
		.ack = s3c2416_irq_dma_ack,
		.irq_mask = s3c2416_irq_dma_mask,
		.irq_unmask = s3c2416_irq_dma_unmask,
		.irq_ack = s3c2416_irq_dma_ack,
		};


		/* UART3 sub interrupts */

		static void s3c2416_irq_demux_uart3(unsigned int irq, struct irq_desc *desc)
		@@ -174,28 +171,27 @@ static void s3c2416_irq_demux_uart3(unsigned int irq, struct irq_desc *desc)
		#define INTMSK_UART3 (1UL << (IRQ_S3C2443_UART3 - IRQ_EINT0))
		#define SUBMSK_UART3 (0x7 << (IRQ_S3C2443_RX3 - S3C2410_IRQSUB(0)))

		static void s3c2416_irq_uart3_mask(unsigned int irqno)
		static void s3c2416_irq_uart3_mask(struct irq_data *data)
		{
		s3c_irqsub_mask(irqno, INTMSK_UART3, SUBMSK_UART3);
		s3c_irqsub_mask(data->irq, INTMSK_UART3, SUBMSK_UART3);
		}

		static void s3c2416_irq_uart3_unmask(unsigned int irqno)
		static void s3c2416_irq_uart3_unmask(struct irq_data *data)
		{
		s3c_irqsub_unmask(irqno, INTMSK_UART3);
		s3c_irqsub_unmask(data->irq, INTMSK_UART3);
		}

		static void s3c2416_irq_uart3_ack(unsigned int irqno)
		static void s3c2416_irq_uart3_ack(struct irq_data *data)
		{
		s3c_irqsub_maskack(irqno, INTMSK_UART3, SUBMSK_UART3);
		s3c_irqsub_maskack(data->irq, INTMSK_UART3, SUBMSK_UART3);
		}

		static struct irq_chip s3c2416_irq_uart3 = {
		.mask = s3c2416_irq_uart3_mask,
		.unmask = s3c2416_irq_uart3_unmask,
		.ack = s3c2416_irq_uart3_ack,
		.irq_mask = s3c2416_irq_uart3_mask,
		.irq_unmask = s3c2416_irq_uart3_unmask,
		.irq_ack = s3c2416_irq_uart3_ack,
		};


		/* IRQ initialisation code */

		static int __init s3c2416_add_sub(unsigned int base,

arch/arm/mach-s3c2440/irq.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -69,27 +69,27 @@ static void s3c_irq_demux_wdtac97(unsigned int irq,
		#define INTMSK_WDT (1UL << (IRQ_WDT - IRQ_EINT0))

		static void
		s3c_irq_wdtac97_mask(unsigned int irqno)
		s3c_irq_wdtac97_mask(struct irq_data *data)
		{
		s3c_irqsub_mask(irqno, INTMSK_WDT, 3<<13);
		s3c_irqsub_mask(data->irq, INTMSK_WDT, 3 << 13);
		}

		static void
		s3c_irq_wdtac97_unmask(unsigned int irqno)
		s3c_irq_wdtac97_unmask(struct irq_data *data)
		{
		s3c_irqsub_unmask(irqno, INTMSK_WDT);
		s3c_irqsub_unmask(data->irq, INTMSK_WDT);
		}

		static void
		s3c_irq_wdtac97_ack(unsigned int irqno)
		s3c_irq_wdtac97_ack(struct irq_data *data)
		{
		s3c_irqsub_maskack(irqno, INTMSK_WDT, 3<<13);
		s3c_irqsub_maskack(data->irq, INTMSK_WDT, 3 << 13);
		}

		static struct irq_chip s3c_irq_wdtac97 = {
		.mask = s3c_irq_wdtac97_mask,
		.unmask = s3c_irq_wdtac97_unmask,
		.ack = s3c_irq_wdtac97_ack,
		.irq_mask = s3c_irq_wdtac97_mask,
		.irq_unmask = s3c_irq_wdtac97_unmask,
		.irq_ack = s3c_irq_wdtac97_ack,
		};

		static int s3c2440_irq_add(struct sys_device *sysdev)

arch/arm/mach-s3c2440/s3c244x-irq.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -68,27 +68,27 @@ static void s3c_irq_demux_cam(unsigned int irq,
		#define INTMSK_CAM (1UL << (IRQ_CAM - IRQ_EINT0))

		static void
		s3c_irq_cam_mask(unsigned int irqno)
		s3c_irq_cam_mask(struct irq_data *data)
		{
		s3c_irqsub_mask(irqno, INTMSK_CAM, 3<<11);
		s3c_irqsub_mask(data->irq, INTMSK_CAM, 3 << 11);
		}

		static void
		s3c_irq_cam_unmask(unsigned int irqno)
		s3c_irq_cam_unmask(struct irq_data *data)
		{
		s3c_irqsub_unmask(irqno, INTMSK_CAM);
		s3c_irqsub_unmask(data->irq, INTMSK_CAM);
		}

		static void
		s3c_irq_cam_ack(unsigned int irqno)
		s3c_irq_cam_ack(struct irq_data *data)
		{
		s3c_irqsub_maskack(irqno, INTMSK_CAM, 3<<11);
		s3c_irqsub_maskack(data->irq, INTMSK_CAM, 3 << 11);
		}

		static struct irq_chip s3c_irq_cam = {
		.mask = s3c_irq_cam_mask,
		.unmask = s3c_irq_cam_unmask,
		.ack = s3c_irq_cam_ack,
		.irq_mask = s3c_irq_cam_mask,
		.irq_unmask = s3c_irq_cam_unmask,
		.irq_ack = s3c_irq_cam_ack,
		};

		static int s3c244x_irq_add(struct sys_device *sysdev)