mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-21 08:19:28 +00:00
Code Issues Releases Wiki Activity

irqchip/sun4i: Move IC specific register offsets to struct

Browse source 
This patch moves IC specific register offsets to sun4i_irq_chip_data
struct in order to support different chips.

Signed-off-by: Mesih Kilinc <mesihkilinc@gmail.com>
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
This commit is contained in:
Mesih Kilinc 2018-12-02 23:23:40 +03:00 committed by Marc Zyngier
parent 177304cf92
commit d4fc2ea0f0
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/irqchip/irq-sun4i.c
View file

@ -28,12 +28,16 @@
#define SUN4I_IRQ_NMI_CTRL_REG 0x0c #define SUN4I_IRQ_NMI_CTRL_REG 0x0c
#define SUN4I_IRQ_PENDING_REG(x) (0x10 + 0x4 * x) #define SUN4I_IRQ_PENDING_REG(x) (0x10 + 0x4 * x)
#define SUN4I_IRQ_FIQ_PENDING_REG(x) (0x20 + 0x4 * x) #define SUN4I_IRQ_FIQ_PENDING_REG(x) (0x20 + 0x4 * x)
#define SUN4I_IRQ_ENABLE_REG(x) (0x40 + 0x4 * x) #define SUN4I_IRQ_ENABLE_REG(data, x) ((data)->enable_reg_offset + 0x4 * x)
#define SUN4I_IRQ_MASK_REG(x) (0x50 + 0x4 * x) #define SUN4I_IRQ_MASK_REG(data, x) ((data)->mask_reg_offset + 0x4 * x)
#define SUN4I_IRQ_ENABLE_REG_OFFSET 0x40
#define SUN4I_IRQ_MASK_REG_OFFSET 0x50
struct sun4i_irq_chip_data { struct sun4i_irq_chip_data {
void __iomem *irq_base; void __iomem *irq_base;
struct irq_domain *irq_domain; struct irq_domain *irq_domain;
u32 enable_reg_offset;
u32 mask_reg_offset;
}; };
static struct sun4i_irq_chip_data *irq_ic_data; static struct sun4i_irq_chip_data *irq_ic_data;
@ -57,9 +61,10 @@ static void sun4i_irq_mask(struct irq_data *irqd)
int reg = irq / 32; int reg = irq / 32;
u32 val; u32 val;
val = readl(irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(reg)); val = readl(irq_ic_data->irq_base +
SUN4I_IRQ_ENABLE_REG(irq_ic_data, reg));
writel(val & ~(1 << irq_off), writel(val & ~(1 << irq_off),
irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(reg)); irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(irq_ic_data, reg));
} }
static void sun4i_irq_unmask(struct irq_data *irqd) static void sun4i_irq_unmask(struct irq_data *irqd)
@ -69,9 +74,10 @@ static void sun4i_irq_unmask(struct irq_data *irqd)
int reg = irq / 32; int reg = irq / 32;
u32 val; u32 val;
val = readl(irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(reg)); val = readl(irq_ic_data->irq_base +
SUN4I_IRQ_ENABLE_REG(irq_ic_data, reg));
writel(val | (1 << irq_off), writel(val | (1 << irq_off),
irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(reg)); irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(irq_ic_data, reg));
} }
static struct irq_chip sun4i_irq_chip = { static struct irq_chip sun4i_irq_chip = {
@ -105,20 +111,23 @@ static int __init sun4i_of_init(struct device_node *node,
return -ENOMEM; return -ENOMEM;
} }
irq_ic_data->enable_reg_offset = SUN4I_IRQ_ENABLE_REG_OFFSET;
irq_ic_data->mask_reg_offset = SUN4I_IRQ_MASK_REG_OFFSET;
irq_ic_data->irq_base = of_iomap(node, 0); irq_ic_data->irq_base = of_iomap(node, 0);
if (!irq_ic_data->irq_base) if (!irq_ic_data->irq_base)
panic("%pOF: unable to map IC registers\n", panic("%pOF: unable to map IC registers\n",
node); node);
/* Disable all interrupts */ /* Disable all interrupts */
writel(0, irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(0)); writel(0, irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(irq_ic_data, 0));
writel(0, irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(1)); writel(0, irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(irq_ic_data, 1));
writel(0, irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(2)); writel(0, irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(irq_ic_data, 2));
/* Unmask all the interrupts, ENABLE_REG(x) is used for masking */ /* Unmask all the interrupts, ENABLE_REG(x) is used for masking */
writel(0, irq_ic_data->irq_base + SUN4I_IRQ_MASK_REG(0)); writel(0, irq_ic_data->irq_base + SUN4I_IRQ_MASK_REG(irq_ic_data, 0));
writel(0, irq_ic_data->irq_base + SUN4I_IRQ_MASK_REG(1)); writel(0, irq_ic_data->irq_base + SUN4I_IRQ_MASK_REG(irq_ic_data, 1));
writel(0, irq_ic_data->irq_base + SUN4I_IRQ_MASK_REG(2)); writel(0, irq_ic_data->irq_base + SUN4I_IRQ_MASK_REG(irq_ic_data, 2));
/* Clear all the pending interrupts */ /* Clear all the pending interrupts */
writel(0xffffffff, irq_ic_data->irq_base + SUN4I_IRQ_PENDING_REG(0)); writel(0xffffffff, irq_ic_data->irq_base + SUN4I_IRQ_PENDING_REG(0));