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

Commit 83f230f1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: spear: move identical headers to plat-spear/include/mach 



As an intermediate step towards unification of the three spear
platforms, this gets rid of the mach/* header files that are
obviously not platform specific.

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

arch/arm/mach-spear13xx/include/mach/debug-macro.S

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-spear13xx/include/mach/debug-macro.S

 *

 * Debugging macro include header spear13xx machine family

 *

 * Copyright (C) 2012 ST Microelectronics

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

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2. This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



#include <plat/debug-macro.S>

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

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/*

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

 *

 * SPEAr3XX machine family specific timex definitions

 *

 * Copyright (C) 2012 ST Microelectronics

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

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2. This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



#ifndef __MACH_TIMEX_H

#define __MACH_TIMEX_H



#include <plat/timex.h>



#endif /* __MACH_TIMEX_H */

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

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/*

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

 *

 * Serial port stubs for kernel decompress status messages

 *

 * Copyright (C) 2012 ST Microelectronics

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

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2. This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



#ifndef __MACH_UNCOMPRESS_H

#define __MACH_UNCOMPRESS_H



#include <plat/uncompress.h>



#endif /* __MACH_UNCOMPRESS_H */

arch/arm/mach-spear3xx/include/mach/debug-macro.S

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-spear3xx/include/mach/debug-macro.S

 *

 * Debugging macro include header spear3xx machine family

 *

 * Copyright (C) 2009 ST Microelectronics

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

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2. This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



#include <plat/debug-macro.S>

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

deleted100644 → 0
+0 −58
Original line number Diff line number Diff line 
/*

 * spear machine family generic header file

 *

 * 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

 * License version 2. This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



#ifndef __MACH_GENERIC_H

#define __MACH_GENERIC_H



#include <linux/dmaengine.h>

#include <linux/amba/pl08x.h>

#include <linux/init.h>

#include <asm/mach/time.h>



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



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 */