aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/mach-realview/board-eb.h (renamed from arch/arm/mach-realview/include/mach/board-eb.h)2
-rw-r--r--arch/arm/mach-realview/board-pb1176.h (renamed from arch/arm/mach-realview/include/mach/board-pb1176.h)2
-rw-r--r--arch/arm/mach-realview/board-pb11mp.h (renamed from arch/arm/mach-realview/include/mach/board-pb11mp.h)2
-rw-r--r--arch/arm/mach-realview/board-pba8.h (renamed from arch/arm/mach-realview/include/mach/board-pba8.h)2
-rw-r--r--arch/arm/mach-realview/board-pbx.h (renamed from arch/arm/mach-realview/include/mach/board-pbx.h)2
-rw-r--r--arch/arm/mach-realview/core.c6
-rw-r--r--arch/arm/mach-realview/hardware.h (renamed from arch/arm/mach-realview/include/mach/hardware.h)0
-rw-r--r--arch/arm/mach-realview/irqs-eb.h (renamed from arch/arm/mach-realview/include/mach/irqs-eb.h)0
-rw-r--r--arch/arm/mach-realview/irqs-pb1176.h (renamed from arch/arm/mach-realview/include/mach/irqs-pb1176.h)2
-rw-r--r--arch/arm/mach-realview/irqs-pb11mp.h (renamed from arch/arm/mach-realview/include/mach/irqs-pb11mp.h)0
-rw-r--r--arch/arm/mach-realview/irqs-pba8.h (renamed from arch/arm/mach-realview/include/mach/irqs-pba8.h)0
-rw-r--r--arch/arm/mach-realview/irqs-pbx.h (renamed from arch/arm/mach-realview/include/mach/irqs-pbx.h)0
-rw-r--r--arch/arm/mach-realview/irqs.h (renamed from arch/arm/mach-realview/include/mach/irqs.h)10
-rw-r--r--arch/arm/mach-realview/platform.h (renamed from arch/arm/mach-realview/include/mach/platform.h)0
-rw-r--r--arch/arm/mach-realview/platsmp.c8
-rw-r--r--arch/arm/mach-realview/realview_eb.c6
-rw-r--r--arch/arm/mach-realview/realview_pb1176.c6
-rw-r--r--arch/arm/mach-realview/realview_pb11mp.c6
-rw-r--r--arch/arm/mach-realview/realview_pba8.c6
-rw-r--r--arch/arm/mach-realview/realview_pbx.c6
-rw-r--r--arch/arm/mach-realview/uncompress.h (renamed from arch/arm/mach-realview/include/mach/uncompress.h)12
21 files changed, 37 insertions, 41 deletions
diff --git a/arch/arm/mach-realview/include/mach/board-eb.h b/arch/arm/mach-realview/board-eb.h
index a301e61a5554..ac9c98f9a971 100644
--- a/arch/arm/mach-realview/include/mach/board-eb.h
+++ b/arch/arm/mach-realview/board-eb.h
@@ -21,7 +21,7 @@
21#ifndef __ASM_ARCH_BOARD_EB_H 21#ifndef __ASM_ARCH_BOARD_EB_H
22#define __ASM_ARCH_BOARD_EB_H 22#define __ASM_ARCH_BOARD_EB_H
23 23
24#include <mach/platform.h> 24#include "platform.h"
25 25
26/* 26/*
27 * RealView EB + ARM11MPCore peripheral addresses 27 * RealView EB + ARM11MPCore peripheral addresses
diff --git a/arch/arm/mach-realview/include/mach/board-pb1176.h b/arch/arm/mach-realview/board-pb1176.h
index 2a15fef94730..836433dc789c 100644
--- a/arch/arm/mach-realview/include/mach/board-pb1176.h
+++ b/arch/arm/mach-realview/board-pb1176.h
@@ -21,7 +21,7 @@
21#ifndef __ASM_ARCH_BOARD_PB1176_H 21#ifndef __ASM_ARCH_BOARD_PB1176_H
22#define __ASM_ARCH_BOARD_PB1176_H 22#define __ASM_ARCH_BOARD_PB1176_H
23 23
24#include <mach/platform.h> 24#include "platform.h"
25 25
26/* 26/*
27 * Peripheral addresses 27 * Peripheral addresses
diff --git a/arch/arm/mach-realview/include/mach/board-pb11mp.h b/arch/arm/mach-realview/board-pb11mp.h
index aa2d4e02ea2c..e3a758b147ab 100644
--- a/arch/arm/mach-realview/include/mach/board-pb11mp.h
+++ b/arch/arm/mach-realview/board-pb11mp.h
@@ -21,7 +21,7 @@
21#ifndef __ASM_ARCH_BOARD_PB11MP_H 21#ifndef __ASM_ARCH_BOARD_PB11MP_H
22#define __ASM_ARCH_BOARD_PB11MP_H 22#define __ASM_ARCH_BOARD_PB11MP_H
23 23
24#include <mach/platform.h> 24#include "platform.h"
25 25
26/* 26/*
27 * Peripheral addresses 27 * Peripheral addresses
diff --git a/arch/arm/mach-realview/include/mach/board-pba8.h b/arch/arm/mach-realview/board-pba8.h
index 4dfc67a4f45f..84232fe942d2 100644
--- a/arch/arm/mach-realview/include/mach/board-pba8.h
+++ b/arch/arm/mach-realview/board-pba8.h
@@ -21,7 +21,7 @@
21#ifndef __ASM_ARCH_BOARD_PBA8_H 21#ifndef __ASM_ARCH_BOARD_PBA8_H
22#define __ASM_ARCH_BOARD_PBA8_H 22#define __ASM_ARCH_BOARD_PBA8_H
23 23
24#include <mach/platform.h> 24#include "platform.h"
25 25
26/* 26/*
27 * Peripheral addresses 27 * Peripheral addresses
diff --git a/arch/arm/mach-realview/include/mach/board-pbx.h b/arch/arm/mach-realview/board-pbx.h
index 848bfff6d8f1..3dab54fa9e97 100644
--- a/arch/arm/mach-realview/include/mach/board-pbx.h
+++ b/arch/arm/mach-realview/board-pbx.h
@@ -20,7 +20,7 @@
20#ifndef __ASM_ARCH_BOARD_PBX_H 20#ifndef __ASM_ARCH_BOARD_PBX_H
21#define __ASM_ARCH_BOARD_PBX_H 21#define __ASM_ARCH_BOARD_PBX_H
22 22
23#include <mach/platform.h> 23#include "platform.h"
24 24
25/* 25/*
26 * Peripheral addresses 26 * Peripheral addresses
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index 44575edc44b1..baf174542e36 100644
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -36,8 +36,7 @@
36#include <linux/memblock.h> 36#include <linux/memblock.h>
37 37
38#include <clocksource/timer-sp804.h> 38#include <clocksource/timer-sp804.h>
39 39#include "hardware.h"
40#include <mach/hardware.h>
41#include <asm/irq.h> 40#include <asm/irq.h>
42#include <asm/mach-types.h> 41#include <asm/mach-types.h>
43#include <asm/hardware/icst.h> 42#include <asm/hardware/icst.h>
@@ -46,8 +45,7 @@
46#include <asm/mach/irq.h> 45#include <asm/mach/irq.h>
47#include <asm/mach/map.h> 46#include <asm/mach/map.h>
48 47
49#include <mach/platform.h> 48#include "platform.h"
50#include <mach/irqs.h>
51 49
52#include <plat/sched_clock.h> 50#include <plat/sched_clock.h>
53 51
diff --git a/arch/arm/mach-realview/include/mach/hardware.h b/arch/arm/mach-realview/hardware.h
index 281e71c97525..281e71c97525 100644
--- a/arch/arm/mach-realview/include/mach/hardware.h
+++ b/arch/arm/mach-realview/hardware.h
diff --git a/arch/arm/mach-realview/include/mach/irqs-eb.h b/arch/arm/mach-realview/irqs-eb.h
index 44754230fdcc..44754230fdcc 100644
--- a/arch/arm/mach-realview/include/mach/irqs-eb.h
+++ b/arch/arm/mach-realview/irqs-eb.h
diff --git a/arch/arm/mach-realview/include/mach/irqs-pb1176.h b/arch/arm/mach-realview/irqs-pb1176.h
index 708f84156f2c..bfd1badce4c9 100644
--- a/arch/arm/mach-realview/include/mach/irqs-pb1176.h
+++ b/arch/arm/mach-realview/irqs-pb1176.h
@@ -95,6 +95,4 @@
95#define MAX_GIC_NR NR_GIC_PB1176 95#define MAX_GIC_NR NR_GIC_PB1176
96#endif 96#endif
97 97
98#endif /* CONFIG_MACH_REALVIEW_PB1176 */
99
100#endif /* __MACH_IRQS_PB1176_H */ 98#endif /* __MACH_IRQS_PB1176_H */
diff --git a/arch/arm/mach-realview/include/mach/irqs-pb11mp.h b/arch/arm/mach-realview/irqs-pb11mp.h
index 34e255add21e..34e255add21e 100644
--- a/arch/arm/mach-realview/include/mach/irqs-pb11mp.h
+++ b/arch/arm/mach-realview/irqs-pb11mp.h
diff --git a/arch/arm/mach-realview/include/mach/irqs-pba8.h b/arch/arm/mach-realview/irqs-pba8.h
index 4a88a4edb651..4a88a4edb651 100644
--- a/arch/arm/mach-realview/include/mach/irqs-pba8.h
+++ b/arch/arm/mach-realview/irqs-pba8.h
diff --git a/arch/arm/mach-realview/include/mach/irqs-pbx.h b/arch/arm/mach-realview/irqs-pbx.h
index 206a3001f46b..206a3001f46b 100644
--- a/arch/arm/mach-realview/include/mach/irqs-pbx.h
+++ b/arch/arm/mach-realview/irqs-pbx.h
diff --git a/arch/arm/mach-realview/include/mach/irqs.h b/arch/arm/mach-realview/irqs.h
index 78854f2fa323..1bd8a9a00337 100644
--- a/arch/arm/mach-realview/include/mach/irqs.h
+++ b/arch/arm/mach-realview/irqs.h
@@ -22,11 +22,11 @@
22#ifndef __ASM_ARCH_IRQS_H 22#ifndef __ASM_ARCH_IRQS_H
23#define __ASM_ARCH_IRQS_H 23#define __ASM_ARCH_IRQS_H
24 24
25#include <mach/irqs-eb.h> 25#include "irqs-eb.h"
26#include <mach/irqs-pb11mp.h> 26#include "irqs-pb11mp.h"
27#include <mach/irqs-pb1176.h> 27#include "irqs-pb1176.h"
28#include <mach/irqs-pba8.h> 28#include "irqs-pba8.h"
29#include <mach/irqs-pbx.h> 29#include "irqs-pbx.h"
30 30
31#define IRQ_LOCALTIMER 29 31#define IRQ_LOCALTIMER 29
32#define IRQ_LOCALWDOG 30 32#define IRQ_LOCALWDOG 30
diff --git a/arch/arm/mach-realview/include/mach/platform.h b/arch/arm/mach-realview/platform.h
index 1b77a27badaf..1b77a27badaf 100644
--- a/arch/arm/mach-realview/include/mach/platform.h
+++ b/arch/arm/mach-realview/platform.h
diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c
index 98e3052b7933..a2331b36ccce 100644
--- a/arch/arm/mach-realview/platsmp.c
+++ b/arch/arm/mach-realview/platsmp.c
@@ -13,13 +13,13 @@
13#include <linux/smp.h> 13#include <linux/smp.h>
14#include <linux/io.h> 14#include <linux/io.h>
15 15
16#include <mach/hardware.h> 16#include "hardware.h"
17#include <asm/mach-types.h> 17#include <asm/mach-types.h>
18#include <asm/smp_scu.h> 18#include <asm/smp_scu.h>
19 19
20#include <mach/board-eb.h> 20#include "board-eb.h"
21#include <mach/board-pb11mp.h> 21#include "board-pb11mp.h"
22#include <mach/board-pbx.h> 22#include "board-pbx.h"
23 23
24#include <plat/platsmp.h> 24#include <plat/platsmp.h>
25 25
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 1a2a89708fb7..e23368c354ed 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -31,7 +31,7 @@
31#include <linux/platform_data/clk-realview.h> 31#include <linux/platform_data/clk-realview.h>
32#include <linux/reboot.h> 32#include <linux/reboot.h>
33 33
34#include <mach/hardware.h> 34#include "hardware.h"
35#include <asm/irq.h> 35#include <asm/irq.h>
36#include <asm/mach-types.h> 36#include <asm/mach-types.h>
37#include <asm/pgtable.h> 37#include <asm/pgtable.h>
@@ -44,8 +44,8 @@
44#include <asm/mach/map.h> 44#include <asm/mach/map.h>
45#include <asm/mach/time.h> 45#include <asm/mach/time.h>
46 46
47#include <mach/board-eb.h> 47#include "board-eb.h"
48#include <mach/irqs.h> 48#include "irqs.h"
49 49
50#include "core.h" 50#include "core.h"
51 51
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index ce92c1823494..e5fd1ce9051f 100644
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@ -34,7 +34,7 @@
34#include <linux/reboot.h> 34#include <linux/reboot.h>
35#include <linux/memblock.h> 35#include <linux/memblock.h>
36 36
37#include <mach/hardware.h> 37#include "hardware.h"
38#include <asm/irq.h> 38#include <asm/irq.h>
39#include <asm/mach-types.h> 39#include <asm/mach-types.h>
40#include <asm/pgtable.h> 40#include <asm/pgtable.h>
@@ -45,8 +45,8 @@
45#include <asm/mach/map.h> 45#include <asm/mach/map.h>
46#include <asm/mach/time.h> 46#include <asm/mach/time.h>
47 47
48#include <mach/board-pb1176.h> 48#include "board-pb1176.h"
49#include <mach/irqs.h> 49#include "irqs.h"
50 50
51#include "core.h" 51#include "core.h"
52 52
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c
index 5bb460300b6a..3b82599826b7 100644
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@ -31,7 +31,7 @@
31#include <linux/platform_data/clk-realview.h> 31#include <linux/platform_data/clk-realview.h>
32#include <linux/reboot.h> 32#include <linux/reboot.h>
33 33
34#include <mach/hardware.h> 34#include "hardware.h"
35#include <asm/irq.h> 35#include <asm/irq.h>
36#include <asm/mach-types.h> 36#include <asm/mach-types.h>
37#include <asm/pgtable.h> 37#include <asm/pgtable.h>
@@ -44,8 +44,8 @@
44#include <asm/mach/time.h> 44#include <asm/mach/time.h>
45#include <asm/outercache.h> 45#include <asm/outercache.h>
46 46
47#include <mach/board-pb11mp.h> 47#include "board-pb11mp.h"
48#include <mach/irqs.h> 48#include "irqs.h"
49 49
50#include "core.h" 50#include "core.h"
51 51
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c
index b3549a637ff0..263e37391445 100644
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@ -39,9 +39,9 @@
39#include <asm/mach/map.h> 39#include <asm/mach/map.h>
40#include <asm/mach/time.h> 40#include <asm/mach/time.h>
41 41
42#include <mach/hardware.h> 42#include "hardware.h"
43#include <mach/board-pba8.h> 43#include "board-pba8.h"
44#include <mach/irqs.h> 44#include "irqs.h"
45 45
46#include "core.h" 46#include "core.h"
47 47
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
index f26e1e09f29e..810b15410bf2 100644
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -41,9 +41,9 @@
41#include <asm/mach/map.h> 41#include <asm/mach/map.h>
42#include <asm/mach/time.h> 42#include <asm/mach/time.h>
43 43
44#include <mach/hardware.h> 44#include "hardware.h"
45#include <mach/board-pbx.h> 45#include "board-pbx.h"
46#include <mach/irqs.h> 46#include "irqs.h"
47 47
48#include "core.h" 48#include "core.h"
49 49
diff --git a/arch/arm/mach-realview/include/mach/uncompress.h b/arch/arm/mach-realview/uncompress.h
index cfa30d21783b..f8ac3e723628 100644
--- a/arch/arm/mach-realview/include/mach/uncompress.h
+++ b/arch/arm/mach-realview/uncompress.h
@@ -17,14 +17,14 @@
17 * along with this program; if not, write to the Free Software 17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 */ 19 */
20#include <mach/hardware.h> 20#include "hardware.h"
21#include <asm/mach-types.h> 21#include <asm/mach-types.h>
22 22
23#include <mach/board-eb.h> 23#include "board-eb.h"
24#include <mach/board-pb11mp.h> 24#include "board-pb11mp.h"
25#include <mach/board-pb1176.h> 25#include "board-pb1176.h"
26#include <mach/board-pba8.h> 26#include "board-pba8.h"
27#include <mach/board-pbx.h> 27#include "board-pbx.h"
28 28
29#define AMBA_UART_DR(base) (*(volatile unsigned char *)((base) + 0x00)) 29#define AMBA_UART_DR(base) (*(volatile unsigned char *)((base) + 0x00))
30#define AMBA_UART_LCRH(base) (*(volatile unsigned char *)((base) + 0x2c)) 30#define AMBA_UART_LCRH(base) (*(volatile unsigned char *)((base) + 0x2c))
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-02 16:58:57 -0500