ASoC: Ux500: Move MSP pinctrl setup into the MSP driver

In the initial submission of the MSP driver msp1 and msp3's associated
pinctrl mechanism was passed back to platform code using a plat_init()
call-back routine, but it has no place in platform code. The MSP driver
should set this up for the appropriate ports. Instead we use a use_pinctrl
identifier which is passed from platform_data/Device Tree which indicates
which ports should use pinctrl.

Acked-by: Ola Lilja <ola.o.lilja@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

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 {