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

Commit fe97874a authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Drop omap_hwmod_irq_info 



With the previous patches removing the need for legacy IRQs
now that all of mach-omap2 is booting in device tree only mode,
we can drop struct omap_hwmod_irq_info.

Note that we can now also finally drop omap4_xlate_irq.

Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 3da52167

arch/arm/mach-omap2/common.h

+0 −1
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ extern struct device *omap2_get_iva_device(void); 
extern struct device *omap2_get_l3_device(void);

extern struct device *omap4_get_dsp_device(void);



unsigned int omap4_xlate_irq(unsigned int hwirq);

void omap_gic_of_init(void);



#ifdef CONFIG_CACHE_L2X0

arch/arm/mach-omap2/omap4-common.c

+0 −24
Original line number Diff line number Diff line
@@ -299,30 +299,6 @@ static const struct of_device_id intc_match[] = { 


static struct device_node *intc_node;



unsigned int omap4_xlate_irq(unsigned int hwirq)

{

	struct of_phandle_args irq_data;

	unsigned int irq;



	if (!intc_node)

		intc_node = of_find_matching_node(NULL, intc_match);



	if (WARN_ON(!intc_node))

		return hwirq;



	irq_data.np = intc_node;

	irq_data.args_count = 3;

	irq_data.args[0] = 0;

	irq_data.args[1] = hwirq - OMAP44XX_IRQ_GIC_START;

	irq_data.args[2] = IRQ_TYPE_LEVEL_HIGH;



	irq = irq_create_of_mapping(&irq_data);

	if (WARN_ON(!irq))

		irq = hwirq;



	return irq;

}



void __init omap_gic_of_init(void)

{

	struct device_node *np;

arch/arm/mach-omap2/omap_hwmod.c

+4 −96
Original line number Diff line number Diff line
@@ -1101,29 +1101,6 @@ static int _omap4_wait_target_disable(struct omap_hwmod *oh) 
					oh->prcm.omap4.clkctrl_offs, 0);

}



/**

 * _count_mpu_irqs - count the number of MPU IRQ lines associated with @oh

 * @oh: struct omap_hwmod *oh

 *

 * Count and return the number of MPU IRQs associated with the hwmod

 * @oh.  Used to allocate struct resource data.  Returns 0 if @oh is

 * NULL.

 */

static int _count_mpu_irqs(struct omap_hwmod *oh)

{

	struct omap_hwmod_irq_info *ohii;

	int i = 0;



	if (!oh || !oh->mpu_irqs)

		return 0;



	do {

		ohii = &oh->mpu_irqs[i++];

	} while (ohii->irq != -1);



	return i-1;

}



/**

 * _count_sdma_reqs - count the number of SDMA request lines associated with @oh

 * @oh: struct omap_hwmod *oh
@@ -1170,50 +1147,6 @@ static int _count_ocp_if_addr_spaces(struct omap_hwmod_ocp_if *os) 
	return i-1;

}



/**

 * _get_mpu_irq_by_name - fetch MPU interrupt line number by name

 * @oh: struct omap_hwmod * to operate on

 * @name: pointer to the name of the MPU interrupt number to fetch (optional)

 * @irq: pointer to an unsigned int to store the MPU IRQ number to

 *

 * Retrieve a MPU hardware IRQ line number named by @name associated

 * with the IP block pointed to by @oh.  The IRQ number will be filled

 * into the address pointed to by @dma.  When @name is non-null, the

 * IRQ line number associated with the named entry will be returned.

 * If @name is null, the first matching entry will be returned.  Data

 * order is not meaningful in hwmod data, so callers are strongly

 * encouraged to use a non-null @name whenever possible to avoid

 * unpredictable effects if hwmod data is later added that causes data

 * ordering to change.  Returns 0 upon success or a negative error

 * code upon error.

 */

static int _get_mpu_irq_by_name(struct omap_hwmod *oh, const char *name,

				unsigned int *irq)

{

	int i;

	bool found = false;



	if (!oh->mpu_irqs)

		return -ENOENT;



	i = 0;

	while (oh->mpu_irqs[i].irq != -1) {

		if (name == oh->mpu_irqs[i].name ||

		    !strcmp(name, oh->mpu_irqs[i].name)) {

			found = true;

			break;

		}

		i++;

	}



	if (!found)

		return -ENOENT;



	*irq = oh->mpu_irqs[i].irq;



	return 0;

}



/**

 * _get_sdma_req_by_name - fetch SDMA request line ID by name

 * @oh: struct omap_hwmod * to operate on
@@ -3452,9 +3385,6 @@ int omap_hwmod_count_resources(struct omap_hwmod *oh, unsigned long flags) 
{

	int ret = 0;



	if (flags & IORESOURCE_IRQ)

		ret += _count_mpu_irqs(oh);



	if (flags & IORESOURCE_DMA)

		ret += _count_sdma_reqs(oh);
@@ -3481,25 +3411,10 @@ int omap_hwmod_count_resources(struct omap_hwmod *oh, unsigned long flags) 
int omap_hwmod_fill_resources(struct omap_hwmod *oh, struct resource *res)

{

	struct omap_hwmod_ocp_if *os;

	int i, j, mpu_irqs_cnt, sdma_reqs_cnt, addr_cnt;

	int i, j, sdma_reqs_cnt, addr_cnt;

	int r = 0;



	/* For each IRQ, DMA, memory area, fill in array.*/



	mpu_irqs_cnt = _count_mpu_irqs(oh);

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

		unsigned int irq;



		if (oh->xlate_irq)

			irq = oh->xlate_irq((oh->mpu_irqs + i)->irq);

		else

			irq = (oh->mpu_irqs + i)->irq;

		(res + r)->name = (oh->mpu_irqs + i)->name;

		(res + r)->start = irq;

		(res + r)->end = irq;

		(res + r)->flags = IORESOURCE_IRQ;

		r++;

	}

	/* For each DMA, memory area, fill in array.*/



	sdma_reqs_cnt = _count_sdma_reqs(oh);

	for (i = 0; i < sdma_reqs_cnt; i++) {
@@ -3578,20 +3493,13 @@ int omap_hwmod_get_resource_byname(struct omap_hwmod *oh, unsigned int type, 
				   const char *name, struct resource *rsrc)

{

	int r;

	unsigned int irq, dma;

	unsigned int dma;

	u32 pa_start, pa_end;



	if (!oh || !rsrc)

		return -EINVAL;



	if (type == IORESOURCE_IRQ) {

		r = _get_mpu_irq_by_name(oh, name, &irq);

		if (r)

			return r;



		rsrc->start = irq;

		rsrc->end = irq;

	} else if (type == IORESOURCE_DMA) {

	if (type == IORESOURCE_DMA) {

		r = _get_sdma_req_by_name(oh, name, &dma);

		if (r)

			return r;

arch/arm/mach-omap2/omap_hwmod.h

+0 −17
Original line number Diff line number Diff line
@@ -149,20 +149,6 @@ extern struct omap_hwmod_sysc_fields omap_hwmod_sysc_type3; 
#define DEBUG_AM33XXUART1_FLAGS DEBUG_OMAPUART_FLAGS

#endif



/**

 * struct omap_hwmod_irq_info - MPU IRQs used by the hwmod

 * @name: name of the IRQ channel (module local name)

 * @irq: IRQ channel ID (should be non-negative except -1 = terminator)

 *

 * @name should be something short, e.g., "tx" or "rx".  It is for use

 * by platform_get_resource_byname().  It is defined locally to the

 * hwmod.

 */

struct omap_hwmod_irq_info {

	const char	*name;

	s16		irq;

};



/**

 * struct omap_hwmod_dma_info - DMA channels used by the hwmod

 * @name: name of the DMA channel (module local name)
@@ -612,7 +598,6 @@ struct omap_hwmod_class { 
 * @name: name of the hwmod

 * @class: struct omap_hwmod_class * to the class of this hwmod

 * @od: struct omap_device currently associated with this hwmod (internal use)

 * @mpu_irqs: ptr to an array of MPU IRQs

 * @sdma_reqs: ptr to an array of System DMA request IDs

 * @prcm: PRCM data pertaining to this hwmod

 * @main_clk: main clock: OMAP clock name
@@ -656,7 +641,6 @@ struct omap_hwmod { 
	const char			*name;

	struct omap_hwmod_class		*class;

	struct omap_device		*od;

	struct omap_hwmod_irq_info	*mpu_irqs;

	struct omap_hwmod_dma_info	*sdma_reqs;

	struct omap_hwmod_rst_info	*rst_lines;

	union {
@@ -676,7 +660,6 @@ struct omap_hwmod { 
	struct lock_class_key		hwmod_key; /* unique lock class */

	struct list_head		node;

	struct omap_hwmod_ocp_if	*_mpu_port;

	unsigned int			(*xlate_irq)(unsigned int);

	u32				flags;

	u8				mpu_rt_idx;

	u8				response_lat;

arch/arm/mach-omap2/omap_hwmod_2420_data.c

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ static struct omap_dma_dev_attr dma_dev_attr = { 
static struct omap_hwmod omap2420_dma_system_hwmod = {

	.name		= "dma",

	.class		= &omap2xxx_dma_hwmod_class,

	.mpu_irqs	= omap2_dma_system_irqs,

	.main_clk	= "core_l3_ck",

	.dev_attr	= &dma_dev_attr,

	.flags		= HWMOD_NO_IDLEST,