diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-05-04 16:54:29 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:04:47 +0200 |
| commit | 2b6b5df0105133331059ff9c232ed04dd363e48f (patch) | |
| tree | 5f1b3d0172c1a1e55e73d764b536fe38cf7496e7 /include | |
| parent | 3a935469c96610d34a0469b4dbf963d771eaefa7 (diff) | |
I2S/DMA: Code cleanup
Cleanup of Gerrit Change-Id I35f8f245039a3cdac2e45b35154eae17bae3042d
ER: 323642
Change-Id: I6bb1df13a1b55e595cb702548db6c52225529e87
Signed-off-by: Craig Sutherland <craig.xx.sutherland@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/17718
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Conflicts:
drivers/misc/i2s/i2s.c
drivers/misc/i2s/i2s_test_protocol_driver.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2s/i2s.h | 1 | ||||
| -rw-r--r-- | include/linux/i2s/i2s_test_prot.h | 44 |
2 files changed, 1 insertions, 44 deletions
diff --git a/include/linux/i2s/i2s.h b/include/linux/i2s/i2s.h index b67fdb2d80d..94e461656a4 100644 --- a/include/linux/i2s/i2s.h +++ b/include/linux/i2s/i2s.h @@ -212,6 +212,7 @@ extern int i2s_hw_status(struct i2s_controller *i2s_cont); extern dma_addr_t i2s_get_pointer(struct i2s_controller *i2s_cont, enum i2s_direction_t i2s_direction); +extern struct i2s_device *i2s_get_device_from_boardinfo(int chip_select); /* used in MSP LTP tests */ extern struct i2s_device *i2s_alloc_device(struct device *dev); extern int i2s_add_device(struct i2s_device *i2s); diff --git a/include/linux/i2s/i2s_test_prot.h b/include/linux/i2s/i2s_test_prot.h deleted file mode 100644 index 003d0e6e3ab..00000000000 --- a/include/linux/i2s/i2s_test_prot.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) ST-Ericsson SA 2010 - * - * License terms: - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation. - */ - -#ifndef __I2S_TEST_PROT_DRIVER_IF_H__ -#define __I2S_TEST_PROT_DRIVER_IF_H__ -#include <mach/msp.h> -struct test_prot_config { - u32 tx_config_desc; - u32 rx_config_desc; - u32 frame_freq; - u32 frame_size; - u32 data_size; - u32 direction; - u32 protocol; - u32 work_mode; - struct msp_protocol_desc protocol_desc; - void (*handler) (void *data); - void *tx_callback_data; - void *rx_callback_data; - int multichannel_configured; - struct msp_multichannel_config multichannel_config; -}; - -int i2s_testprot_drv_open(int i2s_device_num); -int i2s_testprot_drv_configure(int i2s_device_num, - struct test_prot_config *config); -int i2s_config_default_protocol(int i2s_device_num, - struct test_prot_config *config); -int __i2s_testprot_drv_configure(int i2s_device_num, - struct test_prot_config *config, - bool use_default); -int i2s_testprot_drv_transfer(int i2s_device_num, void *txdata, size_t txbytes, - void *rxdata, size_t rxbytes, - enum i2s_transfer_mode_t transfer_mode); -int i2s_testprot_drv_close(int i2s_device_num); - -#endif |