Merge branch 'irqchip/misc' into irqchip/core (e04558cb) · Commits · jan.koester / Linux

drivers/irqchip/exynos-combiner.c

+7 −7

drivers/irqchip/irq-armada-370-xp.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -541,7 +541,7 @@ static void armada_370_xp_mpic_resume(void)
	writel(1, per_cpu_int_base + ARMADA_370_XP_INT_CLEAR_MASK_OFFS);		writel(1, per_cpu_int_base + ARMADA_370_XP_INT_CLEAR_MASK_OFFS);
	}		}

	struct syscore_ops armada_370_xp_mpic_syscore_ops = {		static struct syscore_ops armada_370_xp_mpic_syscore_ops = {
	.suspend = armada_370_xp_mpic_suspend,		.suspend = armada_370_xp_mpic_suspend,
	.resume = armada_370_xp_mpic_resume,		.resume = armada_370_xp_mpic_resume,
	};		};

drivers/irqchip/irq-bcm2836.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -224,7 +224,7 @@ static struct notifier_block bcm2836_arm_irqchip_cpu_notifier = {
	};		};

	#ifdef CONFIG_ARM		#ifdef CONFIG_ARM
	int __init bcm2836_smp_boot_secondary(unsigned int cpu,		static int __init bcm2836_smp_boot_secondary(unsigned int cpu,
	struct task_struct *idle)		struct task_struct *idle)
	{		{
	unsigned long secondary_startup_phys =		unsigned long secondary_startup_phys =

drivers/irqchip/irq-bcm7120-l2.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -215,7 +215,7 @@ static int __init bcm7120_l2_intc_iomap_3380(struct device_node *dn,
	return 0;		return 0;
	}		}

	int __init bcm7120_l2_intc_probe(struct device_node *dn,		static int __init bcm7120_l2_intc_probe(struct device_node *dn,
	struct device_node *parent,		struct device_node *parent,
	int (iomap_regs_fn)(struct device_node ,		int (iomap_regs_fn)(struct device_node ,
	struct bcm7120_l2_intc_data *),		struct bcm7120_l2_intc_data *),
	@@ -339,14 +339,14 @@ int __init bcm7120_l2_intc_probe(struct device_node *dn,
	return ret;		return ret;
	}		}

	int __init bcm7120_l2_intc_probe_7120(struct device_node *dn,		static int __init bcm7120_l2_intc_probe_7120(struct device_node *dn,
	struct device_node *parent)		struct device_node *parent)
	{		{
	return bcm7120_l2_intc_probe(dn, parent, bcm7120_l2_intc_iomap_7120,		return bcm7120_l2_intc_probe(dn, parent, bcm7120_l2_intc_iomap_7120,
	"BCM7120 L2");		"BCM7120 L2");
	}		}

	int __init bcm7120_l2_intc_probe_3380(struct device_node *dn,		static int __init bcm7120_l2_intc_probe_3380(struct device_node *dn,
	struct device_node *parent)		struct device_node *parent)
	{		{
	return bcm7120_l2_intc_probe(dn, parent, bcm7120_l2_intc_iomap_3380,		return bcm7120_l2_intc_probe(dn, parent, bcm7120_l2_intc_iomap_3380,

drivers/irqchip/irq-brcmstb-l2.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -112,7 +112,7 @@ static void brcmstb_l2_intc_resume(struct irq_data *d)
	irq_gc_unlock(gc);		irq_gc_unlock(gc);
	}		}

	int __init brcmstb_l2_intc_of_init(struct device_node *np,		static int __init brcmstb_l2_intc_of_init(struct device_node *np,
	struct device_node *parent)		struct device_node *parent)
	{		{
	unsigned int clr = IRQ_NOREQUEST \| IRQ_NOPROBE \| IRQ_NOAUTOEN;		unsigned int clr = IRQ_NOREQUEST \| IRQ_NOPROBE \| IRQ_NOAUTOEN;

Original line number	Original line	Diff line number	Diff line
	@@ -55,14 +55,14 @@ static void combiner_mask_irq(struct irq_data *data)
	{		{
	u32 mask = 1 << (data->hwirq % 32);		u32 mask = 1 << (data->hwirq % 32);

	__raw_writel(mask, combiner_base(data) + COMBINER_ENABLE_CLEAR);		writel_relaxed(mask, combiner_base(data) + COMBINER_ENABLE_CLEAR);
	}		}

	static void combiner_unmask_irq(struct irq_data *data)		static void combiner_unmask_irq(struct irq_data *data)
	{		{
	u32 mask = 1 << (data->hwirq % 32);		u32 mask = 1 << (data->hwirq % 32);

	__raw_writel(mask, combiner_base(data) + COMBINER_ENABLE_SET);		writel_relaxed(mask, combiner_base(data) + COMBINER_ENABLE_SET);
	}		}

	static void combiner_handle_cascade_irq(struct irq_desc *desc)		static void combiner_handle_cascade_irq(struct irq_desc *desc)
	@@ -75,7 +75,7 @@ static void combiner_handle_cascade_irq(struct irq_desc *desc)
	chained_irq_enter(chip, desc);		chained_irq_enter(chip, desc);

	spin_lock(&irq_controller_lock);		spin_lock(&irq_controller_lock);
	status = __raw_readl(chip_data->base + COMBINER_INT_STATUS);		status = readl_relaxed(chip_data->base + COMBINER_INT_STATUS);
	spin_unlock(&irq_controller_lock);		spin_unlock(&irq_controller_lock);
	status &= chip_data->irq_mask;		status &= chip_data->irq_mask;

	@@ -135,7 +135,7 @@ static void __init combiner_init_one(struct combiner_chip_data *combiner_data,
	combiner_data->parent_irq = irq;		combiner_data->parent_irq = irq;

	/* Disable all interrupts */		/* Disable all interrupts */
	__raw_writel(combiner_data->irq_mask, base + COMBINER_ENABLE_CLEAR);		writel_relaxed(combiner_data->irq_mask, base + COMBINER_ENABLE_CLEAR);
	}		}

	static int combiner_irq_domain_xlate(struct irq_domain *d,		static int combiner_irq_domain_xlate(struct irq_domain *d,
	@@ -218,7 +218,7 @@ static int combiner_suspend(void)

	for (i = 0; i < max_nr; i++)		for (i = 0; i < max_nr; i++)
	combiner_data[i].pm_save =		combiner_data[i].pm_save =
	__raw_readl(combiner_data[i].base + COMBINER_ENABLE_SET);		readl_relaxed(combiner_data[i].base + COMBINER_ENABLE_SET);

	return 0;		return 0;
	}		}
	@@ -235,9 +235,9 @@ static void combiner_resume(void)