projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel-gpio' into omap-for-linus
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap2
/
board-overo.c
diff --git
a/arch/arm/mach-omap2/board-overo.c
b/arch/arm/mach-omap2/board-overo.c
index 4c484361835063d17de2df8fe27c7fb28be7984f..b75bdcd47117cffca17dab3b58f3f981cdd51be8 100644
(file)
--- a/
arch/arm/mach-omap2/board-overo.c
+++ b/
arch/arm/mach-omap2/board-overo.c
@@
-32,6
+32,7
@@
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h>
+#include <linux/mmc/host.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@
-303,13
+304,13
@@
static void __init overo_flash_init(void)
static struct omap2_hsmmc_info mmc[] = {
{
.mmc = 1,
static struct omap2_hsmmc_info mmc[] = {
{
.mmc = 1,
- .
wires = 4
,
+ .
caps = MMC_CAP_4_BIT_DATA
,
.gpio_cd = -EINVAL,
.gpio_wp = -EINVAL,
},
{
.mmc = 2,
.gpio_cd = -EINVAL,
.gpio_wp = -EINVAL,
},
{
.mmc = 2,
- .
wires = 4
,
+ .
caps = MMC_CAP_4_BIT_DATA
,
.gpio_cd = -EINVAL,
.gpio_wp = -EINVAL,
.transceiver = true,
.gpio_cd = -EINVAL,
.gpio_wp = -EINVAL,
.transceiver = true,
@@
-415,7
+416,6
@@
static void __init overo_init_irq(void)
omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
mt46h32m32lf6_sdrc_params);
omap_init_irq();
omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
mt46h32m32lf6_sdrc_params);
omap_init_irq();
- omap_gpio_init();
}
static struct platform_device *overo_devices[] __initdata = {
}
static struct platform_device *overo_devices[] __initdata = {
@@
-437,8
+437,6
@@
static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR },
};
static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR },
};
-#else
-#define board_mux NULL
#endif
static struct omap_musb_board_data musb_board_data = {
#endif
static struct omap_musb_board_data musb_board_data = {
@@
-501,8
+499,6
@@
static void __init overo_init(void)
}
MACHINE_START(OVERO, "Gumstix Overo")
}
MACHINE_START(OVERO, "Gumstix Overo")
- .phys_io = 0x48000000,
- .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
.map_io = omap3_map_io,
.reserve = omap_reserve,
.boot_params = 0x80000100,
.map_io = omap3_map_io,
.reserve = omap_reserve,