korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-19 20:34:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

ARM: spear: remove include/mach/ subdirectory

Browse Source 
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: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-04-28 09:44:23 +02:00
parent ca31807b85
commit c164620ae2
15 changed files with 14 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-spear/Makefile
View File

@ -3,8 +3,6 @@
# SPEAr Platform specific Makefile
#
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
# Common support
obj-y := restart.o time.o

35
arch/arm/mach-spear/include/mach/irqs.h
View File

@ -1,35 +0,0 @@
/*
* 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 */

42
arch/arm/mach-spear/include/mach/uncompress.h
View File

@ -1,42 +0,0 @@
/*
* 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 */

4
arch/arm/mach-spear/include/mach/misc_regs.h → arch/arm/mach-spear/misc_regs.h
View File

@ -1,6 +1,4 @@
/*
* 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)

4
arch/arm/mach-spear/pl080.c
View File

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

2
arch/arm/mach-spear/platsmp.c
View File

@ -14,7 +14,7 @@
#include <linux/smp.h>
#include <asm/cacheflush.h>
#include <asm/smp_scu.h>
#include <mach/spear.h>
#include "spear.h"
#include "generic.h"
/* XXX spear_pen_release is cargo culted code - DO NOT COPY XXX */

2
arch/arm/mach-spear/restart.c
View File

@ -14,7 +14,7 @@
#include <linux/amba/sp810.h>
#include <linux/reboot.h>
#include <asm/system_misc.h>
#include <mach/spear.h>
#include "spear.h"
#include "generic.h"
#define SPEAR13XX_SYS_SW_RES (VA_MISC_BASE + 0x204)

0
arch/arm/mach-spear/include/mach/spear.h → arch/arm/mach-spear/spear.h
View File

2
arch/arm/mach-spear/spear1310.c
View File

@ -18,7 +18,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include "generic.h"
#include <mach/spear.h>
#include "spear.h"
/* Base addresses */
#define SPEAR1310_RAS_GRP1_BASE UL(0xD8000000)

2
arch/arm/mach-spear/spear13xx.c
View File

@ -21,7 +21,7 @@
#include <linux/of.h>
#include <asm/hardware/cache-l2x0.h>
#include <asm/mach/map.h>
#include <mach/spear.h>
#include "spear.h"
#include "generic.h"
void __init spear13xx_l2x0_init(void)

2
arch/arm/mach-spear/spear300.c
View File

@ -17,7 +17,7 @@
#include <linux/of_platform.h>
#include <asm/mach/arch.h>
#include "generic.h"
#include <mach/spear.h>
#include "spear.h"
/* DMAC platform data's slave info */
struct pl08x_channel_data spear300_dma_info[] = {

2
arch/arm/mach-spear/spear310.c
View File

@ -18,7 +18,7 @@
#include <linux/of_platform.h>
#include <asm/mach/arch.h>
#include "generic.h"
#include <mach/spear.h>
#include "spear.h"
#define SPEAR310_UART1_BASE UL(0xB2000000)
#define SPEAR310_UART2_BASE UL(0xB2080000)

2
arch/arm/mach-spear/spear320.c
View File

@ -20,7 +20,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include "generic.h"
#include <mach/spear.h>
#include "spear.h"
#define SPEAR320_UART1_BASE UL(0xA3000000)
#define SPEAR320_UART2_BASE UL(0xA4000000)

4
arch/arm/mach-spear/spear3xx.c
View File

@ -20,8 +20,8 @@
#include <asm/mach/map.h>
#include "pl080.h"
#include "generic.h"
#include <mach/spear.h>
#include <mach/misc_regs.h>
#include "spear.h"
#include "misc_regs.h"
/* ssp device registration */
struct pl022_ssp_controller pl022_plat_data = {

4
arch/arm/mach-spear/spear6xx.c
View File

@ -25,8 +25,8 @@
#include <asm/mach/map.h>
#include "pl080.h"
#include "generic.h"
#include <mach/spear.h>
#include <mach/misc_regs.h>
#include "spear.h"
#include "misc_regs.h"
/* dmac device registration */
static struct pl08x_channel_data spear600_dma_info[] = {