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

Commit 0f561511 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

irqchip: exynos: cleanup non-DT stuff in exynos-combiner 



For EXYNOS SoCs, only can support for DT so removes non-DT stuff
in exynos-combiner.

Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent ad81f054

drivers/irqchip/exynos-combiner.c

+1 −43
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ 
#include <linux/of_irq.h>

#include <asm/mach/irq.h>



#ifdef CONFIG_EXYNOS_ATAGS

#include <plat/cpu.h>

#endif



#include "irqchip.h"



#define COMBINER_ENABLE_SET	0x0
@@ -138,7 +134,6 @@ static void __init combiner_init_one(struct combiner_chip_data *combiner_data, 
	__raw_writel(combiner_data->irq_mask, base + COMBINER_ENABLE_CLEAR);

}



#ifdef CONFIG_OF

static int combiner_irq_domain_xlate(struct irq_domain *d,

				     struct device_node *controller,

				     const u32 *intspec, unsigned int intsize,
@@ -156,16 +151,6 @@ static int combiner_irq_domain_xlate(struct irq_domain *d, 


	return 0;

}

#else

static int combiner_irq_domain_xlate(struct irq_domain *d,

				     struct device_node *controller,

				     const u32 *intspec, unsigned int intsize,

				     unsigned long *out_hwirq,

				     unsigned int *out_type)

{

	return -EINVAL;

}

#endif



static int combiner_irq_domain_map(struct irq_domain *d, unsigned int irq,

				   irq_hw_number_t hw)
@@ -184,26 +169,6 @@ static struct irq_domain_ops combiner_irq_domain_ops = { 
	.map	= combiner_irq_domain_map,

};



static unsigned int combiner_lookup_irq(int group)

{

#ifdef CONFIG_EXYNOS_ATAGS

	if (group < EXYNOS4210_MAX_COMBINER_NR || soc_is_exynos5250())

		return IRQ_SPI(group);



	switch (group) {

	case 16:

		return IRQ_SPI(107);

	case 17:

		return IRQ_SPI(108);

	case 18:

		return IRQ_SPI(48);

	case 19:

		return IRQ_SPI(42);

	}

#endif

	return 0;

}



static void __init combiner_init(void __iomem *combiner_base,

				 struct device_node *np,

				 unsigned int max_nr,
@@ -229,12 +194,7 @@ static void __init combiner_init(void __iomem *combiner_base, 
	}



	for (i = 0; i < max_nr; i++) {

#ifdef CONFIG_OF

		if (np)

		irq = irq_of_parse_and_map(np, i);

		else

#endif

			irq = combiner_lookup_irq(i);



		combiner_init_one(&combiner_data[i], i,

				  combiner_base + (i >> 2) * 0x10, irq);
@@ -242,7 +202,6 @@ static void __init combiner_init(void __iomem *combiner_base, 
	}

}



#ifdef CONFIG_OF

static int __init combiner_of_init(struct device_node *np,

				   struct device_node *parent)

{
@@ -275,4 +234,3 @@ static int __init combiner_of_init(struct device_node *np, 
}

IRQCHIP_DECLARE(exynos4210_combiner, "samsung,exynos4210-combiner",

		combiner_of_init);
 
#endif