Commit b388bdf2 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Marc Zyngier
Browse files

irqchip/renesas-intc-irqpin: Merge irlm_bit and needs_irlm 



Get rid of the separate flag to indicate if the IRLM bit is present in
the INTC/Interrupt Control Register 0, by considering -1 an invalid
irlm_bit value.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20201028153955.1736767-1-geert+renesas@glider.be
parent f9ac7bbd

drivers/irqchip/irq-renesas-intc-irqpin.c

+3 −5
Original line number Diff line number Diff line
@@ -71,8 +71,7 @@ struct intc_irqpin_priv { 
};



struct intc_irqpin_config {

	unsigned int irlm_bit;

	unsigned needs_irlm:1;

	int irlm_bit;		/* -1 if non-existent */

};



static unsigned long intc_irqpin_read32(void __iomem *iomem)
@@ -349,11 +348,10 @@ static const struct irq_domain_ops intc_irqpin_irq_domain_ops = { 


static const struct intc_irqpin_config intc_irqpin_irlm_r8a777x = {

	.irlm_bit = 23, /* ICR0.IRLM0 */

	.needs_irlm = 1,

};



static const struct intc_irqpin_config intc_irqpin_rmobile = {

	.needs_irlm = 0,

	.irlm_bit = -1,

};



static const struct of_device_id intc_irqpin_dt_ids[] = {
@@ -470,7 +468,7 @@ static int intc_irqpin_probe(struct platform_device *pdev) 
	}



	/* configure "individual IRQ mode" where needed */

	if (config && config->needs_irlm) {

	if (config && config->irlm_bit >= 0) {

		if (io[INTC_IRQPIN_REG_IRLM])

			intc_irqpin_read_modify_write(p, INTC_IRQPIN_REG_IRLM,

						      config->irlm_bit, 1, 1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE