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 commit 'v2.6.37-rc1' into for-2.6.37
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-devkit8000.c
diff --git
a/arch/arm/mach-omap2/board-devkit8000.c
b/arch/arm/mach-omap2/board-devkit8000.c
index
2205c20
..
067f437
100644
(file)
--- a/
arch/arm/mach-omap2/board-devkit8000.c
+++ b/
arch/arm/mach-omap2/board-devkit8000.c
@@
-28,6
+28,7
@@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/nand.h>
+#include <linux/mmc/host.h>
#include <linux/regulator/machine.h>
#include <linux/i2c/twl.h>
#include <linux/regulator/machine.h>
#include <linux/i2c/twl.h>
@@
-44,7
+45,6
@@
#include <plat/gpmc.h>
#include <plat/nand.h>
#include <plat/usb.h>
#include <plat/gpmc.h>
#include <plat/nand.h>
#include <plat/usb.h>
-#include <plat/timer-gp.h>
#include <plat/display.h>
#include <plat/mcspi.h>
#include <plat/display.h>
#include <plat/mcspi.h>
@@
-58,6
+58,7
@@
#include "mux.h"
#include "hsmmc.h"
#include "mux.h"
#include "hsmmc.h"
+#include "timer-gp.h"
#define NAND_BLOCK_SIZE SZ_128K
#define NAND_BLOCK_SIZE SZ_128K
@@
-105,7
+106,7
@@
static struct omap_nand_platform_data devkit8000_nand_data = {
static struct omap2_hsmmc_info mmc[] = {
{
.mmc = 1,
static struct omap2_hsmmc_info mmc[] = {
{
.mmc = 1,
- .
wires = 8
,
+ .
caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA
,
.gpio_wp = 29,
},
{} /* Terminator */
.gpio_wp = 29,
},
{} /* Terminator */
@@
-198,7
+199,7
@@
static struct platform_device devkit8000_dss_device = {
static struct regulator_consumer_supply devkit8000_vdda_dac_supply =
REGULATOR_SUPPLY("vdda_dac", "omapdss");
static struct regulator_consumer_supply devkit8000_vdda_dac_supply =
REGULATOR_SUPPLY("vdda_dac", "omapdss");
-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),