diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-22 18:47:58 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-22 18:47:58 -0400 |
| commit | 2ef39e606bb43d6041b6d820e2a9156110a82d21 (patch) | |
| tree | 7c4cb8bd147d962344d357569172dfbe35f098a6 /sound/soc/ux500/ux500_msp_i2s.h | |
| parent | a89be93c28cd656d1c3c49fe627666b3bbecd45a (diff) | |
| parent | b4cad7af6665743647f28119b689e1552326d4da (diff) | |
| download | talos-op-linux-2ef39e606bb43d6041b6d820e2a9156110a82d21.tar.gz talos-op-linux-2ef39e606bb43d6041b6d820e2a9156110a82d21.zip | |
Merge remote-tracking branch 'asoc/topic/ux500' into for-3.7
Diffstat (limited to 'sound/soc/ux500/ux500_msp_i2s.h')
| -rw-r--r-- | sound/soc/ux500/ux500_msp_i2s.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h index 2d9136da9865..1311c0df7628 100644 --- a/sound/soc/ux500/ux500_msp_i2s.h +++ b/sound/soc/ux500/ux500_msp_i2s.h @@ -524,14 +524,18 @@ struct ux500_msp { struct dma_chan *rx_pipeid; enum msp_state msp_state; int (*transfer) (struct ux500_msp *msp, struct i2s_message *message); - int (*plat_init) (void); - int (*plat_exit) (void); struct timer_list notify_timer; int def_elem_len; unsigned int dir_busy; int loopback_enable; u32 backup_regs[MAX_MSP_BACKUP_REGS]; unsigned int f_bitclk; + /* Pin modes */ + struct pinctrl *pinctrl_p; + struct pinctrl_state *pinctrl_def; + struct pinctrl_state *pinctrl_sleep; + /* Reference Count */ + int pinctrl_rxtx_ref; }; struct ux500_msp_dma_params { |
