Commit 882c626d authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Li Yang
Browse files

soc: fsl: qe: simplify qe_ic_init() 



qe_ic_init() takes a flags parameter, but all callers (including the
sole remaining one) have always passed 0. So remove that parameter and
simplify the body accordingly. We still explicitly initialize the
Interrupt Configuration Register (CICR) to its reset value of
all-zeroes, just in case the bootloader has played funny games.

Reviewed-by: default avatarTimur Tabi <timur@kernel.org>
Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarLi Yang <leoyang.li@nxp.com>
parent 5bd20222

drivers/soc/fsl/qe/qe_ic.c

+4 −23
Original line number Diff line number Diff line
@@ -356,13 +356,13 @@ static void qe_ic_cascade_muxed_mpic(struct irq_desc *desc) 
	chip->irq_eoi(&desc->irq_data);

}



static void __init qe_ic_init(struct device_node *node, unsigned int flags)

static void __init qe_ic_init(struct device_node *node)

{

	void (*low_handler)(struct irq_desc *desc);

	void (*high_handler)(struct irq_desc *desc);

	struct qe_ic *qe_ic;

	struct resource res;

	u32 temp = 0, ret;

	u32 ret;



	ret = of_address_to_resource(node, 0, &res);

	if (ret)
@@ -399,26 +399,7 @@ static void __init qe_ic_init(struct device_node *node, unsigned int flags) 
		high_handler = NULL;

	}



	/* default priority scheme is grouped. If spread mode is    */

	/* required, configure cicr accordingly.                    */

	if (flags & QE_IC_SPREADMODE_GRP_W)

		temp |= CICR_GWCC;

	if (flags & QE_IC_SPREADMODE_GRP_X)

		temp |= CICR_GXCC;

	if (flags & QE_IC_SPREADMODE_GRP_Y)

		temp |= CICR_GYCC;

	if (flags & QE_IC_SPREADMODE_GRP_Z)

		temp |= CICR_GZCC;

	if (flags & QE_IC_SPREADMODE_GRP_RISCA)

		temp |= CICR_GRTA;

	if (flags & QE_IC_SPREADMODE_GRP_RISCB)

		temp |= CICR_GRTB;



	/* choose destination signal for highest priority interrupt */

	if (flags & QE_IC_HIGH_SIGNAL)

		temp |= (SIGNAL_HIGH << CICR_HPIT_SHIFT);



	qe_ic_write(qe_ic->regs, QEIC_CICR, temp);

	qe_ic_write(qe_ic->regs, QEIC_CICR, 0);



	irq_set_handler_data(qe_ic->virq_low, qe_ic);

	irq_set_chained_handler(qe_ic->virq_low, low_handler);
@@ -439,7 +420,7 @@ static int __init qe_ic_of_init(void) 
		if (!np)

			return -ENODEV;

	}

	qe_ic_init(np, 0);

	qe_ic_init(np);

	of_node_put(np);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE