From e657bcf6db84864079b31909e911a69c813aa0c0 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 21 Mar 2013 22:51:12 +0100 Subject: ARM: ux500: make remaining headers local mach/setup.h and mach/devices.h are only needed from inside of mach-ux500 now, so we can simply move them out of the include/mach directory. Signed-off-by: Arnd Bergmann Signed-off-by: Linus Walleij --- arch/arm/mach-ux500/board-mop500-audio.c | 2 +- arch/arm/mach-ux500/board-mop500-sdi.c | 2 +- arch/arm/mach-ux500/board-mop500.c | 4 +-- arch/arm/mach-ux500/cpu-db8500.c | 4 +-- arch/arm/mach-ux500/cpu.c | 4 +-- arch/arm/mach-ux500/devices-db8500.c | 2 +- arch/arm/mach-ux500/devices.c | 2 +- arch/arm/mach-ux500/devices.h | 23 ++++++++++++++ arch/arm/mach-ux500/hotplug.c | 2 +- arch/arm/mach-ux500/id.c | 2 +- arch/arm/mach-ux500/include/mach/devices.h | 23 -------------- arch/arm/mach-ux500/include/mach/setup.h | 50 ------------------------------ arch/arm/mach-ux500/platsmp.c | 2 +- arch/arm/mach-ux500/setup.h | 50 ++++++++++++++++++++++++++++++ arch/arm/mach-ux500/timer.c | 2 +- drivers/clocksource/clksrc-dbx500-prcmu.c | 2 -- 16 files changed, 87 insertions(+), 89 deletions(-) create mode 100644 arch/arm/mach-ux500/devices.h delete mode 100644 arch/arm/mach-ux500/include/mach/devices.h delete mode 100644 arch/arm/mach-ux500/include/mach/setup.h create mode 100644 arch/arm/mach-ux500/setup.h diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c index def06372371e..aba9e5692958 100644 --- a/arch/arm/mach-ux500/board-mop500-audio.c +++ b/arch/arm/mach-ux500/board-mop500-audio.c @@ -10,7 +10,7 @@ #include #include -#include +#include "devices.h" #include "irqs.h" #include diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c index 0ada76787ca0..f76be4ade7c2 100644 --- a/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/arch/arm/mach-ux500/board-mop500-sdi.c @@ -14,7 +14,7 @@ #include #include -#include +#include "devices.h" #include "db8500-regs.h" #include "devices-db8500.h" diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 6e8ee1127855..0d59e1ad810f 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -41,8 +41,8 @@ #include #include -#include -#include +#include "setup.h" +#include "devices.h" #include "irqs.h" #include diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index e11f87d77afc..7a66a810274a 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -28,8 +28,8 @@ #include #include -#include -#include +#include "setup.h" +#include "devices.h" #include "irqs.h" #include "devices-db8500.h" diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c index aa14c5f6e5fa..915e2636cbaa 100644 --- a/arch/arm/mach-ux500/cpu.c +++ b/arch/arm/mach-ux500/cpu.c @@ -24,8 +24,8 @@ #include -#include -#include +#include "setup.h" +#include "devices.h" #include "board-mop500.h" #include "db8500-regs.h" diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index 45ec9559ef41..1cf94ce0feec 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c @@ -15,7 +15,7 @@ #include #include -#include +#include "setup.h" #include "irqs.h" #include "db8500-regs.h" diff --git a/arch/arm/mach-ux500/devices.c b/arch/arm/mach-ux500/devices.c index f63a512190cb..0f9e52b95935 100644 --- a/arch/arm/mach-ux500/devices.c +++ b/arch/arm/mach-ux500/devices.c @@ -11,7 +11,7 @@ #include #include -#include +#include "setup.h" #include "db8500-regs.h" diff --git a/arch/arm/mach-ux500/devices.h b/arch/arm/mach-ux500/devices.h new file mode 100644 index 000000000000..cbc6f1e4104d --- /dev/null +++ b/arch/arm/mach-ux500/devices.h @@ -0,0 +1,23 @@ +/* + * Copyright (C) ST-Ericsson SA 2010 + * + * License terms: GNU General Public License (GPL) version 2 + */ + +#ifndef __ASM_ARCH_DEVICES_H__ +#define __ASM_ARCH_DEVICES_H__ + +struct platform_device; +struct amba_device; + +extern struct platform_device u8500_gpio_devs[]; + +extern struct amba_device ux500_pl031_device; + +extern struct platform_device ux500_hash1_device; +extern struct platform_device ux500_cryp1_device; + +extern struct platform_device u8500_dma40_device; +extern struct platform_device ux500_ske_keypad_device; + +#endif diff --git a/arch/arm/mach-ux500/hotplug.c b/arch/arm/mach-ux500/hotplug.c index 2f6af259015d..87abcf278432 100644 --- a/arch/arm/mach-ux500/hotplug.c +++ b/arch/arm/mach-ux500/hotplug.c @@ -15,7 +15,7 @@ #include #include -#include +#include "setup.h" /* * platform-specific code to shutdown a CPU diff --git a/arch/arm/mach-ux500/id.c b/arch/arm/mach-ux500/id.c index a847cf27b93b..0d33d1a06955 100644 --- a/arch/arm/mach-ux500/id.c +++ b/arch/arm/mach-ux500/id.c @@ -14,7 +14,7 @@ #include #include -#include +#include "setup.h" #include "db8500-regs.h" #include "id.h" diff --git a/arch/arm/mach-ux500/include/mach/devices.h b/arch/arm/mach-ux500/include/mach/devices.h deleted file mode 100644 index cbc6f1e4104d..000000000000 --- a/arch/arm/mach-ux500/include/mach/devices.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) ST-Ericsson SA 2010 - * - * License terms: GNU General Public License (GPL) version 2 - */ - -#ifndef __ASM_ARCH_DEVICES_H__ -#define __ASM_ARCH_DEVICES_H__ - -struct platform_device; -struct amba_device; - -extern struct platform_device u8500_gpio_devs[]; - -extern struct amba_device ux500_pl031_device; - -extern struct platform_device ux500_hash1_device; -extern struct platform_device ux500_cryp1_device; - -extern struct platform_device u8500_dma40_device; -extern struct platform_device ux500_ske_keypad_device; - -#endif diff --git a/arch/arm/mach-ux500/include/mach/setup.h b/arch/arm/mach-ux500/include/mach/setup.h deleted file mode 100644 index bddce2b49372..000000000000 --- a/arch/arm/mach-ux500/include/mach/setup.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2009 ST-Ericsson. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * These symbols are needed for board-specific files to call their - * own cpu-specific files - */ -#ifndef __ASM_ARCH_SETUP_H -#define __ASM_ARCH_SETUP_H - -#include -#include -#include - -void __init ux500_map_io(void); -extern void __init u8500_map_io(void); - -extern struct device * __init u8500_init_devices(struct ab8500_platform_data *ab8500); - -extern void __init ux500_init_irq(void); -extern void __init ux500_init_late(void); - -extern struct device *ux500_soc_device_init(const char *soc_id); - -struct amba_device; -extern void __init amba_add_devices(struct amba_device *devs[], int num); - -extern void ux500_timer_init(void); - -#define __IO_DEV_DESC(x, sz) { \ - .virtual = IO_ADDRESS(x), \ - .pfn = __phys_to_pfn(x), \ - .length = sz, \ - .type = MT_DEVICE, \ -} - -#define __MEM_DEV_DESC(x, sz) { \ - .virtual = IO_ADDRESS(x), \ - .pfn = __phys_to_pfn(x), \ - .length = sz, \ - .type = MT_MEMORY, \ -} - -extern struct smp_operations ux500_smp_ops; -extern void ux500_cpu_die(unsigned int cpu); - -#endif /* __ASM_ARCH_SETUP_H */ diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c index 8a9c070ec206..12ad8ad850aa 100644 --- a/arch/arm/mach-ux500/platsmp.c +++ b/arch/arm/mach-ux500/platsmp.c @@ -22,7 +22,7 @@ #include #include -#include +#include "setup.h" #include "db8500-regs.h" #include "id.h" diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h new file mode 100644 index 000000000000..bddce2b49372 --- /dev/null +++ b/arch/arm/mach-ux500/setup.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2009 ST-Ericsson. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * These symbols are needed for board-specific files to call their + * own cpu-specific files + */ +#ifndef __ASM_ARCH_SETUP_H +#define __ASM_ARCH_SETUP_H + +#include +#include +#include + +void __init ux500_map_io(void); +extern void __init u8500_map_io(void); + +extern struct device * __init u8500_init_devices(struct ab8500_platform_data *ab8500); + +extern void __init ux500_init_irq(void); +extern void __init ux500_init_late(void); + +extern struct device *ux500_soc_device_init(const char *soc_id); + +struct amba_device; +extern void __init amba_add_devices(struct amba_device *devs[], int num); + +extern void ux500_timer_init(void); + +#define __IO_DEV_DESC(x, sz) { \ + .virtual = IO_ADDRESS(x), \ + .pfn = __phys_to_pfn(x), \ + .length = sz, \ + .type = MT_DEVICE, \ +} + +#define __MEM_DEV_DESC(x, sz) { \ + .virtual = IO_ADDRESS(x), \ + .pfn = __phys_to_pfn(x), \ + .length = sz, \ + .type = MT_MEMORY, \ +} + +extern struct smp_operations ux500_smp_ops; +extern void ux500_cpu_die(unsigned int cpu); + +#endif /* __ASM_ARCH_SETUP_H */ diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c index 2dbbaefead14..290b9c5e5e28 100644 --- a/arch/arm/mach-ux500/timer.c +++ b/arch/arm/mach-ux500/timer.c @@ -13,7 +13,7 @@ #include -#include +#include "setup.h" #include "irqs.h" #include "db8500-regs.h" diff --git a/drivers/clocksource/clksrc-dbx500-prcmu.c b/drivers/clocksource/clksrc-dbx500-prcmu.c index 4f34093bdb4e..54f3d119d99c 100644 --- a/drivers/clocksource/clksrc-dbx500-prcmu.c +++ b/drivers/clocksource/clksrc-dbx500-prcmu.c @@ -17,8 +17,6 @@ #include -#include - #define RATE_32K 32768 #define TIMER_MODE_CONTINOUS 0x1 -- cgit v1.2.3