diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 20:48:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 20:48:14 -0400 |
commit | 2ca7d674d7ab2220707b2ada0b690c0e7c95e7ac (patch) | |
tree | 9c0927ed1d540e5fd704c1f82689870786514655 /arch/arm/mach-mxc91231/mm.c | |
parent | 2195d2818c37bdf263865f1e9effccdd9fc5f9d4 (diff) | |
parent | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (diff) |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (257 commits)
[ARM] Update mach-types
ARM: 5636/1: Move vendor enum to AMBA include
ARM: Fix pfn_valid() for sparse memory
[ARM] orion5x: Add LaCie NAS 2Big Network support
[ARM] pxa/sharpsl_pm: zaurus c3000 aka spitz: fix resume
ARM: 5686/1: at91: Correct AC97 reset line in at91sam9263ek board
ARM: 5640/1: This patch modifies the support of AC97 on the at91sam9263 ek board
ARM: 5689/1: Update default config of HP Jornada 700-series machines
ARM: 5691/1: fix cache aliasing issues between kmap() and kmap_atomic() with highmem
ARM: 5688/1: ks8695_serial: disable_irq() lockup
ARM: 5687/1: fix an oops with highmem
ARM: 5684/1: Add nuc960 platform to w90x900
ARM: 5683/1: Add nuc950 platform to w90x900
ARM: 5682/1: Add cpu.c and dev.c and modify some files of w90p910 platform
ARM: 5626/1: add suspend/resume functions to amba-pl011 serial driver
ARM: 5625/1: fix hard coded 4K resource size in amba bus detection
MMC: MMCI: convert realview MMC to use gpiolib
ARM: 5685/1: Make MMCI driver compile without gpiolib
ARM: implement highpte
ARM: Show FIQ in /proc/interrupts on CONFIG_FIQ
...
Fix up trivial conflict in arch/arm/kernel/signal.c.
It was due to the TIF_NOTIFY_RESUME addition in commit d0420c83f ("KEYS:
Extend TIF_NOTIFY_RESUME to (almost) all architectures") and follow-ups.
Diffstat (limited to 'arch/arm/mach-mxc91231/mm.c')
-rw-r--r-- | arch/arm/mach-mxc91231/mm.c | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/arch/arm/mach-mxc91231/mm.c b/arch/arm/mach-mxc91231/mm.c new file mode 100644 index 000000000000..6becda3ff331 --- /dev/null +++ b/arch/arm/mach-mxc91231/mm.c | |||
@@ -0,0 +1,94 @@ | |||
1 | /* | ||
2 | * Copyright (C) 1999,2000 Arm Limited | ||
3 | * Copyright (C) 2000 Deep Blue Solutions Ltd | ||
4 | * Copyright (C) 2002 Shane Nay (shane@minirl.com) | ||
5 | * Copyright 2004-2005 Freescale Semiconductor, Inc. All Rights Reserved. | ||
6 | * - add MXC specific definitions | ||
7 | * Copyright 2006 Motorola, Inc. | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License as published by | ||
11 | * the Free Software Foundation; either version 2 of the License, or | ||
12 | * (at your option) any later version. | ||
13 | * | ||
14 | * This program is distributed in the hope that it will be useful, | ||
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
17 | * GNU General Public License for more details. | ||
18 | * | ||
19 | * You should have received a copy of the GNU General Public License | ||
20 | * along with this program; if not, write to the Free Software | ||
21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
22 | * | ||
23 | */ | ||
24 | |||
25 | #include <linux/mm.h> | ||
26 | #include <linux/init.h> | ||
27 | #include <mach/hardware.h> | ||
28 | #include <mach/common.h> | ||
29 | #include <asm/pgtable.h> | ||
30 | #include <asm/mach/map.h> | ||
31 | |||
32 | /* | ||
33 | * This structure defines the MXC memory map. | ||
34 | */ | ||
35 | static struct map_desc mxc_io_desc[] __initdata = { | ||
36 | { | ||
37 | .virtual = MXC91231_L2CC_BASE_ADDR_VIRT, | ||
38 | .pfn = __phys_to_pfn(MXC91231_L2CC_BASE_ADDR), | ||
39 | .length = MXC91231_L2CC_SIZE, | ||
40 | .type = MT_DEVICE, | ||
41 | }, { | ||
42 | .virtual = MXC91231_X_MEMC_BASE_ADDR_VIRT, | ||
43 | .pfn = __phys_to_pfn(MXC91231_X_MEMC_BASE_ADDR), | ||
44 | .length = MXC91231_X_MEMC_SIZE, | ||
45 | .type = MT_DEVICE, | ||
46 | }, { | ||
47 | .virtual = MXC91231_ROMP_BASE_ADDR_VIRT, | ||
48 | .pfn = __phys_to_pfn(MXC91231_ROMP_BASE_ADDR), | ||
49 | .length = MXC91231_ROMP_SIZE, | ||
50 | .type = MT_DEVICE, | ||
51 | }, { | ||
52 | .virtual = MXC91231_AVIC_BASE_ADDR_VIRT, | ||
53 | .pfn = __phys_to_pfn(MXC91231_AVIC_BASE_ADDR), | ||
54 | .length = MXC91231_AVIC_SIZE, | ||
55 | .type = MT_DEVICE, | ||
56 | }, { | ||
57 | .virtual = MXC91231_AIPS1_BASE_ADDR_VIRT, | ||
58 | .pfn = __phys_to_pfn(MXC91231_AIPS1_BASE_ADDR), | ||
59 | .length = MXC91231_AIPS1_SIZE, | ||
60 | .type = MT_DEVICE, | ||
61 | }, { | ||
62 | .virtual = MXC91231_SPBA0_BASE_ADDR_VIRT, | ||
63 | .pfn = __phys_to_pfn(MXC91231_SPBA0_BASE_ADDR), | ||
64 | .length = MXC91231_SPBA0_SIZE, | ||
65 | .type = MT_DEVICE, | ||
66 | }, { | ||
67 | .virtual = MXC91231_SPBA1_BASE_ADDR_VIRT, | ||
68 | .pfn = __phys_to_pfn(MXC91231_SPBA1_BASE_ADDR), | ||
69 | .length = MXC91231_SPBA1_SIZE, | ||
70 | .type = MT_DEVICE, | ||
71 | }, { | ||
72 | .virtual = MXC91231_AIPS2_BASE_ADDR_VIRT, | ||
73 | .pfn = __phys_to_pfn(MXC91231_AIPS2_BASE_ADDR), | ||
74 | .length = MXC91231_AIPS2_SIZE, | ||
75 | .type = MT_DEVICE, | ||
76 | }, | ||
77 | }; | ||
78 | |||
79 | /* | ||
80 | * This function initializes the memory map. It is called during the | ||
81 | * system startup to create static physical to virtual memory map for | ||
82 | * the IO modules. | ||
83 | */ | ||
84 | void __init mxc91231_map_io(void) | ||
85 | { | ||
86 | mxc_set_cpu_type(MXC_CPU_MXC91231); | ||
87 | |||
88 | iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc)); | ||
89 | } | ||
90 | |||
91 | void __init mxc91231_init_irq(void) | ||
92 | { | ||
93 | mxc_init_irq(MXC91231_IO_ADDRESS(MXC91231_AVIC_BASE_ADDR)); | ||
94 | } | ||