diff options
Diffstat (limited to 'arch/arm/plat-omap/include')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/mmc.h | 4 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap-serial.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h index 5b6f533..b95aabd 100644 --- a/arch/arm/plat-omap/include/plat/mmc.h +++ b/arch/arm/plat-omap/include/plat/mmc.h @@ -15,6 +15,7 @@ #include <linux/device.h> #include <linux/mmc/host.h> +#include <asm/mach/mmc.h> #include <plat/board.h> #define OMAP15XX_NR_MMC 1 @@ -144,6 +145,9 @@ struct omap_mmc_platform_data { int card_detect_irq; int (*card_detect)(struct device *dev, int slot); + /* Additional mmc configuration */ + struct mmc_platform_data mmc_data; + unsigned int ban_openended:1; } slots[OMAP_MMC_MAX_SLOTS]; diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h index a16df26..2fbb5f0 100644 --- a/arch/arm/plat-omap/include/plat/omap-serial.h +++ b/arch/arm/plat-omap/include/plat/omap-serial.h @@ -93,6 +93,7 @@ struct omap_uart_port_info { void (*enable_wakeup)(struct platform_device *, bool); bool (*chk_wakeup)(struct platform_device *); + void (*wake_peer)(struct uart_port *); void __iomem *wk_st; void __iomem *wk_en; u32 wk_mask; @@ -159,5 +160,6 @@ struct uart_omap_port { unsigned int errata; void (*enable_wakeup)(struct platform_device *, bool); bool (*chk_wakeup)(struct platform_device *); + void (*wake_peer)(struct uart_port *); }; #endif /* __OMAP_SERIAL_H__ */ |