Merge remote-tracking branch 'asoc/topic/ux500' into for-3.7

10 files changed, 292 insertions, 108 deletions

diff --git a/Documentation/devicetree/bindings/sound/ux500-mop500.txt b/Documentation/devicetree/bindings/sound/ux500-mop500.txt
new file mode 100644
index 000000000000..48e071c96b46
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/ux500-mop500.txt
@@ -0,0 +1,39 @@
+* MOP500 Audio Machine Driver
+
+This node is responsible for linking together all ux500 Audio Driver components.
+
+Required properties:
+ - compatible              : "stericsson,snd-soc-mop500"
+
+Non-standard properties:
+ - stericsson,cpu-dai      : Phandle to the CPU-side DAI
+ - stericsson,audio-codec  : Phandle to the Audio CODEC
+ - stericsson,card-name    : Over-ride default card name
+
+Example:
+
+        sound {
+                compatible = "stericsson,snd-soc-mop500";
+
+                stericsson,cpu-dai = <&msp1 &msp3>;
+                stericsson,audio-codec = <&codec>;
+        };
+
+        msp1: msp@80124000 {
+                compatible = "stericsson,ux500-msp-i2s";
+                reg = <0x80124000 0x1000>;
+                interrupts = <0 62 0x4>;
+                v-ape-supply = <&db8500_vape_reg>;
+        };
+
+        msp3: msp@80125000 {
+                compatible = "stericsson,ux500-msp-i2s";
+                reg = <0x80125000 0x1000>;
+                interrupts = <0 62 0x4>;
+                v-ape-supply = <&db8500_vape_reg>;
+        };
+
+        codec: ab8500-codec {
+                compatible = "stericsson,ab8500-codec";
+                stericsson,earpeice-cmv = <950>; /* Units in mV. */
+        };
diff --git a/Documentation/devicetree/bindings/sound/ux500-msp.txt b/Documentation/devicetree/bindings/sound/ux500-msp.txt
new file mode 100644
index 000000000000..99acd9c774e1
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/ux500-msp.txt
@@ -0,0 +1,43 @@
+* ux500 MSP (CPU-side Digital Audio Interface)
+
+Required properties:
+ - compatible       :"stericsson,ux500-msp-i2s"
+ - reg              : Physical base address and length of the device's registers.
+
+Optional properties:
+ - interrupts       : The interrupt output from the device.
+ - interrupt-parent : The parent interrupt controller.
+ - <name>-supply    : Phandle to the regulator <name> supply
+
+Example:
+
+        sound {
+                compatible = "stericsson,snd-soc-mop500";
+
+                stericsson,platform-pcm-dma = <&pcm>;
+                stericsson,cpu-dai = <&msp1 &msp3>;
+                stericsson,audio-codec = <&codec>;
+        };
+
+        pcm: ux500-pcm {
+                compatible = "stericsson,ux500-pcm";
+        };
+
+        msp1: msp@80124000 {
+                compatible = "stericsson,ux500-msp-i2s";
+                reg = <0x80124000 0x1000>;
+                interrupts = <0 62 0x4>;
+                v-ape-supply = <&db8500_vape_reg>;
+        };
+
+        msp3: msp@80125000 {
+                compatible = "stericsson,ux500-msp-i2s";
+                reg = <0x80125000 0x1000>;
+                interrupts = <0 62 0x4>;
+                v-ape-supply = <&db8500_vape_reg>;
+        };
+
+        codec: ab8500-codec {
+                compatible = "stericsson,ab8500-codec";
+                stericsson,earpeice-cmv = <950>; /* Units in mV. */
+        };
diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c
index df15646036aa..ace6c051bc1a 100644
--- 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,