ARM: EXYNOS: add interrupt definitions for EXYNOS5250 (bb19a751) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm/mach-exynos/common.c

+71 −30

Original line number	Original line	Diff line number	Diff line
	@@ -345,6 +345,11 @@ static void __init exynos5_map_io(void)
	{		{
	iotable_init(exynos5_iodesc, ARRAY_SIZE(exynos5_iodesc));		iotable_init(exynos5_iodesc, ARRAY_SIZE(exynos5_iodesc));

			s3c_device_i2c0.resource[0].start = EXYNOS5_PA_IIC(0);
			s3c_device_i2c0.resource[0].end = EXYNOS5_PA_IIC(0) + SZ_4K - 1;
			s3c_device_i2c0.resource[1].start = EXYNOS5_IRQ_IIC;
			s3c_device_i2c0.resource[1].end = EXYNOS5_IRQ_IIC;

	/* The I2C bus controllers are directly compatible with s3c2440 */		/* The I2C bus controllers are directly compatible with s3c2440 */
	s3c_i2c0_setname("s3c2440-i2c");		s3c_i2c0_setname("s3c2440-i2c");
	s3c_i2c1_setname("s3c2440-i2c");		s3c_i2c1_setname("s3c2440-i2c");
	@@ -451,7 +456,14 @@ static struct irq_chip combiner_chip = {

	static void __init combiner_cascade_irq(unsigned int combiner_nr, unsigned int irq)		static void __init combiner_cascade_irq(unsigned int combiner_nr, unsigned int irq)
	{		{
	if (combiner_nr >= MAX_COMBINER_NR)		unsigned int max_nr;

			if (soc_is_exynos5250())
			max_nr = EXYNOS5_MAX_COMBINER_NR;
			else
			max_nr = EXYNOS4_MAX_COMBINER_NR;

			if (combiner_nr >= max_nr)
	BUG();		BUG();
	if (irq_set_handler_data(irq, &combiner_data[combiner_nr]) != 0)		if (irq_set_handler_data(irq, &combiner_data[combiner_nr]) != 0)
	BUG();		BUG();
	@@ -462,8 +474,14 @@ static void __init combiner_init(unsigned int combiner_nr, void __iomem *base,
	unsigned int irq_start)		unsigned int irq_start)
	{		{
	unsigned int i;		unsigned int i;
			unsigned int max_nr;

	if (combiner_nr >= MAX_COMBINER_NR)		if (soc_is_exynos5250())
			max_nr = EXYNOS5_MAX_COMBINER_NR;
			else
			max_nr = EXYNOS4_MAX_COMBINER_NR;

			if (combiner_nr >= max_nr)
	BUG();		BUG();

	combiner_data[combiner_nr].base = base;		combiner_data[combiner_nr].base = base;
	@@ -506,7 +524,7 @@ void __init exynos4_init_irq(void)
	of_irq_init(exynos4_dt_irq_match);		of_irq_init(exynos4_dt_irq_match);
	#endif		#endif

	for (irq = 0; irq < MAX_COMBINER_NR; irq++) {		for (irq = 0; irq < EXYNOS4_MAX_COMBINER_NR; irq++) {

	combiner_init(irq, (void __iomem *)S5P_VA_COMBINER(irq),		combiner_init(irq, (void __iomem *)S5P_VA_COMBINER(irq),
	COMBINER_IRQ(irq, 0));		COMBINER_IRQ(irq, 0));
	@@ -527,7 +545,7 @@ void __init exynos5_init_irq(void)

	gic_init(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU);		gic_init(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU);

	for (irq = 0; irq < MAX_COMBINER_NR; irq++) {		for (irq = 0; irq < EXYNOS5_MAX_COMBINER_NR; irq++) {
	combiner_init(irq, (void __iomem *)S5P_VA_COMBINER(irq),		combiner_init(irq, (void __iomem *)S5P_VA_COMBINER(irq),
	COMBINER_IRQ(irq, 0));		COMBINER_IRQ(irq, 0));
	combiner_cascade_irq(irq, IRQ_SPI(irq));		combiner_cascade_irq(irq, IRQ_SPI(irq));
	@@ -651,27 +669,43 @@ static DEFINE_SPINLOCK(eint_lock);

	static unsigned int eint0_15_data[16];		static unsigned int eint0_15_data[16];

	static unsigned int exynos4_get_irq_nr(unsigned int number)		static unsigned int exynos4_eint0_15_src_int[16] = {
	{		EXYNOS4_IRQ_EINT0,
	u32 ret = 0;		EXYNOS4_IRQ_EINT1,
			EXYNOS4_IRQ_EINT2,
	switch (number) {		EXYNOS4_IRQ_EINT3,
	case 0 ... 3:		EXYNOS4_IRQ_EINT4,
	ret = (number + IRQ_EINT0);		EXYNOS4_IRQ_EINT5,
	break;		EXYNOS4_IRQ_EINT6,
	case 4 ... 7:		EXYNOS4_IRQ_EINT7,
	ret = (number + (IRQ_EINT4 - 4));		EXYNOS4_IRQ_EINT8,
	break;		EXYNOS4_IRQ_EINT9,
	case 8 ... 15:		EXYNOS4_IRQ_EINT10,
	ret = (number + (IRQ_EINT8 - 8));		EXYNOS4_IRQ_EINT11,
	break;		EXYNOS4_IRQ_EINT12,
	default:		EXYNOS4_IRQ_EINT13,
	printk(KERN_ERR "number available : %d\n", number);		EXYNOS4_IRQ_EINT14,
	}		EXYNOS4_IRQ_EINT15,
			};
	return ret;
	}

			static unsigned int exynos5_eint0_15_src_int[16] = {
			EXYNOS5_IRQ_EINT0,
			EXYNOS5_IRQ_EINT1,
			EXYNOS5_IRQ_EINT2,
			EXYNOS5_IRQ_EINT3,
			EXYNOS5_IRQ_EINT4,
			EXYNOS5_IRQ_EINT5,
			EXYNOS5_IRQ_EINT6,
			EXYNOS5_IRQ_EINT7,
			EXYNOS5_IRQ_EINT8,
			EXYNOS5_IRQ_EINT9,
			EXYNOS5_IRQ_EINT10,
			EXYNOS5_IRQ_EINT11,
			EXYNOS5_IRQ_EINT12,
			EXYNOS5_IRQ_EINT13,
			EXYNOS5_IRQ_EINT14,
			EXYNOS5_IRQ_EINT15,
			};
	static inline void exynos4_irq_eint_mask(struct irq_data *data)		static inline void exynos4_irq_eint_mask(struct irq_data *data)
	{		{
	u32 mask;		u32 mask;
	@@ -816,7 +850,7 @@ static void exynos4_irq_demux_eint16_31(unsigned int irq, struct irq_desc *desc)
	chained_irq_exit(chip, desc);		chained_irq_exit(chip, desc);
	}		}

	static void exynos4_irq_eint0_15(unsigned int irq, struct irq_desc *desc)		static void exynos_irq_eint0_15(unsigned int irq, struct irq_desc *desc)
	{		{
	u32 *irq_data = irq_get_handler_data(irq);		u32 *irq_data = irq_get_handler_data(irq);
	struct irq_chip *chip = irq_get_chip(irq);		struct irq_chip *chip = irq_get_chip(irq);
	@@ -846,15 +880,22 @@ static int __init exynos4_init_irq_eint(void)
	set_irq_flags(IRQ_EINT(irq), IRQF_VALID);		set_irq_flags(IRQ_EINT(irq), IRQF_VALID);
	}		}

	irq_set_chained_handler(IRQ_EINT16_31, exynos4_irq_demux_eint16_31);		irq_set_chained_handler(EXYNOS_IRQ_EINT16_31, exynos4_irq_demux_eint16_31);

	for (irq = 0 ; irq <= 15 ; irq++) {		for (irq = 0 ; irq <= 15 ; irq++) {
	eint0_15_data[irq] = IRQ_EINT(irq);		eint0_15_data[irq] = IRQ_EINT(irq);

	irq_set_handler_data(exynos4_get_irq_nr(irq),		if (soc_is_exynos5250()) {
			irq_set_handler_data(exynos5_eint0_15_src_int[irq],
	&eint0_15_data[irq]);		&eint0_15_data[irq]);
	irq_set_chained_handler(exynos4_get_irq_nr(irq),		irq_set_chained_handler(exynos5_eint0_15_src_int[irq],
	exynos4_irq_eint0_15);		exynos_irq_eint0_15);
			} else {
			irq_set_handler_data(exynos4_eint0_15_src_int[irq],
			&eint0_15_data[irq]);
			irq_set_chained_handler(exynos4_eint0_15_src_int[irq],
			exynos_irq_eint0_15);
			}
	}		}

	return 0;		return 0;

arch/arm/mach-exynos/dev-ahci.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -242,8 +242,8 @@ static struct resource exynos4_ahci_resource[] = {
	.flags = IORESOURCE_MEM,		.flags = IORESOURCE_MEM,
	},		},
	[1] = {		[1] = {
	.start = IRQ_SATA,		.start = EXYNOS4_IRQ_SATA,
	.end = IRQ_SATA,		.end = EXYNOS4_IRQ_SATA,
	.flags = IORESOURCE_IRQ,		.flags = IORESOURCE_IRQ,
	},		},
	};		};

arch/arm/mach-exynos/dev-audio.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -304,8 +304,8 @@ static struct resource exynos4_ac97_resource[] = {
	.flags = IORESOURCE_DMA,		.flags = IORESOURCE_DMA,
	},		},
	[4] = {		[4] = {
	.start = IRQ_AC97,		.start = EXYNOS4_IRQ_AC97,
	.end = IRQ_AC97,		.end = EXYNOS4_IRQ_AC97,
	.flags = IORESOURCE_IRQ,		.flags = IORESOURCE_IRQ,
	},		},
	};		};

arch/arm/mach-exynos/dma.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -108,7 +108,7 @@ static u8 exynos4212_pdma0_peri[] = {
	struct dma_pl330_platdata exynos4_pdma0_pdata;		struct dma_pl330_platdata exynos4_pdma0_pdata;

	static AMBA_AHB_DEVICE(exynos4_pdma0, "dma-pl330.0", 0x00041330,		static AMBA_AHB_DEVICE(exynos4_pdma0, "dma-pl330.0", 0x00041330,
	EXYNOS4_PA_PDMA0, {IRQ_PDMA0}, &exynos4_pdma0_pdata);		EXYNOS4_PA_PDMA0, {EXYNOS4_IRQ_PDMA0}, &exynos4_pdma0_pdata);

	static u8 exynos4210_pdma1_peri[] = {		static u8 exynos4210_pdma1_peri[] = {
	DMACH_PCM0_RX,		DMACH_PCM0_RX,
	@@ -174,7 +174,7 @@ static u8 exynos4212_pdma1_peri[] = {
	static struct dma_pl330_platdata exynos4_pdma1_pdata;		static struct dma_pl330_platdata exynos4_pdma1_pdata;

	static AMBA_AHB_DEVICE(exynos4_pdma1, "dma-pl330.1", 0x00041330,		static AMBA_AHB_DEVICE(exynos4_pdma1, "dma-pl330.1", 0x00041330,
	EXYNOS4_PA_PDMA1, {IRQ_PDMA1}, &exynos4_pdma1_pdata);		EXYNOS4_PA_PDMA1, {EXYNOS4_IRQ_PDMA1}, &exynos4_pdma1_pdata);

	static u8 mdma_peri[] = {		static u8 mdma_peri[] = {
	DMACH_MTOM_0,		DMACH_MTOM_0,
	@@ -193,7 +193,7 @@ static struct dma_pl330_platdata exynos4_mdma1_pdata = {
	};		};

	static AMBA_AHB_DEVICE(exynos4_mdma1, "dma-pl330.2", 0x00041330,		static AMBA_AHB_DEVICE(exynos4_mdma1, "dma-pl330.2", 0x00041330,
	EXYNOS4_PA_MDMA1, {IRQ_MDMA1}, &exynos4_mdma1_pdata);		EXYNOS4_PA_MDMA1, {EXYNOS4_IRQ_MDMA1}, &exynos4_mdma1_pdata);

	static int __init exynos4_dma_init(void)		static int __init exynos4_dma_init(void)
	{		{

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

+432 −155

File changed.

Preview size limit exceeded, changes collapsed.