aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/Makefile28
-rw-r--r--arch/arm/mach-omap2/board-2430sdp.c2
-rw-r--r--arch/arm/mach-omap2/board-3430sdp.c2
-rw-r--r--arch/arm/mach-omap2/board-cm-t35.c2
-rw-r--r--arch/arm/mach-omap2/board-igep0020.c2
-rw-r--r--arch/arm/mach-omap2/board-ldp.c2
-rw-r--r--arch/arm/mach-omap2/board-omap3beagle.c2
-rw-r--r--arch/arm/mach-omap2/board-omap3evm.c2
-rw-r--r--arch/arm/mach-omap2/board-omap3pandora.c2
-rw-r--r--arch/arm/mach-omap2/board-omap3touchbook.c2
-rw-r--r--arch/arm/mach-omap2/board-overo.c2
-rw-r--r--arch/arm/mach-omap2/board-rx51-peripherals.c2
-rwxr-xr-xarch/arm/mach-omap2/board-zoom-peripherals.c2
-rw-r--r--arch/arm/mach-omap2/hsmmc.c (renamed from arch/arm/mach-omap2/mmc-twl4030.c)4
-rw-r--r--arch/arm/mach-omap2/hsmmc.h (renamed from arch/arm/mach-omap2/mmc-twl4030.h)0
15 files changed, 28 insertions, 28 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index af5853f13c7..dfc49a0c692 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -87,43 +87,43 @@ obj-y += $(i2c-omap-m) $(i2c-omap-y)
87obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o 87obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o
88obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o 88obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o
89obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o \ 89obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o \
90 mmc-twl4030.o 90 hsmmc.o
91obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o 91obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o
92obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \ 92obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \
93 mmc-twl4030.o 93 hsmmc.o
94obj-$(CONFIG_MACH_OMAP_LDP) += board-ldp.o \ 94obj-$(CONFIG_MACH_OMAP_LDP) += board-ldp.o \
95 mmc-twl4030.o 95 hsmmc.o
96obj-$(CONFIG_MACH_OVERO) += board-overo.o \ 96obj-$(CONFIG_MACH_OVERO) += board-overo.o \
97 mmc-twl4030.o 97 hsmmc.o
98obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o \ 98obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o \
99 mmc-twl4030.o 99 hsmmc.o
100obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \ 100obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \
101 mmc-twl4030.o 101 hsmmc.o
102obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \ 102obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \
103 mmc-twl4030.o \ 103 hsmmc.o \
104 board-sdp-flash.o 104 board-sdp-flash.o
105obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o 105obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o
106obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ 106obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
107 board-rx51-sdram.o \ 107 board-rx51-sdram.o \
108 board-rx51-peripherals.o \ 108 board-rx51-peripherals.o \
109 mmc-twl4030.o 109 hsmmc.o
110obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2.o \ 110obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2.o \
111 board-zoom-peripherals.o \ 111 board-zoom-peripherals.o \
112 mmc-twl4030.o \ 112 hsmmc.o \
113 board-zoom-debugboard.o 113 board-zoom-debugboard.o
114obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom3.o \ 114obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom3.o \
115 board-zoom-peripherals.o \ 115 board-zoom-peripherals.o \
116 mmc-twl4030.o \ 116 hsmmc.o \
117 board-zoom-debugboard.o 117 board-zoom-debugboard.o
118obj-$(CONFIG_MACH_OMAP_3630SDP) += board-3630sdp.o \ 118obj-$(CONFIG_MACH_OMAP_3630SDP) += board-3630sdp.o \
119 board-zoom-peripherals.o \ 119 board-zoom-peripherals.o \
120 mmc-twl4030.o 120 hsmmc.o
121obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \ 121obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \
122 mmc-twl4030.o 122 hsmmc.o
123obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o \ 123obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o \
124 mmc-twl4030.o 124 hsmmc.o
125obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o \ 125obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o \
126 mmc-twl4030.o 126 hsmmc.o
127obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o 127obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o
128 128
129obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o 129obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index 18497b7a827..a43c0943dbf 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -38,7 +38,7 @@
38#include <plat/usb.h> 38#include <plat/usb.h>
39#include <plat/gpmc-smc91x.h> 39#include <plat/gpmc-smc91x.h>
40 40
41#include "mmc-twl4030.h" 41#include "hsmmc.h"
42 42
43#define SDP2430_CS0_BASE 0x04000000 43#define SDP2430_CS0_BASE 0x04000000
44#define SECONDARY_LCD_GPIO 147 44#define SECONDARY_LCD_GPIO 147
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 2e38e5bc1cc..6c7261b6b06 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -45,7 +45,7 @@
45 45
46#include "mux.h" 46#include "mux.h"
47#include "sdram-qimonda-hyb18m512160af-6.h" 47#include "sdram-qimonda-hyb18m512160af-6.h"
48#include "mmc-twl4030.h" 48#include "hsmmc.h"
49 49
50#define CONFIG_DISABLE_HFCLK 1 50#define CONFIG_DISABLE_HFCLK 1
51 51
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 0e292317c0c..ac3c9332d0f 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -50,7 +50,7 @@
50 50
51#include "mux.h" 51#include "mux.h"
52#include "sdram-micron-mt46h32m32lf-6.h" 52#include "sdram-micron-mt46h32m32lf-6.h"
53#include "mmc-twl4030.h" 53#include "hsmmc.h"
54 54
55#define CM_T35_GPIO_PENDOWN 57 55#define CM_T35_GPIO_PENDOWN 57
56 56
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 9f754338449..ea7bfbacedd 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -30,7 +30,7 @@
30#include <plat/usb.h> 30#include <plat/usb.h>
31 31
32#include "mux.h" 32#include "mux.h"
33#include "mmc-twl4030.h" 33#include "hsmmc.h"
34 34
35#define IGEP2_SMSC911X_CS 5 35#define IGEP2_SMSC911X_CS 5
36#define IGEP2_SMSC911X_GPIO 176 36#define IGEP2_SMSC911X_GPIO 176
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index f1699674a2f..f2b47cb7275 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -44,7 +44,7 @@
44#include <plat/usb.h> 44#include <plat/usb.h>
45 45
46#include "mux.h" 46#include "mux.h"
47#include "mmc-twl4030.h" 47#include "hsmmc.h"
48 48
49#define LDP_SMSC911X_CS 1 49#define LDP_SMSC911X_CS 1
50#define LDP_SMSC911X_GPIO 152 50#define LDP_SMSC911X_GPIO 152
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index bf91bf7bd92..7812da065d2 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -45,7 +45,7 @@
45#include <plat/timer-gp.h> 45#include <plat/timer-gp.h>
46 46
47#include "mux.h" 47#include "mux.h"
48#include "mmc-twl4030.h" 48#include "hsmmc.h"
49 49
50#define GPMC_CS0_BASE 0x60 50#define GPMC_CS0_BASE 0x60
51#define GPMC_CS_SIZE 0x30 51#define GPMC_CS_SIZE 0x30
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index a221b7a1fcc..78724d85921 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -45,7 +45,7 @@
45 45
46#include "mux.h" 46#include "mux.h"
47#include "sdram-micron-mt46h32m32lf-6.h" 47#include "sdram-micron-mt46h32m32lf-6.h"
48#include "mmc-twl4030.h" 48#include "hsmmc.h"
49 49
50#define OMAP3_EVM_TS_GPIO 175 50#define OMAP3_EVM_TS_GPIO 175
51#define OMAP3_EVM_EHCI_VBUS 22 51#define OMAP3_EVM_EHCI_VBUS 22
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index bc482abdd5d..63437037fc9 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -43,7 +43,7 @@
43 43
44#include "mux.h" 44#include "mux.h"
45#include "sdram-micron-mt46h32m32lf-6.h" 45#include "sdram-micron-mt46h32m32lf-6.h"
46#include "mmc-twl4030.h" 46#include "hsmmc.h"
47 47
48#define OMAP3_PANDORA_TS_GPIO 94 48#define OMAP3_PANDORA_TS_GPIO 94
49 49
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
index 63436e9c206..1e3f53c605c 100644
--- a/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@ -50,7 +50,7 @@
50#include <plat/timer-gp.h> 50#include <plat/timer-gp.h>
51 51
52#include "mux.h" 52#include "mux.h"
53#include "mmc-twl4030.h" 53#include "hsmmc.h"
54 54
55#include <asm/setup.h> 55#include <asm/setup.h>
56 56
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 61abe090726..3fc918b0c65 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -48,7 +48,7 @@
48 48
49#include "mux.h" 49#include "mux.h"
50#include "sdram-micron-mt46h32m32lf-6.h" 50#include "sdram-micron-mt46h32m32lf-6.h"
51#include "mmc-twl4030.h" 51#include "hsmmc.h"
52 52
53#define OVERO_GPIO_BT_XGATE 15 53#define OVERO_GPIO_BT_XGATE 15
54#define OVERO_GPIO_W2W_NRESET 16 54#define OVERO_GPIO_W2W_NRESET 16
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index acafdbc8aa1..b2de2066fb0 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -34,7 +34,7 @@
34#include <plat/gpmc-smc91x.h> 34#include <plat/gpmc-smc91x.h>
35 35
36#include "mux.h" 36#include "mux.h"
37#include "mmc-twl4030.h" 37#include "hsmmc.h"
38 38
39#define SYSTEM_REV_B_USES_VAUX3 0x1699 39#define SYSTEM_REV_B_USES_VAUX3 0x1699
40#define SYSTEM_REV_S_USES_VAUX3 0x8 40#define SYSTEM_REV_S_USES_VAUX3 0x8
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index 1e3dfb652ac..52940a426d9 100755
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -24,7 +24,7 @@
24#include <plat/common.h> 24#include <plat/common.h>
25#include <plat/usb.h> 25#include <plat/usb.h>
26 26
27#include "mmc-twl4030.h" 27#include "hsmmc.h"
28 28
29/* Zoom2 has Qwerty keyboard*/ 29/* Zoom2 has Qwerty keyboard*/
30static int board_keymap[] = { 30static int board_keymap[] = {
diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/hsmmc.c
index 6f8f29e99ff..df1cf727331 100644
--- a/arch/arm/mach-omap2/mmc-twl4030.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/arm/mach-omap2/mmc-twl4030.c 2 * linux/arch/arm/mach-omap2/hsmmc.c
3 * 3 *
4 * Copyright (C) 2007-2008 Texas Instruments 4 * Copyright (C) 2007-2008 Texas Instruments
5 * Copyright (C) 2008 Nokia Corporation 5 * Copyright (C) 2008 Nokia Corporation
@@ -17,7 +17,7 @@
17#include <plat/control.h> 17#include <plat/control.h>
18#include <plat/mmc.h> 18#include <plat/mmc.h>
19 19
20#include "mmc-twl4030.h" 20#include "hsmmc.h"
21 21
22#if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) 22#if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
23 23
diff --git a/arch/arm/mach-omap2/mmc-twl4030.h b/arch/arm/mach-omap2/hsmmc.h
index 87d67c10bde..87d67c10bde 100644
--- a/arch/arm/mach-omap2/mmc-twl4030.h
+++ b/arch/arm/mach-omap2/hsmmc.h
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-19 05:02:31 -0500