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 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[pandora-kernel.git]
/
arch
/
arm
/
mach-mxs
/
mach-tx28.c
diff --git
a/arch/arm/mach-mxs/mach-tx28.c
b/arch/arm/mach-mxs/mach-tx28.c
index
6766a12
..
515a423
100644
(file)
--- a/
arch/arm/mach-mxs/mach-tx28.c
+++ b/
arch/arm/mach-mxs/mach-tx28.c
@@
-139,6
+139,11
@@
static struct i2c_board_info tx28_stk5v3_i2c_boardinfo[] __initdata = {
},
};
},
};
+static struct mxs_mmc_platform_data tx28_mmc0_pdata __initdata = {
+ .wp_gpio = -EINVAL,
+ .flags = SLOTF_4_BIT_CAPABLE,
+};
+
static void __init tx28_stk5v3_init(void)
{
mxs_iomux_setup_multiple_pads(tx28_stk5v3_pads,
static void __init tx28_stk5v3_init(void)
{
mxs_iomux_setup_multiple_pads(tx28_stk5v3_pads,
@@
-155,6
+160,7
@@
static void __init tx28_stk5v3_init(void)
mx28_add_mxs_i2c(0);
i2c_register_board_info(0, tx28_stk5v3_i2c_boardinfo,
ARRAY_SIZE(tx28_stk5v3_i2c_boardinfo));
mx28_add_mxs_i2c(0);
i2c_register_board_info(0, tx28_stk5v3_i2c_boardinfo,
ARRAY_SIZE(tx28_stk5v3_i2c_boardinfo));
+ mx28_add_mxs_mmc(0, &tx28_mmc0_pdata);
}
static void __init tx28_timer_init(void)
}
static void __init tx28_timer_init(void)