ENGR00309073-1 ASoC: fsl: Naming of p2p item is not proper

Change the output-rate, output-width to p2p-rate, p2p-width.

Signed-off-by: Shengjiu Wang <b02247@freescale.com>

5 files changed, 34 insertions, 34 deletions

diff --git a/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt b/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt
index de48f051beec..41b4a9a610e7 100644
--- a/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt
+++ b/Documentation/devicetree/bindings/sound/fsl-asrc-p2p.txt
@@ -5,8 +5,8 @@ MXC_ASRC.
 
 Required properties:
   - compatible: Should be "fsl,<chip>-asrc-p2p".
-  - fsl,output-rate: the output rate of asrc p2p. which can be <32000> to <192000>,
-  - fsl,output-width: the output width of asrc p2p. which can be <16>, <24>.
+  - fsl,p2p-rate: the p2p rate of asrc p2p. which can be <32000> to <192000>,
+  - fsl,p2p-width: the p2p width of asrc p2p. which can be <16>, <24>.
   - fsl,asrc-dma-rx-events: The rx dma event of the asrc, <a b c> corresponding
                             to 3 pair of asrc.
   - fsl,asrc-dma-tx-events: The tx dma event of the esai, <a b c> corresponding
@@ -15,8 +15,8 @@ Required properties:
 Example:
 asrc_p2p: asrc_p2p {
         compatible = "fsl,imx6q-asrc-p2p";
-        fsl,output-rate  = <48000>;
-        fsl,output-width = <16>;
+        fsl,p2p-rate  = <48000>;
+        fsl,p2p-width = <16>;
         fsl,asrc-dma-rx-events = <17 18 19>;
         fsl,asrc-dma-tx-events = <20 21 22>;
         status = "okay";
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 6c9bec6bbe86..32c2e67cca63 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -308,8 +308,8 @@
 
                                 asrc_p2p: asrc_p2p {
                                         compatible = "fsl,imx6q-asrc-p2p";
-                                        fsl,output-rate  = <48000>;
-                                        fsl,output-width = <16>;
+                                        fsl,p2p-rate  = <48000>;
+                                        fsl,p2p-width = <16>;
                                         fsl,asrc-dma-rx-events = <17 18 19>;
                                         fsl,asrc-dma-tx-events = <20 21 22>;
                                         status = "okay";
diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c
index 6c67719c7958..8d68f5a7468e 100644
--- a/sound/soc/fsl/fsl_asrc.c
+++ b/sound/soc/fsl/fsl_asrc.c
@@ -81,7 +81,7 @@ static int asrc_p2p_request_channel(struct snd_pcm_substream *substream)
         fe_filter_data = dma_params_fe->filter_data;
         be_filter_data = dma_params_be->filter_data;
 
-        if (asrc_p2p->output_width == 16)
+        if (asrc_p2p->p2p_width == 16)
                 buswidth = DMA_SLAVE_BUSWIDTH_2_BYTES;
         else
                 buswidth = DMA_SLAVE_BUSWIDTH_4_BYTES;
@@ -153,8 +153,8 @@ static int config_asrc(struct snd_pcm_substream *substream,
         unsigned int rate    = params_rate(params);
         unsigned int channel = params_channels(params);
         struct asrc_config config = {0};
-        int output_word_width = 0;
-        int input_word_width = 0;
+        int p2p_word_width = 0;
+        int word_width = 0;
         int ret = 0;
         if ((channel != 2) && (channel != 4) && (channel != 6)) {
                 dev_err(cpu_dai->dev, "param channel is not correct\n");
@@ -167,16 +167,16 @@ static int config_asrc(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        if (asrc_p2p->output_width == 16)
-                output_word_width = ASRC_WIDTH_16_BIT;
+        if (asrc_p2p->p2p_width == 16)
+                p2p_word_width = ASRC_WIDTH_16_BIT;
         else
-                output_word_width = ASRC_WIDTH_24_BIT;
+                p2p_word_width = ASRC_WIDTH_24_BIT;
 
         switch (params_format(params)) {
         case SNDRV_PCM_FORMAT_U16:
         case SNDRV_PCM_FORMAT_S16_LE:
         case SNDRV_PCM_FORMAT_S16_BE:
-                input_word_width = ASRC_WIDTH_16_BIT;
+                word_width = ASRC_WIDTH_16_BIT;
                 break;
         case SNDRV_PCM_FORMAT_S20_3LE:
         case SNDRV_PCM_FORMAT_S20_3BE:
@@ -188,7 +188,7 @@ static int config_asrc(struct snd_pcm_substream *substream,
         case SNDRV_PCM_FORMAT_U24_LE:
         case SNDRV_PCM_FORMAT_U24_3BE:
         case SNDRV_PCM_FORMAT_U24_3LE:
-                input_word_width =  ASRC_WIDTH_24_BIT;
+                word_width =  ASRC_WIDTH_24_BIT;
                 break;
         case SNDRV_PCM_FORMAT_S8:
         case SNDRV_PCM_FORMAT_U8:
@@ -199,12 +199,12 @@ static int config_asrc(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        config.input_word_width   = input_word_width;
-        config.output_word_width  = output_word_width;
+        config.input_word_width   = word_width;
+        config.output_word_width  = p2p_word_width;
         config.pair               = asrc_p2p->asrc_index;
         config.channel_num        = channel;
         config.input_sample_rate  = rate;
-        config.output_sample_rate = asrc_p2p->output_rate;
+        config.output_sample_rate = asrc_p2p->p2p_rate;
         config.inclk              = INCLK_NONE;
 
         switch (asrc_p2p->per_dev) {
@@ -493,19 +493,19 @@ static int fsl_asrc_p2p_probe(struct platform_device *pdev)
 
         asrc_p2p->asrc_index = -1;
 
-        iprop_rate = of_get_property(np, "fsl,output-rate", NULL);
+        iprop_rate = of_get_property(np, "fsl,p2p-rate", NULL);
         if (iprop_rate)
-                asrc_p2p->output_rate = be32_to_cpup(iprop_rate);
+                asrc_p2p->p2p_rate = be32_to_cpup(iprop_rate);
         else {
-                dev_err(&pdev->dev, "There is no output-rate in dts\n");
+                dev_err(&pdev->dev, "There is no p2p-rate in dts\n");
                 return -EINVAL;
         }
-        iprop_width = of_get_property(np, "fsl,output-width", NULL);
+        iprop_width = of_get_property(np, "fsl,p2p-width", NULL);
         if (iprop_width)
-                asrc_p2p->output_width = be32_to_cpup(iprop_width);
+                asrc_p2p->p2p_width = be32_to_cpup(iprop_width);
 
-        if (asrc_p2p->output_width != 16 && asrc_p2p->output_width != 24) {
-                dev_err(&pdev->dev, "output_width is not acceptable\n");
+        if (asrc_p2p->p2p_width != 16 && asrc_p2p->p2p_width != 24) {
+                dev_err(&pdev->dev, "p2p_width is not acceptable\n");
                 return -EINVAL;
         }
 
diff --git a/sound/soc/fsl/fsl_asrc.h b/sound/soc/fsl/fsl_asrc.h
index 81af098af520..857f7f0f93a7 100644
--- a/sound/soc/fsl/fsl_asrc.h
+++ b/sound/soc/fsl/fsl_asrc.h
@@ -23,8 +23,8 @@ enum peripheral_device_type {
 };
 
 struct fsl_asrc_p2p {
-        int output_rate;
-        int output_width;
+        int p2p_rate;
+        int p2p_width;
         enum asrc_pair_index asrc_index;
         enum peripheral_device_type per_dev;
         struct asrc_p2p_ops asrc_ops;
diff --git a/sound/soc/fsl/imx-cs42888.c b/sound/soc/fsl/imx-cs42888.c
index 9dd52b52a591..7a7c47a27e9f 100644
--- a/sound/soc/fsl/imx-cs42888.c
+++ b/sound/soc/fsl/imx-cs42888.c
@@ -34,8 +34,8 @@
 
 struct imx_priv {
         int hw;
-        int fe_output_rate;
-        int fe_output_width;
+        int fe_p2p_rate;
+        int fe_p2p_width;
         unsigned int mclk_freq;
         unsigned int codec_mclk;
         struct platform_device *pdev;
@@ -160,7 +160,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
         {"AIN2L", NULL, "Line In Jack"},
         {"AIN2R", NULL, "Line In Jack"},
         {"esai-Playback",  NULL, "asrc-Playback"},
-        {"codec-Playback",  NULL, "esai-Playback"},/*Playback is the codec dai*/
+        {"codec-Playback",  NULL, "esai-Playback"},/* dai route for be and fe */
 };
 
 static int be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
@@ -168,10 +168,10 @@ static int be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
 
         struct imx_priv *priv = &card_priv;
 
-        hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->min = priv->fe_output_rate;
-        hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->max = priv->fe_output_rate;
+        hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->min = priv->fe_p2p_rate;
+        hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->max = priv->fe_p2p_rate;
         snd_mask_none(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT));
-        if (priv->fe_output_width == 16)
+        if (priv->fe_p2p_width == 16)
                 snd_mask_set(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT),
                                                         SNDRV_PCM_FORMAT_S16_LE);
         else
@@ -246,8 +246,8 @@ static int imx_cs42888_probe(struct platform_device *pdev)
                         struct fsl_asrc_p2p *asrc_p2p;
                         asrc_p2p = platform_get_drvdata(asrc_pdev);
                         asrc_p2p->per_dev = ESAI;
-                        priv->fe_output_rate = asrc_p2p->output_rate;
-                        priv->fe_output_width = asrc_p2p->output_width;
+                        priv->fe_p2p_rate = asrc_p2p->p2p_rate;
+                        priv->fe_p2p_width = asrc_p2p->p2p_width;
                 }
         }