diff options
| -rw-r--r-- | sound/soc/ux500/ux500_msp_dai.h | 2 | ||||
| -rw-r--r-- | sound/soc/ux500/ux500_msp_i2s.h | 31 |
2 files changed, 0 insertions, 33 deletions
diff --git a/sound/soc/ux500/ux500_msp_dai.h b/sound/soc/ux500/ux500_msp_dai.h index f53104359f15..c7212825fe4c 100644 --- a/sound/soc/ux500/ux500_msp_dai.h +++ b/sound/soc/ux500/ux500_msp_dai.h | |||
| @@ -58,8 +58,6 @@ struct ux500_msp_i2s_drvdata { | |||
| 58 | unsigned int rx_mask; | 58 | unsigned int rx_mask; |
| 59 | int slots; | 59 | int slots; |
| 60 | int slot_width; | 60 | int slot_width; |
| 61 | u8 configured; | ||
| 62 | int data_delay; | ||
| 63 | 61 | ||
| 64 | /* Clocks */ | 62 | /* Clocks */ |
| 65 | unsigned int master_clk; | 63 | unsigned int master_clk; |
diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h index ccfcc32b1c2b..d5e41763c9c7 100644 --- a/sound/soc/ux500/ux500_msp_i2s.h +++ b/sound/soc/ux500/ux500_msp_i2s.h | |||
| @@ -341,11 +341,6 @@ enum msp_compress_mode { | |||
| 341 | MSP_COMPRESS_MODE_A_LAW = 3 | 341 | MSP_COMPRESS_MODE_A_LAW = 3 |
| 342 | }; | 342 | }; |
| 343 | 343 | ||
| 344 | enum msp_spi_burst_mode { | ||
| 345 | MSP_SPI_BURST_MODE_DISABLE = 0, | ||
| 346 | MSP_SPI_BURST_MODE_ENABLE = 1 | ||
| 347 | }; | ||
| 348 | |||
| 349 | enum msp_expand_mode { | 344 | enum msp_expand_mode { |
| 350 | MSP_EXPAND_MODE_LINEAR = 0, | 345 | MSP_EXPAND_MODE_LINEAR = 0, |
| 351 | MSP_EXPAND_MODE_LINEAR_SIGNED = 1, | 346 | MSP_EXPAND_MODE_LINEAR_SIGNED = 1, |
| @@ -454,21 +449,6 @@ struct msp_protdesc { | |||
| 454 | u32 clocks_per_frame; | 449 | u32 clocks_per_frame; |
| 455 | }; | 450 | }; |
| 456 | 451 | ||
| 457 | struct i2s_message { | ||
| 458 | enum i2s_direction_t i2s_direction; | ||
| 459 | void *txdata; | ||
| 460 | void *rxdata; | ||
| 461 | size_t txbytes; | ||
| 462 | size_t rxbytes; | ||
| 463 | int dma_flag; | ||
| 464 | int tx_offset; | ||
| 465 | int rx_offset; | ||
| 466 | bool cyclic_dma; | ||
| 467 | dma_addr_t buf_addr; | ||
| 468 | size_t buf_len; | ||
| 469 | size_t period_len; | ||
| 470 | }; | ||
| 471 | |||
| 472 | struct ux500_msp_config { | 452 | struct ux500_msp_config { |
| 473 | unsigned int f_inputclk; | 453 | unsigned int f_inputclk; |
| 474 | unsigned int rx_clk_sel; | 454 | unsigned int rx_clk_sel; |
| @@ -480,8 +460,6 @@ struct ux500_msp_config { | |||
| 480 | unsigned int tx_fsync_sel; | 460 | unsigned int tx_fsync_sel; |
| 481 | unsigned int rx_fifo_config; | 461 | unsigned int rx_fifo_config; |
| 482 | unsigned int tx_fifo_config; | 462 | unsigned int tx_fifo_config; |
| 483 | unsigned int spi_clk_mode; | ||
| 484 | unsigned int spi_burst_mode; | ||
| 485 | unsigned int loopback_enable; | 463 | unsigned int loopback_enable; |
| 486 | unsigned int tx_data_enable; | 464 | unsigned int tx_data_enable; |
| 487 | unsigned int default_protdesc; | 465 | unsigned int default_protdesc; |
| @@ -491,13 +469,9 @@ struct ux500_msp_config { | |||
| 491 | unsigned int direction; | 469 | unsigned int direction; |
| 492 | unsigned int protocol; | 470 | unsigned int protocol; |
| 493 | unsigned int frame_freq; | 471 | unsigned int frame_freq; |
| 494 | unsigned int frame_size; | ||
| 495 | enum msp_data_size data_size; | 472 | enum msp_data_size data_size; |
| 496 | unsigned int def_elem_len; | 473 | unsigned int def_elem_len; |
| 497 | unsigned int iodelay; | 474 | unsigned int iodelay; |
| 498 | void (*handler) (void *data); | ||
| 499 | void *tx_callback_data; | ||
| 500 | void *rx_callback_data; | ||
| 501 | }; | 475 | }; |
| 502 | 476 | ||
| 503 | struct ux500_msp { | 477 | struct ux500_msp { |
| @@ -506,15 +480,10 @@ struct ux500_msp { | |||
| 506 | struct device *dev; | 480 | struct device *dev; |
| 507 | struct stedma40_chan_cfg *dma_cfg_rx; | 481 | struct stedma40_chan_cfg *dma_cfg_rx; |
| 508 | struct stedma40_chan_cfg *dma_cfg_tx; | 482 | struct stedma40_chan_cfg *dma_cfg_tx; |
| 509 | struct dma_chan *tx_pipeid; | ||
| 510 | struct dma_chan *rx_pipeid; | ||
| 511 | enum msp_state msp_state; | 483 | enum msp_state msp_state; |
| 512 | int (*transfer) (struct ux500_msp *msp, struct i2s_message *message); | ||
| 513 | struct timer_list notify_timer; | ||
| 514 | int def_elem_len; | 484 | int def_elem_len; |
| 515 | unsigned int dir_busy; | 485 | unsigned int dir_busy; |
| 516 | int loopback_enable; | 486 | int loopback_enable; |
| 517 | u32 backup_regs[MAX_MSP_BACKUP_REGS]; | ||
| 518 | unsigned int f_bitclk; | 487 | unsigned int f_bitclk; |
| 519 | }; | 488 | }; |
| 520 | 489 | ||
