Merge git://git.kvack.org/~bcrl/aio-fixes

[firefly-linux-kernel-4.4.55.git] / sound / soc / sirf / sirf-audio-port.c

diff --git a/sound/soc/sirf/sirf-audio-port.c b/sound/soc/sirf/sirf-audio-port.c
index b04a53f2b4f63e56b72ed395faf89cc823f832a2..b4afa31b2bc11ea00baf93c22a6cf244d47732e5 100644 (file)
--- a/sound/soc/sirf/sirf-audio-port.c
+++ b/sound/soc/sirf/sirf-audio-port.c
@@ -6,60 +6,15 @@
  * Licensed under GPLv2 or later.
  */
 #include <linux/module.h>
-#include <linux/io.h>
-#include <linux/regmap.h>
 #include <sound/soc.h>
 #include <sound/dmaengine_pcm.h>
 
-#include "sirf-audio-port.h"
-
 struct sirf_audio_port {
        struct regmap *regmap;
        struct snd_dmaengine_dai_dma_data playback_dma_data;
        struct snd_dmaengine_dai_dma_data capture_dma_data;
 };
 
-static void sirf_audio_port_tx_enable(struct sirf_audio_port *port)
-{
-       regmap_update_bits(port->regmap, AUDIO_PORT_IC_TXFIFO_OP,
-               AUDIO_FIFO_RESET, AUDIO_FIFO_RESET);
-       regmap_write(port->regmap, AUDIO_PORT_IC_TXFIFO_INT_MSK, 0);
-       regmap_write(port->regmap, AUDIO_PORT_IC_TXFIFO_OP, 0);
-       regmap_update_bits(port->regmap, AUDIO_PORT_IC_TXFIFO_OP,
-               AUDIO_FIFO_START, AUDIO_FIFO_START);
-       regmap_update_bits(port->regmap, AUDIO_PORT_IC_CODEC_TX_CTRL,
-               IC_TX_ENABLE, IC_TX_ENABLE);
-}
-
-static void sirf_audio_port_tx_disable(struct sirf_audio_port *port)
-{
-       regmap_write(port->regmap, AUDIO_PORT_IC_TXFIFO_OP, 0);
-       regmap_update_bits(port->regmap, AUDIO_PORT_IC_CODEC_TX_CTRL,
-               IC_TX_ENABLE, ~IC_TX_ENABLE);
-}
-
-static void sirf_audio_port_rx_enable(struct sirf_audio_port *port,
-       int channels)
-{
-       regmap_update_bits(port->regmap, AUDIO_PORT_IC_RXFIFO_OP,
-               AUDIO_FIFO_RESET, AUDIO_FIFO_RESET);
-       regmap_write(port->regmap, AUDIO_PORT_IC_RXFIFO_INT_MSK, 0);
-       regmap_write(port->regmap, AUDIO_PORT_IC_RXFIFO_OP, 0);
-       regmap_update_bits(port->regmap, AUDIO_PORT_IC_RXFIFO_OP,
-               AUDIO_FIFO_START, AUDIO_FIFO_START);
-       if (channels == 1)
-               regmap_update_bits(port->regmap, AUDIO_PORT_IC_CODEC_RX_CTRL,
-                       IC_RX_ENABLE_MONO, IC_RX_ENABLE_MONO);
-       else
-               regmap_update_bits(port->regmap, AUDIO_PORT_IC_CODEC_RX_CTRL,
-                       IC_RX_ENABLE_STEREO, IC_RX_ENABLE_STEREO);
-}
-
-static void sirf_audio_port_rx_disable(struct sirf_audio_port *port)
-{
-       regmap_update_bits(port->regmap, AUDIO_PORT_IC_CODEC_RX_CTRL,
-                       IC_RX_ENABLE_STEREO, ~IC_RX_ENABLE_STEREO);
-}
 
 static int sirf_audio_port_dai_probe(struct snd_soc_dai *dai)
 {
@@ -69,41 +24,6 @@ static int sirf_audio_port_dai_probe(struct snd_soc_dai *dai)
        return 0;
 }
 
-static int sirf_audio_port_trigger(struct snd_pcm_substream *substream, int cmd,
-       struct snd_soc_dai *dai)
-{
-       struct sirf_audio_port *port = snd_soc_dai_get_drvdata(dai);
-       int playback = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
-
-       switch (cmd) {
-       case SNDRV_PCM_TRIGGER_STOP:
-       case SNDRV_PCM_TRIGGER_SUSPEND:
-       case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-               if (playback)
-                       sirf_audio_port_tx_disable(port);
-               else
-                       sirf_audio_port_rx_disable(port);
-               break;
-       case SNDRV_PCM_TRIGGER_START:
-       case SNDRV_PCM_TRIGGER_RESUME:
-       case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-               if (playback)
-                       sirf_audio_port_tx_enable(port);
-               else
-                       sirf_audio_port_rx_enable(port,
-                               substream->runtime->channels);
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-static const struct snd_soc_dai_ops sirf_audio_port_dai_ops = {
-       .trigger = sirf_audio_port_trigger,
-};
-
 static struct snd_soc_dai_driver sirf_audio_port_dai = {
        .probe = sirf_audio_port_dai_probe,
        .name = "sirf-audio-port",
@@ -120,49 +40,22 @@ static struct snd_soc_dai_driver sirf_audio_port_dai = {
                .rates = SNDRV_PCM_RATE_48000,
                .formats = SNDRV_PCM_FMTBIT_S16_LE,
        },
-       .ops = &sirf_audio_port_dai_ops,
 };
 
 static const struct snd_soc_component_driver sirf_audio_port_component = {
        .name       = "sirf-audio-port",
 };
 
-static const struct regmap_config sirf_audio_port_regmap_config = {
-       .reg_bits = 32,
-       .reg_stride = 4,
-       .val_bits = 32,
-       .max_register = AUDIO_PORT_IC_RXFIFO_INT_MSK,
-       .cache_type = REGCACHE_NONE,
-};
-
 static int sirf_audio_port_probe(struct platform_device *pdev)
 {
        int ret;
        struct sirf_audio_port *port;
-       void __iomem *base;
-       struct resource *mem_res;
 
        port = devm_kzalloc(&pdev->dev,
                        sizeof(struct sirf_audio_port), GFP_KERNEL);
        if (!port)
                return -ENOMEM;
 
-       mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!mem_res) {
-               dev_err(&pdev->dev, "no mem resource?\n");
-               return -ENODEV;
-       }
-
-       base = devm_ioremap(&pdev->dev, mem_res->start,
-                       resource_size(mem_res));
-       if (base == NULL)
-               return -ENOMEM;
-
-       port->regmap = devm_regmap_init_mmio(&pdev->dev, base,
-                                           &sirf_audio_port_regmap_config);
-       if (IS_ERR(port->regmap))
-               return PTR_ERR(port->regmap);
-
        ret = devm_snd_soc_register_component(&pdev->dev,
                        &sirf_audio_port_component, &sirf_audio_port_dai, 1);
        if (ret)