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

Commit fb746842 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Sekhar Nori
Browse files

ARM: davinci: pull davinci_intc_base into the respective intc drivers 



davinci_intc_base is defined globally in common.c. Define separate
local variables for the aintc and cp-intc drivers and remove the
global one.

Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: default avatarDavid Lechner <david@lechnology.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent e3a8c763

arch/arm/mach-davinci/common.c

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
struct davinci_soc_info davinci_soc_info;

EXPORT_SYMBOL(davinci_soc_info);



void __iomem *davinci_intc_base;



static int __init davinci_init_id(struct davinci_soc_info *soc_info)

{

	int			i;

arch/arm/mach-davinci/cp_intc.c

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#define DAVINCI_CP_INTC_PRI_INDX_MASK		GENMASK(9, 0)

#define DAVINCI_CP_INTC_GPIR_NONE		BIT(31)



static void __iomem *davinci_intc_base;



static inline unsigned int cp_intc_read(unsigned offset)

{

	return __raw_readl(davinci_intc_base + offset);

arch/arm/mach-davinci/include/mach/common.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
void davinci_timer_init(struct clk *clk);



extern void davinci_irq_init(void);

extern void __iomem *davinci_intc_base;



struct davinci_timer_instance {

	u32		base;

arch/arm/mach-davinci/irq.c

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#define IRQ_INTPRI0_REG_OFFSET	0x0030

#define IRQ_INTPRI7_REG_OFFSET	0x004C



static void __iomem *davinci_intc_base;

static struct irq_domain *davinci_irq_domain;



static inline void davinci_irq_writel(unsigned long value, int offset)