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

[profile/ivi/kernel-x86-ivi.git] / arch / arm / mach-ux500 / board-mop500-msp.c

diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c
index df15646..ace6c05 100644 (file)
--- a/arch/arm/mach-ux500/board-mop500-msp.c
+++ b/arch/arm/mach-ux500/board-mop500-msp.c
@@ -7,7 +7,6 @@
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/gpio.h>
-#include <linux/pinctrl/consumer.h>
 
 #include <plat/gpio-nomadik.h>
 #include <plat/pincfg.h>
@@ -23,53 +22,6 @@
 #include "devices-db8500.h"
 #include "pins-db8500.h"
 
-/* MSP1/3 Tx/Rx usage protection */
-static DEFINE_SPINLOCK(msp_rxtx_lock);
-
-/* Reference Count */
-static int msp_rxtx_ref;
-
-/* Pin modes */
-struct pinctrl *msp1_p;
-struct pinctrl_state *msp1_def;
-struct pinctrl_state *msp1_sleep;
-
-int msp13_i2s_init(void)
-{
-       int retval = 0;
-       unsigned long flags;
-
-       spin_lock_irqsave(&msp_rxtx_lock, flags);
-       if (msp_rxtx_ref == 0 && !(IS_ERR(msp1_p) || IS_ERR(msp1_def))) {
-               retval = pinctrl_select_state(msp1_p, msp1_def);
-               if (retval)
-                       pr_err("could not set MSP1 defstate\n");
-       }
-       if (!retval)
-               msp_rxtx_ref++;
-       spin_unlock_irqrestore(&msp_rxtx_lock, flags);
-
-       return retval;
-}
-
-int msp13_i2s_exit(void)
-{
-       int retval = 0;
-       unsigned long flags;
-
-       spin_lock_irqsave(&msp_rxtx_lock, flags);
-       WARN_ON(!msp_rxtx_ref);
-       msp_rxtx_ref--;
-       if (msp_rxtx_ref == 0 && !(IS_ERR(msp1_p) || IS_ERR(msp1_sleep))) {
-               retval = pinctrl_select_state(msp1_p, msp1_sleep);
-               if (retval)
-                       pr_err("could not set MSP1 sleepstate\n");
-       }
-       spin_unlock_irqrestore(&msp_rxtx_lock, flags);
-
-       return retval;
-}
-
 static struct stedma40_chan_cfg msp0_dma_rx = {
        .high_priority = true,
        .dir = STEDMA40_PERIPH_TO_MEM,
@@ -132,8 +84,6 @@ static struct msp_i2s_platform_data msp1_platform_data = {
        .id = MSP_I2S_1,
        .msp_i2s_dma_rx = NULL,
        .msp_i2s_dma_tx = &msp1_dma_tx,
-       .msp_i2s_init = msp13_i2s_init,
-       .msp_i2s_exit = msp13_i2s_exit,
 };
 
 static struct stedma40_chan_cfg msp2_dma_rx = {
@@ -219,49 +169,22 @@ static struct msp_i2s_platform_data msp3_platform_data = {
        .id             = MSP_I2S_3,
        .msp_i2s_dma_rx = &msp1_dma_rx,
        .msp_i2s_dma_tx = NULL,
-       .msp_i2s_init = msp13_i2s_init,
-       .msp_i2s_exit = msp13_i2s_exit,
 };
 
 int mop500_msp_init(struct device *parent)
 {
-       struct platform_device *msp1;
-
        pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__);
        platform_device_register(&snd_soc_mop500);
 
        pr_info("Initialize MSP I2S-devices.\n");
        db8500_add_msp_i2s(parent, 0, U8500_MSP0_BASE, IRQ_DB8500_MSP0,
                           &msp0_platform_data);
-       msp1 = db8500_add_msp_i2s(parent, 1, U8500_MSP1_BASE, IRQ_DB8500_MSP1,
+       db8500_add_msp_i2s(parent, 1, U8500_MSP1_BASE, IRQ_DB8500_MSP1,
                           &msp1_platform_data);
        db8500_add_msp_i2s(parent, 2, U8500_MSP2_BASE, IRQ_DB8500_MSP2,
                           &msp2_platform_data);
        db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1,
                           &msp3_platform_data);
 
-       /* Get the pinctrl handle for MSP1 */
-       if (msp1) {
-               msp1_p = pinctrl_get(&msp1->dev);
-               if (IS_ERR(msp1_p))
-                       dev_err(&msp1->dev, "could not get MSP1 pinctrl\n");
-               else {
-                       msp1_def = pinctrl_lookup_state(msp1_p,
-                                                       PINCTRL_STATE_DEFAULT);
-                       if (IS_ERR(msp1_def)) {
-                               dev_err(&msp1->dev,
-                                       "could not get MSP1 defstate\n");
-                       }
-                       msp1_sleep = pinctrl_lookup_state(msp1_p,
-                                                         PINCTRL_STATE_SLEEP);
-                       if (IS_ERR(msp1_sleep))
-                               dev_err(&msp1->dev,
-                                       "could not get MSP1 idlestate\n");
-               }
-       }
-
-       pr_info("%s: Register platform-device 'ux500-pcm'\n", __func__);
-       platform_device_register(&ux500_pcm);
-
        return 0;
 }