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

ARM: spear: remove include/mach/ subdirectory 



Two of the remaining four headers are never used, the other
two are only used inside of the platform code. Move them
next to the files that include them and remove the
Makefile trick that adds the include path.

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

arch/arm/mach-spear/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
# SPEAr Platform specific Makefile

#



ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include



# Common support

obj-y	:= restart.o time.o

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

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

 * IRQ helper macros for spear machine family

 *

 * Copyright (C) 2009-2012 ST Microelectronics

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

 * Viresh Kumar <vireshk@kernel.org>

 *

 * 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_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-spear/include/mach/uncompress.h

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

 * arch/arm/plat-spear/include/plat/uncompress.h

 *

 * Serial port stubs for kernel decompress status messages

 *

 * Copyright (C) 2009 ST Microelectronics

 * Viresh Kumar <vireshk@kernel.org>

 *

 * 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 <linux/io.h>

#include <linux/amba/serial.h>

#include <mach/spear.h>



#ifndef __PLAT_UNCOMPRESS_H

#define __PLAT_UNCOMPRESS_H

/*

 * This does not append a newline

 */

static inline void putc(int c)

{

	void __iomem *base = (void __iomem *)SPEAR_DBG_UART_BASE;



	while (readl_relaxed(base + UART01x_FR) & UART01x_FR_TXFF)

		barrier();



	writel_relaxed(c, base + UART01x_DR);

}



static inline void flush(void)

{

}



/*

 * nothing to do

 */

#define arch_decomp_setup()



#endif /* __PLAT_UNCOMPRESS_H */

arch/arm/mach-spear/include/mach/misc_regs.h→arch/arm/mach-spear/misc_regs.h

+1 −3
Original line number Diff line number Diff line 
/*

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

 *

 * Miscellaneous registers definitions for SPEAr3xx machine family

 *

 * Copyright (C) 2009 ST Microelectronics
@@ -14,7 +12,7 @@ 
#ifndef __MACH_MISC_REGS_H

#define __MACH_MISC_REGS_H



#include <mach/spear.h>

#include "spear.h"



#define MISC_BASE		(VA_SPEAR_ICM3_MISC_REG_BASE)

#define DMA_CHN_CFG		(MISC_BASE + 0x0A0)

arch/arm/mach-spear/pl080.c

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
#include <linux/err.h>

#include <linux/io.h>

#include <linux/spinlock_types.h>

#include <mach/spear.h>

#include <mach/misc_regs.h>

#include "spear.h"

#include "misc_regs.h"



static spinlock_t lock = __SPIN_LOCK_UNLOCKED(x);