omap: Rename mmc-twl4030 files to hsmmc

mmc-twl4030.[ch] no longer has any dependency on twl4030 and should be renamed to reflect that. Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
author: Adrian Hunter <adrian.hunter@nokia.com> 2010-02-15 13:03:34 -0500
committer: Tony Lindgren <tony@atomide.com> 2010-02-15 13:03:34 -0500
commit: d02a900b5952597b6beebd709d92ab392fa3005a (patch)
tree: 0fcf2dc829872dac48bcdb98c02ca632159f9b11 /arch/arm
parent: db0fefc5119e2cfaa8f57565331e0abe47f0801e (diff)
15 files changed, 28 insertions, 28 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index af5853f13c7a..dfc49a0c6927 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)
 obj-$(CONFIG_MACH_OMAP_GENERIC)         += board-generic.o
 obj-$(CONFIG_MACH_OMAP_H4)              += board-h4.o
 obj-$(CONFIG_MACH_OMAP_2430SDP)         += board-2430sdp.o \
-                                           mmc-twl4030.o
+                                           hsmmc.o
 obj-$(CONFIG_MACH_OMAP_APOLLON)         += board-apollon.o
 obj-$(CONFIG_MACH_OMAP3_BEAGLE)         += board-omap3beagle.o \
-                                           mmc-twl4030.o
+                                           hsmmc.o
 obj-$(CONFIG_MACH_OMAP_LDP)             += board-ldp.o \
-                                           mmc-twl4030.o
+                                           hsmmc.o
 obj-$(CONFIG_MACH_OVERO)                += board-overo.o \
-                                           mmc-twl4030.o
+                                           hsmmc.o
 obj-$(CONFIG_MACH_OMAP3EVM)             += board-omap3evm.o \
-                                           mmc-twl4030.o
+                                           hsmmc.o
 obj-$(CONFIG_MACH_OMAP3_PANDORA)        += board-omap3pandora.o \
-                                           mmc-twl4030.o
+                                           hsmmc.o
 obj-$(CONFIG_MACH_OMAP_3430SDP)         += board-3430sdp.o \
-                                           mmc-twl4030.o \
+                                           hsmmc.o \
                                           board-sdp-flash.o
 obj-$(CONFIG_MACH_NOKIA_N8X0)           += board-n8x0.o
 obj-$(CONFIG_MACH_NOKIA_RX51)           += board-rx51.o \
                                           board-rx51-sdram.o \
                                           board-rx51-peripherals.o \
-                                           mmc-twl4030.o
+                                           hsmmc.o
 obj-$(CONFIG_MACH_OMAP_ZOOM2)           += board-zoom2.o \
                                           board-zoom-peripherals.o \
-                                           mmc-twl4030.o \
+                                           hsmmc.o \
                                           board-zoom-debugboard.o
 obj-$(CONFIG_MACH_OMAP_ZOOM3)           += board-zoom3.o \
                                           board-zoom-peripherals.o \
-                                           mmc-twl4030.o \
+                                           hsmmc.o \
                                           board-zoom-debugboard.o
 obj-$(CONFIG_MACH_OMAP_3630SDP)         += board-3630sdp.o \
                                           board-zoom-peripherals.o \
-                                           mmc-twl4030.o
+                                           hsmmc.o
 obj-$(CONFIG_MACH_CM_T35)               += board-cm-t35.o \
-                                           mmc-twl4030.o
+                                           hsmmc.o
 obj-$(CONFIG_MACH_IGEP0020)             += board-igep0020.o \
-                                           mmc-twl4030.o
+                                           hsmmc.o
 obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)      += board-omap3touchbook.o \
-                                           mmc-twl4030.o
+                                           hsmmc.o
 obj-$(CONFIG_MACH_OMAP_4430SDP)         += board-4430sdp.o
 obj-$(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 18497b7a8278..a43c0943dbf3 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -38,7 +38,7 @@
 #include <plat/usb.h>
 #include <plat/gpmc-smc91x.h>
-#include "mmc-twl4030.h"
+#include "hsmmc.h"
 #define SDP2430_CS0_BASE        0x04000000
 #define SECONDARY_LCD_GPIO              147
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 2e38e5bc1cc8..6c7261b6b06f 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -45,7 +45,7 @@
 #include "mux.h"
 #include "sdram-qimonda-hyb18m512160af-6.h"
-#include "mmc-twl4030.h"
+#include "hsmmc.h"
 #define CONFIG_DISABLE_HFCLK 1
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 0e292317c0ca..ac3c9332d0fa 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -50,7 +50,7 @@
 #include "mux.h"
 #include "sdram-micron-mt46h32m32lf-6.h"
-#include "mmc-twl4030.h"
+#include "hsmmc.h"
 #define CM_T35_GPIO_PENDOWN     57
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 9f7543384498..ea7bfbaceddd 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -30,7 +30,7 @@
 #include <plat/usb.h>
 #include "mux.h"
-#include "mmc-twl4030.h"
+#include "hsmmc.h"
 #define IGEP2_SMSC911X_CS       5
 #define IGEP2_SMSC911X_GPIO     176
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index f1699674a2fc..f2b47cb7275a 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -44,7 +44,7 @@
 #include <plat/usb.h>
 #include "mux.h"
-#include "mmc-twl4030.h"
+#include "hsmmc.h"
 #define LDP_SMSC911X_CS         1
 #define LDP_SMSC911X_GPIO       152
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index bf91bf7bd921..7812da065d2f 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -45,7 +45,7 @@
 #include <plat/timer-gp.h>
 #include "mux.h"
-#include "mmc-twl4030.h"
+#include "hsmmc.h"
 #define GPMC_CS0_BASE  0x60
 #define GPMC_CS_SIZE   0x30
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index a221b7a1fcc6..78724d859216 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -45,7 +45,7 @@
 #include "mux.h"
 #include "sdram-micron-mt46h32m32lf-6.h"
-#include "mmc-twl4030.h"
+#include "hsmmc.h"
 #define OMAP3_EVM_TS_GPIO       175
 #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 bc482abdd5d4..63437037fc9f 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -43,7 +43,7 @@
 #include "mux.h"
 #include "sdram-micron-mt46h32m32lf-6.h"
-#include "mmc-twl4030.h"
+#include "hsmmc.h"
 #define OMAP3_PANDORA_TS_GPIO           94
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
index 63436e9c2069..1e3f53c605ca 100644
--- a/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@ -50,7 +50,7 @@
 #include <plat/timer-gp.h>
 #include "mux.h"
-#include "mmc-twl4030.h"
+#include "hsmmc.h"
 #include <asm/setup.h>
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 61abe0907265..3fc918b0c655 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -48,7 +48,7 @@
 #include "mux.h"
 #include "sdram-micron-mt46h32m32lf-6.h"
-#include "mmc-twl4030.h"
+#include "hsmmc.h"
 #define OVERO_GPIO_BT_XGATE     15
 #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 acafdbc8aa16..b2de2066fb00 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -34,7 +34,7 @@
 #include <plat/gpmc-smc91x.h>
 #include "mux.h"
-#include "mmc-twl4030.h"
+#include "hsmmc.h"
 #define SYSTEM_REV_B_USES_VAUX3 0x1699
 #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 1e3dfb652acc..52940a426d9d 100755
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -24,7 +24,7 @@
 #include <plat/common.h>
 #include <plat/usb.h>
-#include "mmc-twl4030.h"
+#include "hsmmc.h"
 /* Zoom2 has Qwerty keyboard*/
 static int board_keymap[] = {
diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/hsmmc.c
index 6f8f29e99ff2..df1cf7273317 100644
--- a/arch/arm/mach-omap2/mmc-twl4030.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap2/mmc-twl4030.c
+ * linux/arch/arm/mach-omap2/hsmmc.c
 *
 * Copyright (C) 2007-2008 Texas Instruments
 * Copyright (C) 2008 Nokia Corporation
@@ -17,7 +17,7 @@
 #include <plat/control.h>
 #include <plat/mmc.h>
-#include "mmc-twl4030.h"
+#include "hsmmc.h"
 #if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
diff --git a/arch/arm/mach-omap2/mmc-twl4030.h b/arch/arm/mach-omap2/hsmmc.h
index 87d67c10bdec..87d67c10bdec 100644
--- a/arch/arm/mach-omap2/mmc-twl4030.h
+++ b/arch/arm/mach-omap2/hsmmc.h
author	Adrian Hunter <adrian.hunter@nokia.com>	2010-02-15 13:03:34 -0500
committer	Tony Lindgren <tony@atomide.com>	2010-02-15 13:03:34 -0500
commit	d02a900b5952597b6beebd709d92ab392fa3005a (patch)
tree	0fcf2dc829872dac48bcdb98c02ca632159f9b11 /arch/arm
parent	db0fefc5119e2cfaa8f57565331e0abe47f0801e (diff)

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index af5853f13c7a..dfc49a0c6927 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)
87	obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o	87	obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o
88	obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o	88	obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o
89	obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o \	89	obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o \
90	mmc-twl4030.o	90	hsmmc.o
91	obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o	91	obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o
92	obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \	92	obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \
93	mmc-twl4030.o	93	hsmmc.o
94	obj-$(CONFIG_MACH_OMAP_LDP) += board-ldp.o \	94	obj-$(CONFIG_MACH_OMAP_LDP) += board-ldp.o \
95	mmc-twl4030.o	95	hsmmc.o
96	obj-$(CONFIG_MACH_OVERO) += board-overo.o \	96	obj-$(CONFIG_MACH_OVERO) += board-overo.o \
97	mmc-twl4030.o	97	hsmmc.o
98	obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o \	98	obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o \
99	mmc-twl4030.o	99	hsmmc.o
100	obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \	100	obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \
101	mmc-twl4030.o	101	hsmmc.o
102	obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \	102	obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \
103	mmc-twl4030.o \	103	hsmmc.o \
104	board-sdp-flash.o	104	board-sdp-flash.o
105	obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o	105	obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o
106	obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \	106	obj-$(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
110	obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2.o \	110	obj-$(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
114	obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom3.o \	114	obj-$(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
118	obj-$(CONFIG_MACH_OMAP_3630SDP) += board-3630sdp.o \	118	obj-$(CONFIG_MACH_OMAP_3630SDP) += board-3630sdp.o \
119	board-zoom-peripherals.o \	119	board-zoom-peripherals.o \
120	mmc-twl4030.o	120	hsmmc.o
121	obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \	121	obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \
122	mmc-twl4030.o	122	hsmmc.o
123	obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o \	123	obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o \
124	mmc-twl4030.o	124	hsmmc.o
125	obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o \	125	obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o \
126	mmc-twl4030.o	126	hsmmc.o
127	obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o	127	obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o
128		128
129	obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o	129	obj-$(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 18497b7a8278..a43c0943dbf3 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 2e38e5bc1cc8..6c7261b6b06f 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 0e292317c0ca..ac3c9332d0fa 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 9f7543384498..ea7bfbaceddd 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 f1699674a2fc..f2b47cb7275a 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 bf91bf7bd921..7812da065d2f 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 a221b7a1fcc6..78724d859216 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 bc482abdd5d4..63437037fc9f 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 63436e9c2069..1e3f53c605ca 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 61abe0907265..3fc918b0c655 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 acafdbc8aa16..b2de2066fb00 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 1e3dfb652acc..52940a426d9d 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*/
30	static int board_keymap[] = {	30	static int board_keymap[] = {


diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/hsmmc.c index 6f8f29e99ff2..df1cf7273317 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 87d67c10bdec..87d67c10bdec 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.h +++ b/arch/arm/mach-omap2/hsmmc.h