diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-03-08 10:07:30 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-24 09:40:31 -0400 |
commit | 1faeaab27b0b9d35acb3ce3a333cb38a30136a11 (patch) | |
tree | 86626a3feae7b6ea20688849d819b3b8823dbd95 /arch/arm/mach-mx2 | |
parent | d393d43ff799a1ac3766cdbca9a6367cb8c02db9 (diff) |
ARM: mx2/mx27ads: fold board header in its only user
Moreover remove unused definitions.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx2')
-rw-r--r-- | arch/arm/mach-mx2/mach-mx27ads.c | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/arch/arm/mach-mx2/mach-mx27ads.c b/arch/arm/mach-mx2/mach-mx27ads.c index 6ce323669e58..2183e3d4875a 100644 --- a/arch/arm/mach-mx2/mach-mx27ads.c +++ b/arch/arm/mach-mx2/mach-mx27ads.c | |||
@@ -34,7 +34,6 @@ | |||
34 | #include <mach/gpio.h> | 34 | #include <mach/gpio.h> |
35 | #include <mach/imx-uart.h> | 35 | #include <mach/imx-uart.h> |
36 | #include <mach/iomux-mx27.h> | 36 | #include <mach/iomux-mx27.h> |
37 | #include <mach/board-mx27ads.h> | ||
38 | #include <mach/mxc_nand.h> | 37 | #include <mach/mxc_nand.h> |
39 | #include <mach/i2c.h> | 38 | #include <mach/i2c.h> |
40 | #include <mach/imxfb.h> | 39 | #include <mach/imxfb.h> |
@@ -42,6 +41,36 @@ | |||
42 | 41 | ||
43 | #include "devices.h" | 42 | #include "devices.h" |
44 | 43 | ||
44 | /* | ||
45 | * Base address of PBC controller, CS4 | ||
46 | */ | ||
47 | #define PBC_BASE_ADDRESS 0xf4300000 | ||
48 | #define PBC_REG_ADDR(offset) (void __force __iomem *) \ | ||
49 | (PBC_BASE_ADDRESS + (offset)) | ||
50 | |||
51 | /* When the PBC address connection is fixed in h/w, defined as 1 */ | ||
52 | #define PBC_ADDR_SH 0 | ||
53 | |||
54 | /* Offsets for the PBC Controller register */ | ||
55 | /* | ||
56 | * PBC Board version register offset | ||
57 | */ | ||
58 | #define PBC_VERSION_REG PBC_REG_ADDR(0x00000 >> PBC_ADDR_SH) | ||
59 | /* | ||
60 | * PBC Board control register 1 set address. | ||
61 | */ | ||
62 | #define PBC_BCTRL1_SET_REG PBC_REG_ADDR(0x00008 >> PBC_ADDR_SH) | ||
63 | /* | ||
64 | * PBC Board control register 1 clear address. | ||
65 | */ | ||
66 | #define PBC_BCTRL1_CLEAR_REG PBC_REG_ADDR(0x0000C >> PBC_ADDR_SH) | ||
67 | |||
68 | /* PBC Board Control Register 1 bit definitions */ | ||
69 | #define PBC_BCTRL1_LCDON 0x0800 /* Enable the LCD */ | ||
70 | |||
71 | /* to determine the correct external crystal reference */ | ||
72 | #define CKIH_27MHZ_BIT_SET (1 << 3) | ||
73 | |||
45 | static unsigned int mx27ads_pins[] = { | 74 | static unsigned int mx27ads_pins[] = { |
46 | /* UART0 */ | 75 | /* UART0 */ |
47 | PE12_PF_UART1_TXD, | 76 | PE12_PF_UART1_TXD, |
@@ -342,4 +371,3 @@ MACHINE_START(MX27ADS, "Freescale i.MX27ADS") | |||
342 | .init_machine = mx27ads_board_init, | 371 | .init_machine = mx27ads_board_init, |
343 | .timer = &mx27ads_timer, | 372 | .timer = &mx27ads_timer, |
344 | MACHINE_END | 373 | MACHINE_END |
345 | |||