git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-ldp.c
diff --git
a/arch/arm/mach-omap2/board-ldp.c
b/arch/arm/mach-omap2/board-ldp.c
index
f28fd77
..
001fd97
100644
(file)
--- a/
arch/arm/mach-omap2/board-ldp.c
+++ b/
arch/arm/mach-omap2/board-ldp.c
@@
-27,6
+27,7
@@
#include <linux/i2c/twl.h>
#include <linux/io.h>
#include <linux/smsc911x.h>
#include <linux/i2c/twl.h>
#include <linux/io.h>
#include <linux/smsc911x.h>
+#include <linux/mmc/host.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
@@
-41,11
+42,12
@@
#include <mach/board-zoom.h>
#include <asm/delay.h>
#include <mach/board-zoom.h>
#include <asm/delay.h>
-#include <plat/control.h>
#include <plat/usb.h>
#include <plat/usb.h>
+#include "board-flash.h"
#include "mux.h"
#include "hsmmc.h"
#include "mux.h"
#include "hsmmc.h"
+#include "control.h"
#define LDP_SMSC911X_CS 1
#define LDP_SMSC911X_GPIO 152
#define LDP_SMSC911X_CS 1
#define LDP_SMSC911X_GPIO 152
@@
-82,7
+84,7
@@
static struct platform_device ldp_smsc911x_device = {
},
};
},
};
-static
in
t board_keymap[] = {
+static
uint32_
t board_keymap[] = {
KEY(0, 0, KEY_1),
KEY(1, 0, KEY_2),
KEY(2, 0, KEY_3),
KEY(0, 0, KEY_1),
KEY(1, 0, KEY_2),
KEY(2, 0, KEY_3),
@@
-362,7
+364,7
@@
static int __init omap_i2c_init(void)
static struct omap2_hsmmc_info mmc[] __initdata = {
{
.mmc = 1,
static struct omap2_hsmmc_info mmc[] __initdata = {
{
.mmc = 1,
- .
wires = 4
,
+ .
caps = MMC_CAP_4_BIT_DATA
,
.gpio_cd = -EINVAL,
.gpio_wp = -EINVAL,
},
.gpio_cd = -EINVAL,
.gpio_wp = -EINVAL,
},