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

Commit cc939754 authored by Colin Cross's avatar Colin Cross
Browse files

ARM: tegra: irq: Rename gic pointers to avoid conflicts 



A future patch will export gic_mask_irq and gic_unmask_irq.
Rename the pointers in arch/arm/mach-tegra/irq.c to avoid
a compile error.

Signed-off-by: default avatarColin Cross <ccross@android.com>
parent 867996cb

arch/arm/mach-tegra/irq.c

+9 −9
Original line number Original line Diff line number Diff line
@@ -46,8 +46,8 @@ 
#define ICTLR_COP_IER_CLR	0x38

#define ICTLR_COP_IER_CLR	0x38

#define ICTLR_COP_IEP_CLASS	0x3c

#define ICTLR_COP_IEP_CLASS	0x3c





static void (*gic_mask_irq)(struct irq_data *d);

static void (*tegra_gic_mask_irq)(struct irq_data *d);

static void (*gic_unmask_irq)(struct irq_data *d);

static void (*tegra_gic_unmask_irq)(struct irq_data *d);





#define irq_to_ictlr(irq) (((irq) - 32) >> 5)

#define irq_to_ictlr(irq) (((irq) - 32) >> 5)

static void __iomem *tegra_ictlr_base = IO_ADDRESS(TEGRA_PRIMARY_ICTLR_BASE);

static void __iomem *tegra_ictlr_base = IO_ADDRESS(TEGRA_PRIMARY_ICTLR_BASE);
@@ -56,14 +56,14 @@ static void __iomem *tegra_ictlr_base = IO_ADDRESS(TEGRA_PRIMARY_ICTLR_BASE); 
static void tegra_mask(struct irq_data *d)

static void tegra_mask(struct irq_data *d)

{

{

	void __iomem *addr = ictlr_to_virt(irq_to_ictlr(d->irq));

	void __iomem *addr = ictlr_to_virt(irq_to_ictlr(d->irq));

	gic_mask_irq(d);

	tegra_gic_mask_irq(d);

	writel(1 << (d->irq & 31), addr+ICTLR_CPU_IER_CLR);

	writel(1 << (d->irq & 31), addr+ICTLR_CPU_IER_CLR);

}

}





static void tegra_unmask(struct irq_data *d)

static void tegra_unmask(struct irq_data *d)

{

{

	void __iomem *addr = ictlr_to_virt(irq_to_ictlr(d->irq));

	void __iomem *addr = ictlr_to_virt(irq_to_ictlr(d->irq));

	gic_unmask_irq(d);

	tegra_gic_unmask_irq(d);

	writel(1<<(d->irq&31), addr+ICTLR_CPU_IER_SET);

	writel(1<<(d->irq&31), addr+ICTLR_CPU_IER_SET);

}

}
@@ -98,8 +98,8 @@ void __init tegra_init_irq(void) 
		 IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x100));

		 IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x100));





	gic = get_irq_chip(29);

	gic = get_irq_chip(29);

	gic_unmask_irq = gic->irq_unmask;

	tegra_gic_unmask_irq = gic->irq_unmask;

	gic_mask_irq = gic->irq_mask;

	tegra_gic_mask_irq = gic->irq_mask;

	tegra_irq.irq_ack = gic->irq_ack;

	tegra_irq.irq_ack = gic->irq_ack;

#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

	tegra_irq.irq_set_affinity = gic->irq_set_affinity;

	tegra_irq.irq_set_affinity = gic->irq_set_affinity;