aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mx3/mach-mx31_3ds.c8
-rw-r--r--arch/arm/mach-mx3/mach-mx31ads.c14
-rw-r--r--arch/arm/mach-mx3/mach-qong.c9
-rw-r--r--arch/arm/mach-mx3/mm.c9
4 files changed, 1 insertions, 39 deletions
diff --git a/arch/arm/mach-mx3/mach-mx31_3ds.c b/arch/arm/mach-mx3/mach-mx31_3ds.c
index 0d24b3c63c83..b7d0953046e1 100644
--- a/arch/arm/mach-mx3/mach-mx31_3ds.c
+++ b/arch/arm/mach-mx3/mach-mx31_3ds.c
@@ -42,10 +42,6 @@
42/* CPLD IRQ line for external uart, external ethernet etc */ 42/* CPLD IRQ line for external uart, external ethernet etc */
43#define EXPIO_PARENT_INT IOMUX_TO_IRQ(MX31_PIN_GPIO1_1) 43#define EXPIO_PARENT_INT IOMUX_TO_IRQ(MX31_PIN_GPIO1_1)
44 44
45/*
46 * This file contains the board-specific initialization routines.
47 */
48
49static int mx31_3ds_pins[] = { 45static int mx31_3ds_pins[] = {
50 /* UART1 */ 46 /* UART1 */
51 MX31_PIN_CTS1__CTS1, 47 MX31_PIN_CTS1__CTS1,
@@ -371,10 +367,6 @@ static struct sys_timer mx31_3ds_timer = {
371 .init = mx31_3ds_timer_init, 367 .init = mx31_3ds_timer_init,
372}; 368};
373 369
374/*
375 * The following uses standard kernel macros defined in arch.h in order to
376 * initialize __mach_desc_MX31_3DS data structure.
377 */
378MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)") 370MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)")
379 /* Maintainer: Freescale Semiconductor, Inc. */ 371 /* Maintainer: Freescale Semiconductor, Inc. */
380 .boot_params = MX3x_PHYS_OFFSET + 0x100, 372 .boot_params = MX3x_PHYS_OFFSET + 0x100,
diff --git a/arch/arm/mach-mx3/mach-mx31ads.c b/arch/arm/mach-mx3/mach-mx31ads.c
index cb80b9638203..14e76711162f 100644
--- a/arch/arm/mach-mx3/mach-mx31ads.c
+++ b/arch/arm/mach-mx3/mach-mx31ads.c
@@ -69,9 +69,6 @@
69#define EXPIO_INT_XUART_INTB (MXC_EXP_IO_BASE + 11) 69#define EXPIO_INT_XUART_INTB (MXC_EXP_IO_BASE + 11)
70 70
71#define MXC_MAX_EXP_IO_LINES 16 71#define MXC_MAX_EXP_IO_LINES 16
72/*
73 * This file contains the board-specific initialization routines.
74 */
75 72
76/* 73/*
77 * The serial port definition structure. 74 * The serial port definition structure.
@@ -497,9 +494,7 @@ static void mxc_init_audio(void)
497 mxc_iomux_setup_multiple_pins(ssi_pins, ARRAY_SIZE(ssi_pins), "ssi"); 494 mxc_iomux_setup_multiple_pins(ssi_pins, ARRAY_SIZE(ssi_pins), "ssi");
498} 495}
499 496
500/*! 497/* static mappings */
501 * This structure defines static mappings for the i.MX31ADS board.
502 */
503static struct map_desc mx31ads_io_desc[] __initdata = { 498static struct map_desc mx31ads_io_desc[] __initdata = {
504 { 499 {
505 .virtual = MX31_CS4_BASE_ADDR_VIRT, 500 .virtual = MX31_CS4_BASE_ADDR_VIRT,
@@ -509,9 +504,6 @@ static struct map_desc mx31ads_io_desc[] __initdata = {
509 }, 504 },
510}; 505};
511 506
512/*!
513 * Set up static virtual mappings.
514 */
515static void __init mx31ads_map_io(void) 507static void __init mx31ads_map_io(void)
516{ 508{
517 mx31_map_io(); 509 mx31_map_io();
@@ -541,10 +533,6 @@ static struct sys_timer mx31ads_timer = {
541 .init = mx31ads_timer_init, 533 .init = mx31ads_timer_init,
542}; 534};
543 535
544/*
545 * The following uses standard kernel macros defined in arch.h in order to
546 * initialize __mach_desc_MX31ADS data structure.
547 */
548MACHINE_START(MX31ADS, "Freescale MX31ADS") 536MACHINE_START(MX31ADS, "Freescale MX31ADS")
549 /* Maintainer: Freescale Semiconductor, Inc. */ 537 /* Maintainer: Freescale Semiconductor, Inc. */
550 .boot_params = MX3x_PHYS_OFFSET + 0x100, 538 .boot_params = MX3x_PHYS_OFFSET + 0x100,
diff --git a/arch/arm/mach-mx3/mach-qong.c b/arch/arm/mach-mx3/mach-qong.c
index 002816347e67..17f758b77623 100644
--- a/arch/arm/mach-mx3/mach-qong.c
+++ b/arch/arm/mach-mx3/mach-qong.c
@@ -54,10 +54,6 @@
54 54
55#define QONG_FPGA_IRQ IOMUX_TO_IRQ(MX31_PIN_DTR_DCE1) 55#define QONG_FPGA_IRQ IOMUX_TO_IRQ(MX31_PIN_DTR_DCE1)
56 56
57/*
58 * This file contains the board-specific initialization routines.
59 */
60
61static const struct imxuart_platform_data uart_pdata __initconst = { 57static const struct imxuart_platform_data uart_pdata __initconst = {
62 .flags = IMXUART_HAVE_RTSCTS, 58 .flags = IMXUART_HAVE_RTSCTS,
63}; 59};
@@ -263,11 +259,6 @@ static struct sys_timer qong_timer = {
263 .init = qong_timer_init, 259 .init = qong_timer_init,
264}; 260};
265 261
266/*
267 * The following uses standard kernel macros defined in arch.h in order to
268 * initialize __mach_desc_QONG data structure.
269 */
270
271MACHINE_START(QONG, "Dave/DENX QongEVB-LITE") 262MACHINE_START(QONG, "Dave/DENX QongEVB-LITE")
272 /* Maintainer: DENX Software Engineering GmbH */ 263 /* Maintainer: DENX Software Engineering GmbH */
273 .boot_params = MX3x_PHYS_OFFSET + 0x100, 264 .boot_params = MX3x_PHYS_OFFSET + 0x100,
diff --git a/arch/arm/mach-mx3/mm.c b/arch/arm/mach-mx3/mm.c
index 3387319b0964..eefd4cf0a693 100644
--- a/arch/arm/mach-mx3/mm.c
+++ b/arch/arm/mach-mx3/mm.c
@@ -28,14 +28,6 @@
28#include <mach/hardware.h> 28#include <mach/hardware.h>
29#include <mach/iomux-v3.h> 29#include <mach/iomux-v3.h>
30 30
31/*!
32 * @file mm.c
33 *
34 * @brief This file creates static virtual to physical mappings, common to all MX3 boards.
35 *
36 * @ingroup Memory
37 */
38
39#ifdef CONFIG_SOC_IMX31 31#ifdef CONFIG_SOC_IMX31
40static struct map_desc mx31_io_desc[] __initdata = { 32static struct map_desc mx31_io_desc[] __initdata = {
41 imx_map_entry(MX31, X_MEMC, MT_DEVICE), 33 imx_map_entry(MX31, X_MEMC, MT_DEVICE),
@@ -135,4 +127,3 @@ static int mxc_init_l2x0(void)
135 127
136arch_initcall(mxc_init_l2x0); 128arch_initcall(mxc_init_l2x0);
137#endif 129#endif
138