diff options
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/board-tuna-bluetooth.h | 30 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap_hsi.h | 14 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/uncompress.h | 1 |
3 files changed, 40 insertions, 5 deletions
diff --git a/arch/arm/plat-omap/include/plat/board-tuna-bluetooth.h b/arch/arm/plat-omap/include/plat/board-tuna-bluetooth.h new file mode 100644 index 0000000..c74de05 --- /dev/null +++ b/arch/arm/plat-omap/include/plat/board-tuna-bluetooth.h @@ -0,0 +1,30 @@ +/* + * Bluetooth Broadcomm and low power control via GPIO + * + * Copyright (C) 2011 Samsung, Inc. + * Copyright (C) 2011 Google, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef __BOARD_TUNA_BLUETOOTH_H__ +#define __BOARD_TUNA_BLUETOOTH_H__ + +#include <linux/serial_core.h> + +extern void bcm_bt_lpm_exit_lpm_locked(struct uart_port *uport); + +#endif /* __BOARD_TUNA_BLUETOOTH_H__ */ diff --git a/arch/arm/plat-omap/include/plat/omap_hsi.h b/arch/arm/plat-omap/include/plat/omap_hsi.h index 1a75ed4..ba2c8e3 100644 --- a/arch/arm/plat-omap/include/plat/omap_hsi.h +++ b/arch/arm/plat-omap/include/plat/omap_hsi.h @@ -259,6 +259,11 @@ #define HSI_HSR_ERROR_TBE (1 << 4) /* HSI only */ #define HSI_HSR_ERROR_RME (1 << 7) /* HSI only */ #define HSI_HSR_ERROR_TME (1 << 11) /* HSI only */ +#define HSI_HSR_ERROR_ALL (HSI_HSR_ERROR_SIG | \ + HSI_HSR_ERROR_FTE | \ + HSI_HSR_ERROR_TBE | \ + HSI_HSR_ERROR_RME | \ + HSI_HSR_ERROR_TME) #define HSI_HSR_ERRORACK_REG(port) (HSI_HSR_BASE(port) + 0x0024) @@ -479,16 +484,15 @@ extern int omap_hsi_config(struct omap_hsi_board_config *hsi_config); #ifdef CONFIG_OMAP_HSI extern int omap_hsi_prepare_suspend(int hsi_port, bool dev_may_wakeup); -extern int omap_hsi_prepare_idle(void); +extern int omap_hsi_io_wakeup_check(void); extern int omap_hsi_wakeup(int hsi_port); -extern int omap_hsi_is_io_wakeup_from_hsi(void); +extern bool omap_hsi_is_io_wakeup_from_hsi(int *hsi_port); #else inline int omap_hsi_prepare_suspend(int hsi_port, bool dev_may_wakeup) { return -ENOSYS; } -inline int omap_hsi_prepare_idle(void) { return -ENOSYS; } +inline int omap_hsi_io_wakeup_check(void) { return -ENOSYS; } inline int omap_hsi_wakeup(int hsi_port) { return -ENOSYS; } -inline int omap_hsi_is_io_wakeup_from_hsi(void) { return -ENOSYS; } - +inline bool omap_hsi_is_io_wakeup_from_hsi(int *hsi_port) { return false; } #endif #endif /* __OMAP_HSI_H__ */ diff --git a/arch/arm/plat-omap/include/plat/uncompress.h b/arch/arm/plat-omap/include/plat/uncompress.h index ac4b60d..cf07178 100644 --- a/arch/arm/plat-omap/include/plat/uncompress.h +++ b/arch/arm/plat-omap/include/plat/uncompress.h @@ -164,6 +164,7 @@ static inline void __arch_decomp_setup(unsigned long arch_id) /* omap4 based boards using UART3 */ DEBUG_LL_OMAP4(3, omap_4430sdp); DEBUG_LL_OMAP4(3, omap4_panda); + DEBUG_LL_OMAP4(3, tuna); /* zoom2/3 external uart */ DEBUG_LL_ZOOM(omap_zoom2); |