Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 184710
b: refs/heads/master
c: d02a900
h: refs/heads/master
v: v3
  • Loading branch information
Adrian Hunter authored and Tony Lindgren committed Feb 15, 2010
1 parent ca1d14c commit deaee38
Show file tree
Hide file tree
Showing 16 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: db0fefc5119e2cfaa8f57565331e0abe47f0801e
refs/heads/master: d02a900b5952597b6beebd709d92ab392fa3005a
28 changes: 14 additions & 14 deletions trunk/arch/arm/mach-omap2/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/board-2430sdp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/board-3430sdp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/board-cm-t35.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/board-igep0020.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/board-ldp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/board-omap3beagle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/board-omap3evm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/board-omap3pandora.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/board-omap3touchbook.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
#include <plat/timer-gp.h>

#include "mux.h"
#include "mmc-twl4030.h"
#include "hsmmc.h"

#include <asm/setup.h>

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/board-overo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/board-rx51-peripherals.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/board-zoom-peripherals.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = {
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-omap2/mmc-twl4030.c → trunk/arch/arm/mach-omap2/hsmmc.c
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)

Expand Down
0 trunk/arch/arm/mach-omap2/mmc-twl4030.h → trunk/arch/arm/mach-omap2/hsmmc.h
View file
File renamed without changes.

0 comments on commit deaee38

Please sign in to comment.