Revert "MLK-13975: ASoC: fsl: add AMIX device driver"
authorViorel Suman <viorel.suman@nxp.com>
Tue, 9 Apr 2019 14:26:57 +0000 (17:26 +0300)
committerLeonard Crestez <leonard.crestez@nxp.com>
Wed, 17 Apr 2019 23:51:34 +0000 (02:51 +0300)
This reverts commit 1a6856077fd7dfdbbd226b84d02d3edbc5fc6948.

Documentation/devicetree/bindings/sound/fsl,amix.txt [deleted file]
sound/soc/fsl/Kconfig
sound/soc/fsl/Makefile
sound/soc/fsl/fsl_amix.c [deleted file]
sound/soc/fsl/fsl_amix.h [deleted file]

diff --git a/Documentation/devicetree/bindings/sound/fsl,amix.txt b/Documentation/devicetree/bindings/sound/fsl,amix.txt
deleted file mode 100644 (file)
index d4920e8..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-NXP Audio Mixer (AMIX).
-
-The Audio Mixer is a on-chip functional module that allows mixing of two audio
-streams into a single audio stream. Audio Mixer has two input serial audio
-interfaces. These are driven by two Synchronous Audio interface modules (SAI).
-Each input serial interface carries 8 audio channels in its frame in TDM manner.
-Mixer mixes audio samples of corresponding channels from two interfaces into a
-single sample. Before mixing, audio samples of two inputs can be attenuated
-based on configuration. The output of the Audio Mixer is also a serial audio
-interface. Like input interfaces it has the same TDM frame format. This output
-is used to drive the serial DAC TDM interface of audio codec and also sent to
-the external pins along with the receive path of normal audio SAI module for
-readback by the CPU.
-
-The output of Audio mixer can be selected from any of the three streams
- - serial audio input 1
- - serial audio input 2
- - Mixed audio
-
-Mixing operation is independent of audio sample rate but the two audio input
-streams must have same audio sample rate with same number of channels in TDM
-frame to be eligible for mixing.
-
-Device driver required properties:
-=================================
-  - compatible         : Compatible list, contains "fsl,imx8qm-amix"
-
-  - reg                        : Offset and length of the register set for the device.
-
-  - clocks             : Must contain an entry for each entry in clock-names.
-
-  - clock-names                : Must include the "ipg" for register access.
-
-  - power-domains       : Must contain the phandle to the AMIX power domain node
-
-Device driver configuration example:
-======================================
-  amix: amix@59840000 {
-    compatible = "fsl,imx8qm-amix";
-    reg = <0x0 0x59840000 0x0 0x10000>;
-    clocks = <&clk IMX8QXP_AUD_AMIX_IPG>;
-    clock-names = "ipg";
-    power-domains = <&pd_amix>;
-  };
-
-Machine driver required properties:
-===================================
-  - compatible         : Compatible list, contains "fsl,imx-audio-amix"
-
-  - model              : Short audio card description.
-
-  - dais               : Must contain a list of phandles to AMIX connected
-                         DAIs. The current implementation requires two phandles
-                         to SAI interfaces to be provided, the first SAI in the
-                         list being used to route the AMIX output.
-
-  - amix-controller    : Must contain the phandle to the AMIX device node.
-
-Machine driver configuration example:
-====================================
-  sound-amix-sai {
-    compatible = "fsl,imx-audio-amix";
-    model = "amix-audio-sai";
-    dais = <&sai4>, <&sai5>;
-    amix-controller = <&amix>;
-  };
-
index f3de32d..bef3254 100644 (file)
@@ -32,15 +32,6 @@ config SND_SOC_FSL_ACM
          This option is only useful for out-of-tree drivers since
          in-tree drivers select it automatically.
 
-config SND_SOC_FSL_AMIX
-       tristate "Audio Mixer (AMIX) module support"
-       select REGMAP_MMIO
-       help
-         Say Y if you want to add Audio Mixer (AMIX)
-         support for the Freescale CPUs.
-         This option is only useful for out-of-tree drivers since
-         in-tree drivers select it automatically.
-
 config SND_SOC_FSL_SSI
        tristate "Synchronous Serial Interface module (SSI) support"
        select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
index f9a0921..1e2f069 100644 (file)
@@ -13,7 +13,6 @@ obj-$(CONFIG_SND_SOC_P1022_RDK) += snd-soc-p1022-rdk.o
 
 # Freescale SSI/DMA/SAI/SPDIF Support
 snd-soc-fsl-acm-objs := fsl_acm.o
-snd-soc-fsl-amix-objs := fsl_amix.o
 snd-soc-fsl-asrc-objs := fsl_asrc.o fsl_asrc_dma.o
 snd-soc-fsl-dma-workaround-objs := fsl_dma_workaround.o
 snd-soc-fsl-dsp-objs := fsl_dsp.o fsl_dsp_proxy.o fsl_dsp_pool.o \
@@ -32,7 +31,6 @@ snd-soc-fsl-asoc-card-objs := fsl-asoc-card.o
 snd-soc-fsl-micfil-objs := fsl_micfil.o
 
 obj-$(CONFIG_SND_SOC_FSL_ACM) += snd-soc-fsl-acm.o
-obj-$(CONFIG_SND_SOC_FSL_AMIX) += snd-soc-fsl-amix.o
 obj-$(CONFIG_SND_SOC_FSL_ASRC) += snd-soc-fsl-asrc.o
 obj-$(CONFIG_SND_SOC_FSL_DSP) += snd-soc-fsl-dsp.o
 obj-$(CONFIG_SND_SOC_FSL_SAI) += snd-soc-fsl-sai.o
diff --git a/sound/soc/fsl/fsl_amix.c b/sound/soc/fsl/fsl_amix.c
deleted file mode 100644 (file)
index e9c0716..0000000
+++ /dev/null
@@ -1,451 +0,0 @@
-/*
- * NXP AMIX ALSA SoC Digital Audio Interface (DAI) driver
- *
- * Copyright 2017 NXP
- *
- * Author: Viorel Suman <viorel.suman@nxp.com>
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-
-#include <linux/clk.h>
-#include <linux/module.h>
-#include <linux/of_platform.h>
-#include <linux/pm_runtime.h>
-#include <sound/soc.h>
-#include <sound/pcm_params.h>
-
-#include "fsl_amix.h"
-
-#define SOC_ENUM_SINGLE_S(xreg, xshift, xtexts) \
-       SOC_ENUM_SINGLE(xreg, xshift, ARRAY_SIZE(xtexts), xtexts)
-
-static const char
-       *tdm_sel[] = { "TDM1", "TDM2", },
-       *mode_sel[] = { "Disabled", "TDM1", "TDM2", "Mixed", },
-       *width_sel[] = { "16b", "18b", "20b", "24b", "32b", },
-       *pol_sel[] = { "Positive edge", "Negative edge", },
-       *endis_sel[] = { "Disabled", "Enabled", },
-       *updn_sel[] = { "Downward", "Upward", },
-       *mask_sel[] = { "Unmask", "Mask", };
-
-static const struct soc_enum fsl_amix_enum[] = {
-/* FSL_AMIX_CTR enums */
-SOC_ENUM_SINGLE_S(FSL_AMIX_CTR, FSL_AMIX_CTR_MIXCLK_SHIFT, tdm_sel),
-SOC_ENUM_SINGLE_S(FSL_AMIX_CTR, FSL_AMIX_CTR_OUTSRC_SHIFT, mode_sel),
-SOC_ENUM_SINGLE_S(FSL_AMIX_CTR, FSL_AMIX_CTR_OUTWIDTH_SHIFT, width_sel),
-SOC_ENUM_SINGLE_S(FSL_AMIX_CTR, FSL_AMIX_CTR_OUTCKPOL_SHIFT, pol_sel),
-SOC_ENUM_SINGLE_S(FSL_AMIX_CTR, FSL_AMIX_CTR_MASKRTDF_SHIFT, mask_sel),
-SOC_ENUM_SINGLE_S(FSL_AMIX_CTR, FSL_AMIX_CTR_MASKCKDF_SHIFT, mask_sel),
-SOC_ENUM_SINGLE_S(FSL_AMIX_CTR, FSL_AMIX_CTR_SYNCMODE_SHIFT, endis_sel),
-SOC_ENUM_SINGLE_S(FSL_AMIX_CTR, FSL_AMIX_CTR_SYNCSRC_SHIFT, tdm_sel),
-/* FSL_AMIX_ATCR0 enums */
-SOC_ENUM_SINGLE_S(FSL_AMIX_ATCR0, 0, endis_sel),
-SOC_ENUM_SINGLE_S(FSL_AMIX_ATCR0, 1, updn_sel),
-/* FSL_AMIX_ATCR1 enums */
-SOC_ENUM_SINGLE_S(FSL_AMIX_ATCR1, 0, endis_sel),
-SOC_ENUM_SINGLE_S(FSL_AMIX_ATCR1, 1, updn_sel),
-};
-
-static const struct snd_kcontrol_new fsl_amix_snd_controls[] = {
-       /* FSL_AMIX_CTR controls */
-       SOC_ENUM("Mixing Clock Source", fsl_amix_enum[0]),
-       SOC_ENUM("Output Source", fsl_amix_enum[1]),
-       SOC_ENUM("Output Width", fsl_amix_enum[2]),
-       SOC_ENUM("Output Clock Polarity", fsl_amix_enum[3]),
-       SOC_ENUM("Frame Rate Diff Error", fsl_amix_enum[4]),
-       SOC_ENUM("Clock Freq Diff Error", fsl_amix_enum[5]),
-       SOC_ENUM("Sync Mode Config", fsl_amix_enum[6]),
-       SOC_ENUM("Sync Mode Clk Source", fsl_amix_enum[7]),
-       /* TDM1 Attenuation controls */
-       SOC_ENUM("TDM1 Attenuation", fsl_amix_enum[8]),
-       SOC_ENUM("TDM1 Attenuation Direction", fsl_amix_enum[9]),
-       SOC_SINGLE("TDM1 Attenuation Step Divider", FSL_AMIX_ATCR0,
-                       2, 0x0fff, 0),
-       SOC_SINGLE("TDM1 Attenuation Initial Value", FSL_AMIX_ATIVAL0,
-                       0, 0x3fff, 0),
-       SOC_SINGLE("TDM1 Attenuation Step Up Factor", FSL_AMIX_ATSTPUP0,
-                       0, 0x3fff, 0),
-       SOC_SINGLE("TDM1 Attenuation Step Down Factor", FSL_AMIX_ATSTPDN0,
-                       0, 0x3fff, 0),
-       SOC_SINGLE("TDM1 Attenuation Step Target", FSL_AMIX_ATSTPTGT0,
-                       0, 0x3fff, 0),
-       /* TDM2 Attenuation controls */
-       SOC_ENUM("TDM2 Attenuation", fsl_amix_enum[10]),
-       SOC_ENUM("TDM2 Attenuation Direction", fsl_amix_enum[11]),
-       SOC_SINGLE("TDM2 Attenuation Step Divider", FSL_AMIX_ATCR1,
-                       2, 0x0fff, 0),
-       SOC_SINGLE("TDM2 Attenuation Initial Value", FSL_AMIX_ATIVAL1,
-                       0, 0x3fff, 0),
-       SOC_SINGLE("TDM2 Attenuation Step Up Factor", FSL_AMIX_ATSTPUP1,
-                       0, 0x3fff, 0),
-       SOC_SINGLE("TDM2 Attenuation Step Down Factor", FSL_AMIX_ATSTPDN1,
-                       0, 0x3fff, 0),
-       SOC_SINGLE("TDM2 Attenuation Step Target", FSL_AMIX_ATSTPTGT1,
-                       0, 0x3fff, 0),
-};
-
-struct amix_dais_st {
-       u8 input;
-       u8 output;
-};
-
-static void fsl_amix_get_dais_status(struct snd_soc_pcm_runtime *be_rtd,
-                                    struct amix_dais_st *status)
-{
-       struct snd_soc_dpcm *dpcm;
-       struct snd_soc_pcm_runtime *fe_rtd = NULL;
-       struct snd_pcm_substream *fe_ss = NULL;
-       struct snd_soc_dai *fe_dai, *be_dai = be_rtd->cpu_dai;
-       int stream = SNDRV_PCM_STREAM_PLAYBACK;
-
-       /* find active frontends for this backend */
-       list_for_each_entry(dpcm, &be_rtd->dpcm[stream].fe_clients, list_fe) {
-               if (dpcm->be != be_rtd)
-                       continue;
-
-               fe_rtd = dpcm->fe;
-               fe_dai = fe_rtd->cpu_dai;
-               fe_ss  = snd_soc_dpcm_get_substream(fe_rtd, stream);
-
-               if (fe_ss && fe_ss->pcm->device < FSL_AMIX_MAX_DAIS) {
-                       if (fe_dai->playback_active)
-                               status->input |= BIT(fe_ss->pcm->device);
-                       if (fe_dai->capture_active)
-                               status->output |= BIT(fe_ss->pcm->device);
-               } else if (fe_ss) {
-                       dev_err(be_dai->dev, "Wrong device number: %d\n",
-                               fe_ss->pcm->device);
-               }
-       }
-}
-
-static int fsl_amix_update(struct snd_soc_pcm_runtime *rtd)
-{
-       struct snd_soc_dai *dai = rtd->cpu_dai;
-       struct fsl_amix *priv = snd_soc_dai_get_drvdata(dai);
-       u32 mask = 0, ctr = 0, val, old_input;
-       struct amix_dais_st status = { .input = 0, .output = 0 };
-
-       fsl_amix_get_dais_status(rtd, &status);
-
-       regmap_read(priv->regmap, FSL_AMIX_CTR, &val);
-       old_input = ((val & FSL_AMIX_CTR_OUTSRC_MASK) >> FSL_AMIX_CTR_OUTSRC_SHIFT);
-
-       dev_dbg(dai->dev, "old_input=x%08x, input=x%08x\n", old_input, status.input);
-
-       if (old_input == status.input) {
-               dev_dbg(dai->dev, "State unchanged, input=x%08x\n", status.input);
-               return 0;
-       }
-
-       /**
-        * Mixing clock selection. Make sure the currently selected clock source
-        * has the TDM enabled. If not, switch clock source to enabled TDM.
-        */
-       switch (status.input) {
-       case 0: /* Both TDMs are disabled, keep the clock source unchanged */
-       case 3: /* Both TDMs are enabled, keep the clock source unchanged */
-               break;
-       case 1:
-       case 2:
-               val &= 1;
-               if (FSL_AMIX_CTR_MIXCLK(status.input) != val) {
-                       mask |= FSL_AMIX_CTR_MIXCLK_MASK;
-                       ctr  |= FSL_AMIX_CTR_MIXCLK(status.input);
-               }
-               break;
-       }
-
-       /* Output source selection */
-       mask |= FSL_AMIX_CTR_OUTSRC_MASK;
-       ctr  |= FSL_AMIX_CTR_OUTSRC(status.input);
-
-       regmap_update_bits(priv->regmap, FSL_AMIX_CTR, mask, ctr);
-
-       dev_dbg(dai->dev, "Set AMIX_CTR[0x%08x]=0x%08x, in=0x%08x, out=0x%08x\n",
-               mask, ctr, status.input, status.output);
-
-       return 0;
-}
-
-static int fsl_amix_dai_mute_stream(struct snd_soc_dai *dai, int mute, int stream)
-{
-       struct snd_soc_card *card = dai->component->card;
-       struct snd_soc_pcm_runtime *rtd;
-
-       rtd = snd_soc_get_pcm_runtime(card, "HiFi-AMIX-BE");
-
-       return fsl_amix_update(rtd);
-}
-
-static void fsl_amix_dai_shutdown(struct snd_pcm_substream *substream,
-                               struct snd_soc_dai *dai)
-{
-       struct snd_soc_pcm_runtime *rtd = substream->private_data;
-
-       fsl_amix_update(rtd);
-}
-
-static int fsl_amix_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
-{
-       struct fsl_amix *priv = snd_soc_dai_get_drvdata(dai);
-       u32 mask = 0, ctr = 0;
-
-       /* AMIX is working in DSP_A format only */
-       switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
-       case SND_SOC_DAIFMT_DSP_A:
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       /* For playback the AMIX is slave, and for record is master */
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBM_CFM:
-       case SND_SOC_DAIFMT_CBS_CFS:
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
-       case SND_SOC_DAIFMT_NB_NF:
-               /* Output data will be written on positive edge of the clock */
-               ctr |= FSL_AMIX_CTR_OUTCKPOL(0);
-               break;
-       case SND_SOC_DAIFMT_IB_NF:
-               /* Output data will be written on negative edge of the clock */
-               ctr |= FSL_AMIX_CTR_OUTCKPOL(1);
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       mask |= FSL_AMIX_CTR_OUTCKPOL_MASK;
-
-       return regmap_update_bits(priv->regmap, FSL_AMIX_CTR, mask, ctr);
-}
-
-static struct snd_soc_dai_ops fsl_amix_dai_ops = {
-       .shutdown     = fsl_amix_dai_shutdown,
-       .mute_stream  = fsl_amix_dai_mute_stream,
-       .set_fmt      = fsl_amix_dai_set_fmt,
-};
-
-static struct snd_soc_dai_driver fsl_amix_dai = {
-       .playback = {
-               .stream_name = "AMIX-Playback",
-               .channels_min = 8,
-               .channels_max = 8,
-               .rate_min = 8000,
-               .rate_max = 96000,
-               .rates = SNDRV_PCM_RATE_8000_96000,
-               .formats = FSL_AMIX_FORMATS,
-       },
-       .capture = {
-               .stream_name = "AMIX-Capture",
-               .channels_min = 8,
-               .channels_max = 8,
-               .rate_min = 8000,
-               .rate_max = 96000,
-               .rates = SNDRV_PCM_RATE_8000_96000,
-               .formats = FSL_AMIX_FORMATS,
-       },
-       .ops = &fsl_amix_dai_ops,
-};
-
-static const struct snd_soc_component_driver fsl_amix_component = {
-       .name             = "fsl-amix-dai",
-       .controls         = fsl_amix_snd_controls,
-       .num_controls     = ARRAY_SIZE(fsl_amix_snd_controls),
-};
-
-static bool fsl_amix_readable_reg(struct device *dev, unsigned int reg)
-{
-       switch (reg) {
-       case FSL_AMIX_CTR:
-       case FSL_AMIX_STR:
-       case FSL_AMIX_ATCR0:
-       case FSL_AMIX_ATIVAL0:
-       case FSL_AMIX_ATSTPUP0:
-       case FSL_AMIX_ATSTPDN0:
-       case FSL_AMIX_ATSTPTGT0:
-       case FSL_AMIX_ATTNVAL0:
-       case FSL_AMIX_ATSTP0:
-       case FSL_AMIX_ATCR1:
-       case FSL_AMIX_ATIVAL1:
-       case FSL_AMIX_ATSTPUP1:
-       case FSL_AMIX_ATSTPDN1:
-       case FSL_AMIX_ATSTPTGT1:
-       case FSL_AMIX_ATTNVAL1:
-       case FSL_AMIX_ATSTP1:
-               return true;
-       default:
-               return false;
-       }
-}
-
-static bool fsl_amix_writeable_reg(struct device *dev, unsigned int reg)
-{
-       switch (reg) {
-       case FSL_AMIX_CTR:
-       case FSL_AMIX_ATCR0:
-       case FSL_AMIX_ATIVAL0:
-       case FSL_AMIX_ATSTPUP0:
-       case FSL_AMIX_ATSTPDN0:
-       case FSL_AMIX_ATSTPTGT0:
-       case FSL_AMIX_ATCR1:
-       case FSL_AMIX_ATIVAL1:
-       case FSL_AMIX_ATSTPUP1:
-       case FSL_AMIX_ATSTPDN1:
-       case FSL_AMIX_ATSTPTGT1:
-               return true;
-       default:
-               return false;
-       }
-}
-
-static struct reg_default fsl_amix_reg[] = {
-       { FSL_AMIX_CTR,       0x00060 },
-       { FSL_AMIX_STR,       0x00003 },
-       { FSL_AMIX_ATCR0,     0x00000 },
-       { FSL_AMIX_ATIVAL0,   0x3FFFF },
-       { FSL_AMIX_ATSTPUP0,  0x2AAAA },
-       { FSL_AMIX_ATSTPDN0,  0x30000 },
-       { FSL_AMIX_ATSTPTGT0, 0x00010 },
-       { FSL_AMIX_ATTNVAL0,  0x00000 },
-       { FSL_AMIX_ATSTP0,    0x00000 },
-       { FSL_AMIX_ATCR1,     0x00000 },
-       { FSL_AMIX_ATIVAL1,   0x3FFFF },
-       { FSL_AMIX_ATSTPUP1,  0x2AAAA },
-       { FSL_AMIX_ATSTPDN1,  0x30000 },
-       { FSL_AMIX_ATSTPTGT1, 0x00010 },
-       { FSL_AMIX_ATTNVAL1,  0x00000 },
-       { FSL_AMIX_ATSTP1,    0x00000 },
-};
-
-static const struct regmap_config fsl_amix_regmap_config = {
-       .reg_bits = 32,
-       .reg_stride = 4,
-       .val_bits = 32,
-       .max_register = FSL_AMIX_ATSTP1,
-       .reg_defaults = fsl_amix_reg,
-       .num_reg_defaults = ARRAY_SIZE(fsl_amix_reg),
-       .readable_reg = fsl_amix_readable_reg,
-       .writeable_reg = fsl_amix_writeable_reg,
-       .cache_type = REGCACHE_FLAT,
-};
-
-static int fsl_amix_probe(struct platform_device *pdev)
-{
-       struct fsl_amix *priv;
-       struct resource *res;
-       void __iomem *regs;
-       int ret;
-
-       priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
-       if (!priv)
-               return -ENOMEM;
-
-       priv->pdev = pdev;
-
-       /* Get the addresses */
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       regs = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(regs))
-               return PTR_ERR(regs);
-
-       priv->regmap = devm_regmap_init_mmio_clk(&pdev->dev, "ipg", regs,
-                                                &fsl_amix_regmap_config);
-       if (IS_ERR(priv->regmap)) {
-               dev_err(&pdev->dev, "failed to init regmap\n");
-               return PTR_ERR(priv->regmap);
-       }
-
-       priv->ipg_clk = devm_clk_get(&pdev->dev, "ipg");
-       if (IS_ERR(priv->ipg_clk)) {
-               dev_err(&pdev->dev, "failed to get ipg clock\n");
-               return PTR_ERR(priv->ipg_clk);
-       }
-
-       platform_set_drvdata(pdev, priv);
-       pm_runtime_enable(&pdev->dev);
-
-       ret = devm_snd_soc_register_component(&pdev->dev, &fsl_amix_component,
-                                             &fsl_amix_dai, 1);
-       if (ret) {
-               dev_err(&pdev->dev, "failed to register ASoC DAI\n");
-               return ret;
-       }
-
-       return 0;
-}
-
-#ifdef CONFIG_PM
-static int fsl_amix_runtime_resume(struct device *dev)
-{
-       struct fsl_amix *priv = dev_get_drvdata(dev);
-
-       return clk_prepare_enable(priv->ipg_clk);
-}
-
-static int fsl_amix_runtime_suspend(struct device *dev)
-{
-       struct fsl_amix *priv = dev_get_drvdata(dev);
-
-       clk_disable_unprepare(priv->ipg_clk);
-
-       return 0;
-}
-#endif /* CONFIG_PM */
-
-#ifdef CONFIG_PM_SLEEP
-static int fsl_amix_suspend(struct device *dev)
-{
-       struct fsl_amix *priv = dev_get_drvdata(dev);
-
-       regcache_cache_only(priv->regmap, true);
-       regcache_mark_dirty(priv->regmap);
-
-       return 0;
-}
-
-static int fsl_amix_resume(struct device *dev)
-{
-       struct fsl_amix *priv = dev_get_drvdata(dev);
-
-       regcache_cache_only(priv->regmap, false);
-       regcache_sync(priv->regmap);
-
-       return 0;
-}
-#endif /* CONFIG_PM_SLEEP */
-
-static const struct dev_pm_ops fsl_amix_pm = {
-       SET_RUNTIME_PM_OPS(fsl_amix_runtime_suspend, fsl_amix_runtime_resume, NULL)
-       SET_SYSTEM_SLEEP_PM_OPS(fsl_amix_suspend, fsl_amix_resume)
-};
-
-static const struct of_device_id fsl_amix_ids[] = {
-       { .compatible = "fsl,imx8qm-amix", },
-       { /* sentinel */ }
-};
-MODULE_DEVICE_TABLE(of, fsl_amix_ids);
-
-static struct platform_driver fsl_amix_driver = {
-       .probe = fsl_amix_probe,
-       .driver = {
-               .name = "fsl-amix",
-               .of_match_table = fsl_amix_ids,
-               .pm = &fsl_amix_pm,
-       },
-};
-module_platform_driver(fsl_amix_driver);
-
-MODULE_DESCRIPTION("NXP AMIX ASoC DAI driver");
-MODULE_AUTHOR("Viorel Suman <viorel.suman@nxp.com>");
-MODULE_ALIAS("platform:fsl-amix");
-MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/fsl/fsl_amix.h b/sound/soc/fsl/fsl_amix.h
deleted file mode 100644 (file)
index 1c91516..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2017 NXP Corp.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __FSL_AMIX_H
-#define __FSL_AMIX_H
-
-#define FSL_AMIX_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\
-                       SNDRV_PCM_FMTBIT_S24_LE |\
-                       SNDRV_PCM_FMTBIT_S32_LE)
-/* AMIX Registers */
-#define FSL_AMIX_CTR           0x200 /* Control */
-#define FSL_AMIX_STR           0x204 /* Status */
-
-#define FSL_AMIX_ATCR0         0x208 /* Attenuation Control */
-#define FSL_AMIX_ATIVAL0       0x20c /* Attenuation Initial Value */
-#define FSL_AMIX_ATSTPUP0      0x210 /* Attenuation step up factor */
-#define FSL_AMIX_ATSTPDN0      0x214 /* Attenuation step down factor */
-#define FSL_AMIX_ATSTPTGT0     0x218 /* Attenuation step target */
-#define FSL_AMIX_ATTNVAL0      0x21c /* Attenuation Value */
-#define FSL_AMIX_ATSTP0                0x220 /* Attenuation step number */
-
-#define FSL_AMIX_ATCR1         0x228 /* Attenuation Control */
-#define FSL_AMIX_ATIVAL1       0x22c /* Attenuation Initial Value */
-#define FSL_AMIX_ATSTPUP1      0x230 /* Attenuation step up factor */
-#define FSL_AMIX_ATSTPDN1      0x234 /* Attenuation step down factor */
-#define FSL_AMIX_ATSTPTGT1     0x238 /* Attenuation step target */
-#define FSL_AMIX_ATTNVAL1      0x23c /* Attenuation Value */
-#define FSL_AMIX_ATSTP1                0x240 /* Attenuation step number */
-
-/* AMIX Control Register */
-#define FSL_AMIX_CTR_MIXCLK_SHIFT      0
-#define FSL_AMIX_CTR_MIXCLK_MASK       (1 << FSL_AMIX_CTR_MIXCLK_SHIFT)
-#define FSL_AMIX_CTR_MIXCLK(i)         (i - 1)
-#define FSL_AMIX_CTR_OUTSRC_SHIFT      1
-#define FSL_AMIX_CTR_OUTSRC_MASK       (0x3 << FSL_AMIX_CTR_OUTSRC_SHIFT)
-#define FSL_AMIX_CTR_OUTSRC(i)         ((i  << FSL_AMIX_CTR_OUTSRC_SHIFT) \
-                                             & FSL_AMIX_CTR_OUTSRC_MASK)
-#define FSL_AMIX_CTR_OUTWIDTH_SHIFT    3
-#define FSL_AMIX_CTR_OUTWIDTH_MASK     (0x7 << FSL_AMIX_CTR_OUTWIDTH_SHIFT)
-#define FSL_AMIX_CTR_OUTWIDTH(i)       ((i  << FSL_AMIX_CTR_OUTWIDTH_SHIFT) \
-                                             & FSL_AMIX_CTR_OUTWIDTH_MASK)
-#define FSL_AMIX_CTR_OUTCKPOL_SHIFT    6
-#define FSL_AMIX_CTR_OUTCKPOL_MASK     (1 << FSL_AMIX_CTR_OUTCKPOL_SHIFT)
-#define FSL_AMIX_CTR_OUTCKPOL(i)       (i << FSL_AMIX_CTR_OUTCKPOL_SHIFT)
-#define FSL_AMIX_CTR_MASKRTDF_SHIFT    7
-#define FSL_AMIX_CTR_MASKRTDF_MASK     (1 << FSL_AMIX_CTR_MASKRTDF_SHIFT)
-#define FSL_AMIX_CTR_MASKRTDF(i)       (i << FSL_AMIX_CTR_MASKRTDF_SHIFT)
-#define FSL_AMIX_CTR_MASKCKDF_SHIFT    8
-#define FSL_AMIX_CTR_MASKCKDF_MASK     (1 << FSL_AMIX_CTR_MASKCKDF_SHIFT)
-#define FSL_AMIX_CTR_MASKCKDF(i)       (i << FSL_AMIX_CTR_MASKCKDF_SHIFT)
-#define FSL_AMIX_CTR_SYNCMODE_SHIFT    9
-#define FSL_AMIX_CTR_SYNCMODE_MASK     (1 << FSL_AMIX_CTR_SYNCMODE_SHIFT)
-#define FSL_AMIX_CTR_SYNCMODE(i)       (i << FSL_AMIX_CTR_SYNCMODE_SHIFT)
-#define FSL_AMIX_CTR_SYNCSRC_SHIFT     10
-#define FSL_AMIX_CTR_SYNCSRC_MASK      (1 << FSL_AMIX_CTR_SYNCSRC_SHIFT)
-#define FSL_AMIX_CTR_SYNCSRC(i)                (i << FSL_AMIX_CTR_SYNCSRC_SHIFT)
-
-/* AMIX Status Register */
-#define FSL_AMIX_STR_RATEDIFF          BIT(0)
-#define FSL_AMIX_STR_CLKDIFF           BIT(1)
-#define FSL_AMIX_STR_MIXSTAT_SHIFT     2
-#define FSL_AMIX_STR_MIXSTAT_MASK      (0x3 << FSL_AMIX_STR_MIXSTAT_SHIFT)
-#define FSL_AMIX_STR_MIXSTAT(i)                ((i & FSL_AMIX_STR_MIXSTAT_MASK) \
-                                          >> FSL_AMIX_STR_MIXSTAT_SHIFT)
-/* AMIX Attenuation Control Register */
-#define FSL_AMIX_ATCR_AT_EN            BIT(0)
-#define FSL_AMIX_ATCR_AT_UPDN          BIT(1)
-#define FSL_AMIX_ATCR_ATSTPDIF_SHIFT   2
-#define FSL_AMIX_ATCR_ATSTPDFI_MASK    (0xfff << FSL_AMIX_ATCR_ATSTPDIF_SHIFT)
-
-/* AMIX Attenuation Initial Value Register */
-#define FSL_AMIX_ATIVAL_ATINVAL_MASK   0x3FFFF
-
-/* AMIX Attenuation Step Up Factor Register */
-#define FSL_AMIX_ATSTPUP_ATSTEPUP_MASK 0x3FFFF
-
-/* AMIX Attenuation Step Down Factor Register */
-#define FSL_AMIX_ATSTPDN_ATSTEPDN_MASK 0x3FFFF
-
-/* AMIX Attenuation Step Target Register */
-#define FSL_AMIX_ATSTPTGT_ATSTPTG_MASK 0x3FFFF
-
-/* AMIX Attenuation Value Register */
-#define FSL_AMIX_ATTNVAL_ATCURVAL_MASK 0x3FFFF
-
-/* AMIX Attenuation Step Number Register */
-#define FSL_AMIX_ATSTP_STPCTR_MASK     0x3FFFF
-
-#define FSL_AMIX_MAX_DAIS              2
-struct fsl_amix {
-       struct platform_device *pdev;
-       struct regmap *regmap;
-       struct clk *ipg_clk;
-};
-
-#endif /* __FSL_AMIX_H */