diff options
author | Tony Lindgren <tony@atomide.com> | 2012-09-19 13:33:43 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-09-20 18:02:19 -0400 |
commit | e27e35ec735fa78c976d30304f852cd2e02c5d1f (patch) | |
tree | df0dd1fd226538c723919d22585f813fc706a3a5 /arch/arm/mach-omap1 | |
parent | 70c494c3122fb3d53518aea53c8cf5d61cad909a (diff) |
ARM: OMAP1: Move board-ams-delta.h from plat to mach
This is only used by omap1.
And to fix things properly, this should not be included
from the drivers at all.
Acked-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-fbdev@vger.kernel.org
Cc: Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
Cc: linux-mtd@lists.infradead.org
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Liam Girdwood <lrg@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: alsa-devel@alsa-project.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r-- | arch/arm/mach-omap1/ams-delta-fiq-handler.S | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap1/ams-delta-fiq.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-ams-delta.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap1/include/mach/board-ams-delta.h | 71 |
4 files changed, 74 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/ams-delta-fiq-handler.S b/arch/arm/mach-omap1/ams-delta-fiq-handler.S index d2b6acce8fc1..3d1e1c250a1a 100644 --- a/arch/arm/mach-omap1/ams-delta-fiq-handler.S +++ b/arch/arm/mach-omap1/ams-delta-fiq-handler.S | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <linux/linkage.h> | 16 | #include <linux/linkage.h> |
17 | #include <asm/assembler.h> | 17 | #include <asm/assembler.h> |
18 | 18 | ||
19 | #include <plat/board-ams-delta.h> | 19 | #include <mach/board-ams-delta.h> |
20 | 20 | ||
21 | #include <mach/irqs.h> | 21 | #include <mach/irqs.h> |
22 | #include <mach/ams-delta-fiq.h> | 22 | #include <mach/ams-delta-fiq.h> |
diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c index 68e8e5654c0a..f12a12af3523 100644 --- a/arch/arm/mach-omap1/ams-delta-fiq.c +++ b/arch/arm/mach-omap1/ams-delta-fiq.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
20 | #include <linux/io.h> | 20 | #include <linux/io.h> |
21 | 21 | ||
22 | #include <plat/board-ams-delta.h> | 22 | #include <mach/board-ams-delta.h> |
23 | 23 | ||
24 | #include <asm/fiq.h> | 24 | #include <asm/fiq.h> |
25 | 25 | ||
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 275d7e50ae10..9518bf5996dc 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include <asm/mach/arch.h> | 35 | #include <asm/mach/arch.h> |
36 | #include <asm/mach/map.h> | 36 | #include <asm/mach/map.h> |
37 | 37 | ||
38 | #include <plat/board-ams-delta.h> | 38 | #include <mach/board-ams-delta.h> |
39 | #include <linux/platform_data/keypad-omap.h> | 39 | #include <linux/platform_data/keypad-omap.h> |
40 | #include <mach/mux.h> | 40 | #include <mach/mux.h> |
41 | 41 | ||
diff --git a/arch/arm/mach-omap1/include/mach/board-ams-delta.h b/arch/arm/mach-omap1/include/mach/board-ams-delta.h new file mode 100644 index 000000000000..ad6f865d1f16 --- /dev/null +++ b/arch/arm/mach-omap1/include/mach/board-ams-delta.h | |||
@@ -0,0 +1,71 @@ | |||
1 | /* | ||
2 | * arch/arm/plat-omap/include/mach/board-ams-delta.h | ||
3 | * | ||
4 | * Copyright (C) 2006 Jonathan McDowell <noodles@earth.li> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify it | ||
7 | * under the terms of the GNU General Public License as published by the | ||
8 | * Free Software Foundation; either version 2 of the License, or (at your | ||
9 | * option) any later version. | ||
10 | * | ||
11 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED | ||
12 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
13 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
14 | * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
15 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
16 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
17 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
18 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
19 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
20 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
21 | * | ||
22 | * You should have received a copy of the GNU General Public License along | ||
23 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
24 | * 675 Mass Ave, Cambridge, MA 02139, USA. | ||
25 | */ | ||
26 | #ifndef __ASM_ARCH_OMAP_AMS_DELTA_H | ||
27 | #define __ASM_ARCH_OMAP_AMS_DELTA_H | ||
28 | |||
29 | #if defined (CONFIG_MACH_AMS_DELTA) | ||
30 | |||
31 | #define AMD_DELTA_LATCH2_SCARD_RSTIN 0x0400 | ||
32 | #define AMD_DELTA_LATCH2_SCARD_CMDVCC 0x0800 | ||
33 | #define AMS_DELTA_LATCH2_MODEM_CODEC 0x2000 | ||
34 | |||
35 | #define AMS_DELTA_GPIO_PIN_KEYBRD_DATA 0 | ||
36 | #define AMS_DELTA_GPIO_PIN_KEYBRD_CLK 1 | ||
37 | #define AMS_DELTA_GPIO_PIN_MODEM_IRQ 2 | ||
38 | #define AMS_DELTA_GPIO_PIN_HOOK_SWITCH 4 | ||
39 | #define AMS_DELTA_GPIO_PIN_SCARD_NOFF 6 | ||
40 | #define AMS_DELTA_GPIO_PIN_SCARD_IO 7 | ||
41 | #define AMS_DELTA_GPIO_PIN_CONFIG 11 | ||
42 | #define AMS_DELTA_GPIO_PIN_NAND_RB 12 | ||
43 | |||
44 | #define AMS_DELTA_GPIO_PIN_LCD_VBLEN 240 | ||
45 | #define AMS_DELTA_GPIO_PIN_LCD_NDISP 241 | ||
46 | #define AMS_DELTA_GPIO_PIN_NAND_NCE 242 | ||
47 | #define AMS_DELTA_GPIO_PIN_NAND_NRE 243 | ||
48 | #define AMS_DELTA_GPIO_PIN_NAND_NWP 244 | ||
49 | #define AMS_DELTA_GPIO_PIN_NAND_NWE 245 | ||
50 | #define AMS_DELTA_GPIO_PIN_NAND_ALE 246 | ||
51 | #define AMS_DELTA_GPIO_PIN_NAND_CLE 247 | ||
52 | #define AMS_DELTA_GPIO_PIN_KEYBRD_PWR 248 | ||
53 | #define AMS_DELTA_GPIO_PIN_KEYBRD_DATAOUT 249 | ||
54 | #define AMS_DELTA_GPIO_PIN_SCARD_RSTIN 250 | ||
55 | #define AMS_DELTA_GPIO_PIN_SCARD_CMDVCC 251 | ||
56 | #define AMS_DELTA_GPIO_PIN_MODEM_NRESET 252 | ||
57 | #define AMS_DELTA_GPIO_PIN_MODEM_CODEC 253 | ||
58 | |||
59 | #define AMS_DELTA_LATCH2_GPIO_BASE AMS_DELTA_GPIO_PIN_LCD_VBLEN | ||
60 | #define AMS_DELTA_LATCH2_NGPIO 16 | ||
61 | |||
62 | #ifndef __ASSEMBLY__ | ||
63 | void ams_delta_latch_write(int base, int ngpio, u16 mask, u16 value); | ||
64 | #define ams_delta_latch2_write(mask, value) \ | ||
65 | ams_delta_latch_write(AMS_DELTA_LATCH2_GPIO_BASE, \ | ||
66 | AMS_DELTA_LATCH2_NGPIO, (mask), (value)) | ||
67 | #endif | ||
68 | |||
69 | #endif /* CONFIG_MACH_AMS_DELTA */ | ||
70 | |||
71 | #endif /* __ASM_ARCH_OMAP_AMS_DELTA_H */ | ||