diff options
| author | Bartosz Golaszewski <bgolaszewski@baylibre.com> | 2019-02-14 15:52:00 +0100 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2019-02-19 19:40:38 +0530 |
| commit | fb746842f60350f4654b265364c022219614239c (patch) | |
| tree | 10f7ec3a170fd645a49844bc5d503bde3cc7cd48 | |
| parent | e3a8c7631d45c621a78f0cb186ac7a09d9642858 (diff) | |
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: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: David Lechner <david@lechnology.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
| -rw-r--r-- | arch/arm/mach-davinci/common.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/cp_intc.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/common.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/irq.c | 1 |
4 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c index df9d685d9bc9..ae61d19f9b3a 100644 --- a/arch/arm/mach-davinci/common.c +++ b/arch/arm/mach-davinci/common.c @@ -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; diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index 19874f5ef542..4e293cde20fb 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -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); diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index 34e48de92dcc..3d45b73b9a64 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -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; diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index 2e3426ebfd97..b27b90dc269c 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -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) |