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

Commit 54475210 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: spear: unify mach/generic.h and mach/irqs.h 



These are indeed easy to combine, as there are no conflicting
definitions in generic.h, and irqs.h will be obsolete once
we enable SPARSE_IRQ.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 17dd1094

arch/arm/mach-spear13xx/include/mach/generic.h

+14 −7
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-spear13xx/include/mach/generic.h

 * spear machine family generic header file

 *

 * spear13xx machine family generic header file

 *

 * Copyright (C) 2012 ST Microelectronics

 * Copyright (C) 2009-2012 ST Microelectronics

 * Rajeev Kumar <rajeev-dlh.kumar@st.com>

 * Viresh Kumar <viresh.linux@gmail.com>

 *

 * This file is licensed under the terms of the GNU General Public
@@ -15,22 +14,30 @@ 
#define __MACH_GENERIC_H



#include <linux/dmaengine.h>

#include <linux/amba/pl08x.h>

#include <linux/init.h>

#include <asm/mach/time.h>



/* Add spear13xx structure declarations here */

extern void spear13xx_timer_init(void);

extern void spear3xx_timer_init(void);

extern struct pl022_ssp_controller pl022_plat_data;

extern struct pl08x_platform_data pl080_plat_data;

extern struct dw_dma_platform_data dmac_plat_data;

extern struct dw_dma_slave cf_dma_priv;

extern struct dw_dma_slave nand_read_dma_priv;

extern struct dw_dma_slave nand_write_dma_priv;

bool dw_dma_filter(struct dma_chan *chan, void *slave);



/* Add spear13xx family function declarations here */

void __init spear_setup_of_timer(void);

void __init spear3xx_clk_init(void);

void __init spear3xx_map_io(void);

void __init spear3xx_dt_init_irq(void);

void __init spear6xx_clk_init(void);

void __init spear13xx_map_io(void);

void __init spear13xx_l2x0_init(void);

bool dw_dma_filter(struct dma_chan *chan, void *slave);



void spear_restart(char, const char *);



void spear13xx_secondary_startup(void);

void __cpuinit spear13xx_cpu_die(unsigned int cpu);

arch/arm/mach-spear13xx/include/mach/irqs.h

+19 −4
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-spear13xx/include/mach/irqs.h

 * IRQ helper macros for spear machine family

 *

 * IRQ helper macros for spear13xx machine family

 *

 * Copyright (C) 2012 ST Microelectronics

 * Copyright (C) 2009-2012 ST Microelectronics

 * Rajeev Kumar <rajeev-dlh.kumar@st.com>

 * Viresh Kumar <viresh.linux@gmail.com>

 *

 * This file is licensed under the terms of the GNU General Public
@@ -14,7 +13,23 @@ 
#ifndef __MACH_IRQS_H

#define __MACH_IRQS_H



#ifdef CONFIG_ARCH_SPEAR3XX

#define NR_IRQS			256

#endif



#ifdef CONFIG_ARCH_SPEAR6XX

/* IRQ definitions */

/* VIC 1 */

#define IRQ_VIC_END				64



/* GPIO pins virtual irqs */

#define VIRTUAL_IRQS				24

#define NR_IRQS					(IRQ_VIC_END + VIRTUAL_IRQS)

#endif



#ifdef CONFIG_ARCH_SPEAR13XX

#define IRQ_GIC_END			160

#define NR_IRQS				IRQ_GIC_END

#endif



#endif /* __MACH_IRQS_H */

arch/arm/mach-spear3xx/include/mach/generic.h

+32 −10
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-spear3xx/generic.h

 * spear machine family generic header file

 *

 * SPEAr3XX machine family generic header file

 *

 * Copyright (C) 2009 ST Microelectronics

 * Copyright (C) 2009-2012 ST Microelectronics

 * Rajeev Kumar <rajeev-dlh.kumar@st.com>

 * Viresh Kumar <viresh.linux@gmail.com>

 *

 * This file is licensed under the terms of the GNU General Public
@@ -14,23 +13,46 @@ 
#ifndef __MACH_GENERIC_H

#define __MACH_GENERIC_H



#include <linux/dmaengine.h>

#include <linux/amba/pl08x.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/amba/bus.h>

#include <asm/mach/time.h>

#include <asm/mach/map.h>



/* Add spear3xx family device structure declarations here */

extern void spear13xx_timer_init(void);

extern void spear3xx_timer_init(void);

extern struct pl022_ssp_controller pl022_plat_data;

extern struct pl08x_platform_data pl080_plat_data;

extern struct dw_dma_platform_data dmac_plat_data;

extern struct dw_dma_slave cf_dma_priv;

extern struct dw_dma_slave nand_read_dma_priv;

extern struct dw_dma_slave nand_write_dma_priv;

bool dw_dma_filter(struct dma_chan *chan, void *slave);



/* Add spear3xx family function declarations here */

void __init spear_setup_of_timer(void);

void __init spear3xx_clk_init(void);

void __init spear3xx_map_io(void);

void __init spear3xx_dt_init_irq(void);

void __init spear6xx_clk_init(void);

void __init spear13xx_map_io(void);

void __init spear13xx_l2x0_init(void);



void spear_restart(char, const char *);



void spear13xx_secondary_startup(void);

void __cpuinit spear13xx_cpu_die(unsigned int cpu);



extern struct smp_operations spear13xx_smp_ops;



#ifdef CONFIG_MACH_SPEAR1310

void __init spear1310_clk_init(void);

#else

static inline void spear1310_clk_init(void) {}

#endif



#ifdef CONFIG_MACH_SPEAR1340

void __init spear1340_clk_init(void);

#else

static inline void spear1340_clk_init(void) {}

#endif



#endif /* __MACH_GENERIC_H */

arch/arm/mach-spear3xx/include/mach/irqs.h

+20 −4
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-spear3xx/include/mach/irqs.h

 * IRQ helper macros for spear machine family

 *

 * IRQ helper macros for SPEAr3xx machine family

 *

 * Copyright (C) 2009 ST Microelectronics

 * Copyright (C) 2009-2012 ST Microelectronics

 * Rajeev Kumar <rajeev-dlh.kumar@st.com>

 * Viresh Kumar <viresh.linux@gmail.com>

 *

 * This file is licensed under the terms of the GNU General Public
@@ -14,6 +13,23 @@ 
#ifndef __MACH_IRQS_H

#define __MACH_IRQS_H



#ifdef CONFIG_ARCH_SPEAR3XX

#define NR_IRQS			256

#endif



#ifdef CONFIG_ARCH_SPEAR6XX

/* IRQ definitions */

/* VIC 1 */

#define IRQ_VIC_END				64



/* GPIO pins virtual irqs */

#define VIRTUAL_IRQS				24

#define NR_IRQS					(IRQ_VIC_END + VIRTUAL_IRQS)

#endif



#ifdef CONFIG_ARCH_SPEAR13XX

#define IRQ_GIC_END			160

#define NR_IRQS				IRQ_GIC_END

#endif



#endif /* __MACH_IRQS_H */

arch/arm/mach-spear3xx/spear320.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/irqchip.h>

#include <linux/of_platform.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <mach/generic.h>

#include <mach/spear.h>