diff options
author | Richard Zhao <richard.zhao@freescale.com> | 2010-12-30 06:25:05 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-03 03:39:29 -0500 |
commit | 3d5a44be308203a9a192a77037fb613c2f82ed85 (patch) | |
tree | 6778faa7dd2daff0ab3d2571ea6a95f6b9cf39fe /arch/arm/mach-mx5 | |
parent | 02226a20bcfb01322d4a168f2ed6a6e4366796fd (diff) |
arm: mx50: add core functions support except clock
Add core definitions and memory map, gpio, irq, iomux, uart device
support.
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx5')
-rw-r--r-- | arch/arm/mach-mx5/Kconfig | 13 | ||||
-rw-r--r-- | arch/arm/mach-mx5/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-mx5/Makefile.boot | 3 | ||||
-rw-r--r-- | arch/arm/mach-mx5/devices-mx50.h | 26 | ||||
-rw-r--r-- | arch/arm/mach-mx5/mm-mx50.c | 59 |
5 files changed, 101 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig index 5011f42f3b8..d2e0f984753 100644 --- a/arch/arm/mach-mx5/Kconfig +++ b/arch/arm/mach-mx5/Kconfig | |||
@@ -1,9 +1,20 @@ | |||
1 | if ARCH_MX5 | 1 | if ARCH_MX5 |
2 | # ARCH_MX51 is left for compatibility | 2 | # ARCH_MX51 and ARCH_MX50 are left for compatibility |
3 | |||
4 | config ARCH_MX50 | ||
5 | bool | ||
3 | 6 | ||
4 | config ARCH_MX51 | 7 | config ARCH_MX51 |
5 | bool | 8 | bool |
6 | 9 | ||
10 | config SOC_IMX50 | ||
11 | bool | ||
12 | select MXC_TZIC | ||
13 | select ARCH_MXC_IOMUX_V3 | ||
14 | select ARCH_MXC_AUDMUX_V2 | ||
15 | select ARCH_HAS_CPUFREQ | ||
16 | select ARCH_MX50 | ||
17 | |||
7 | config SOC_IMX51 | 18 | config SOC_IMX51 |
8 | bool | 19 | bool |
9 | select MXC_TZIC | 20 | select MXC_TZIC |
diff --git a/arch/arm/mach-mx5/Makefile b/arch/arm/mach-mx5/Makefile index 026cd850df2..e059c309093 100644 --- a/arch/arm/mach-mx5/Makefile +++ b/arch/arm/mach-mx5/Makefile | |||
@@ -4,6 +4,7 @@ | |||
4 | 4 | ||
5 | # Object file lists. | 5 | # Object file lists. |
6 | obj-y := cpu.o mm.o clock-mx51-mx53.o devices.o | 6 | obj-y := cpu.o mm.o clock-mx51-mx53.o devices.o |
7 | obj-$(CONFIG_SOC_IMX50) += mm-mx50.o | ||
7 | 8 | ||
8 | obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o | 9 | obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o |
9 | obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o | 10 | obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o |
diff --git a/arch/arm/mach-mx5/Makefile.boot b/arch/arm/mach-mx5/Makefile.boot index fec7cd921fc..854748f80cc 100644 --- a/arch/arm/mach-mx5/Makefile.boot +++ b/arch/arm/mach-mx5/Makefile.boot | |||
@@ -1,3 +1,6 @@ | |||
1 | zreladdr-$(CONFIG_ARCH_MX50) := 0x70008000 | ||
2 | params_phys-$(CONFIG_ARCH_MX50) := 0x70000100 | ||
3 | initrd_phys-$(CONFIG_ARCH_MX50) := 0x70800000 | ||
1 | zreladdr-$(CONFIG_ARCH_MX51) := 0x90008000 | 4 | zreladdr-$(CONFIG_ARCH_MX51) := 0x90008000 |
2 | params_phys-$(CONFIG_ARCH_MX51) := 0x90000100 | 5 | params_phys-$(CONFIG_ARCH_MX51) := 0x90000100 |
3 | initrd_phys-$(CONFIG_ARCH_MX51) := 0x90800000 | 6 | initrd_phys-$(CONFIG_ARCH_MX51) := 0x90800000 |
diff --git a/arch/arm/mach-mx5/devices-mx50.h b/arch/arm/mach-mx5/devices-mx50.h new file mode 100644 index 00000000000..98ab07468a0 --- /dev/null +++ b/arch/arm/mach-mx5/devices-mx50.h | |||
@@ -0,0 +1,26 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved. | ||
3 | */ | ||
4 | |||
5 | /* | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | |||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | |||
16 | * You should have received a copy of the GNU General Public License along | ||
17 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
19 | */ | ||
20 | |||
21 | #include <mach/mx50.h> | ||
22 | #include <mach/devices-common.h> | ||
23 | |||
24 | extern const struct imx_imx_uart_1irq_data imx50_imx_uart_data[] __initconst; | ||
25 | #define imx50_add_imx_uart(id, pdata) \ | ||
26 | imx_add_imx_uart_1irq(&imx50_imx_uart_data[id], pdata) | ||
diff --git a/arch/arm/mach-mx5/mm-mx50.c b/arch/arm/mach-mx5/mm-mx50.c new file mode 100644 index 00000000000..8c6540e5839 --- /dev/null +++ b/arch/arm/mach-mx5/mm-mx50.c | |||
@@ -0,0 +1,59 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation; either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | |||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | |||
14 | * You should have received a copy of the GNU General Public License along | ||
15 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
16 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
17 | * | ||
18 | * Create static mapping between physical to virtual memory. | ||
19 | */ | ||
20 | |||
21 | #include <linux/mm.h> | ||
22 | #include <linux/init.h> | ||
23 | |||
24 | #include <asm/mach/map.h> | ||
25 | |||
26 | #include <mach/hardware.h> | ||
27 | #include <mach/common.h> | ||
28 | #include <mach/iomux-v3.h> | ||
29 | |||
30 | /* | ||
31 | * Define the MX50 memory map. | ||
32 | */ | ||
33 | static struct map_desc mx50_io_desc[] __initdata = { | ||
34 | imx_map_entry(MX50, TZIC, MT_DEVICE), | ||
35 | imx_map_entry(MX50, SPBA0, MT_DEVICE), | ||
36 | imx_map_entry(MX50, AIPS1, MT_DEVICE), | ||
37 | imx_map_entry(MX50, AIPS2, MT_DEVICE), | ||
38 | }; | ||
39 | |||
40 | /* | ||
41 | * This function initializes the memory map. It is called during the | ||
42 | * system startup to create static physical to virtual memory mappings | ||
43 | * for the IO modules. | ||
44 | */ | ||
45 | void __init mx50_map_io(void) | ||
46 | { | ||
47 | mxc_set_cpu_type(MXC_CPU_MX50); | ||
48 | mxc_iomux_v3_init(MX50_IO_ADDRESS(MX50_IOMUXC_BASE_ADDR)); | ||
49 | mxc_arch_reset_init(MX50_IO_ADDRESS(MX50_WDOG_BASE_ADDR)); | ||
50 | iotable_init(mx50_io_desc, ARRAY_SIZE(mx50_io_desc)); | ||
51 | } | ||
52 | |||
53 | int imx50_register_gpios(void); | ||
54 | |||
55 | void __init mx50_init_irq(void) | ||
56 | { | ||
57 | tzic_init_irq(MX50_IO_ADDRESS(MX50_TZIC_BASE_ADDR)); | ||
58 | imx50_register_gpios(); | ||
59 | } | ||