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

Commit ef9f2fa1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra 

* 'for-linus' of git://android.git.kernel.org/kernel/tegra:
  ARM: tegra: clock: Add forward reference to struct clk
  ARM: tegra: irq: Rename gic pointers to avoid conflicts
  arm/tegra: Fix tegra irq_data conversion
parents 1f0324ca b48b5f51

arch/arm/mach-tegra/gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -207,9 +207,9 @@ static int tegra_gpio_irq_set_type(struct irq_data *d, unsigned int type) 
	spin_unlock_irqrestore(&bank->lvl_lock[port], flags);



	if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))

		__set_irq_handler_unlocked(irq, handle_level_irq);

		__set_irq_handler_unlocked(d->irq, handle_level_irq);

	else if (type & (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING))

		__set_irq_handler_unlocked(irq, handle_edge_irq);

		__set_irq_handler_unlocked(d->irq, handle_edge_irq);



	return 0;

}

arch/arm/mach-tegra/include/mach/clk.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#ifndef __MACH_CLK_H

#define __MACH_CLK_H



struct clk;



void tegra_periph_reset_deassert(struct clk *c);

void tegra_periph_reset_assert(struct clk *c);

arch/arm/mach-tegra/include/mach/clkdev.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#ifndef __MACH_CLKDEV_H

#define __MACH_CLKDEV_H



struct clk;



static inline int __clk_get(struct clk *clk)

{

	return 1;

arch/arm/mach-tegra/irq.c

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

#define ICTLR_COP_IEP_CLASS	0x3c



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

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

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

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



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

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)

{

	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);

}



static void tegra_unmask(struct irq_data *d)

{

	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);

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



	gic = get_irq_chip(29);

	gic_unmask_irq = gic->irq_unmask;

	gic_mask_irq = gic->irq_mask;

	tegra_gic_unmask_irq = gic->irq_unmask;

	tegra_gic_mask_irq = gic->irq_mask;

	tegra_irq.irq_ack = gic->irq_ack;

#ifdef CONFIG_SMP

	tegra_irq.irq_set_affinity = gic->irq_set_affinity;