sound: soc: xilinx: Sync with mainline version

Some minimal chagnes where made when upstreaming was done.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/sound/soc/xilinx/Kconfig b/sound/soc/xilinx/Kconfig
index 29d398dec4d4252a177721da31c8db19a9328db0..5a6d3416f217f675899dc18b485fc31a86a1168d 100644 (file)
--- a/sound/soc/xilinx/Kconfig
+++ b/sound/soc/xilinx/Kconfig
@@ -24,6 +24,10 @@ config SND_SOC_XILINX_I2S
        tristate "Audio support for the the Xilinx I2S"
        help
          Select this option to enable Xilinx I2S Audio. This enables
+         I2S playback and capture using xilinx soft IP. In transmitter
+         mode, IP receives audio in AES format, extracts PCM and sends
+         PCM data. In receiver mode, IP receives PCM audio and
+         encapsulates PCM in AES format and sends AES data.
          I2S playback and capture using xilinx soft IP
 
 config SND_SOC_XILINX_SPDIF

diff --git a/sound/soc/xilinx/Makefile b/sound/soc/xilinx/Makefile
index cf9d95c63ca4d65d28a2bfb3e86c7b67aa958982..32f052f88e63a50745fae1a761ad331de1490707 100644 (file)
--- a/sound/soc/xilinx/Makefile
+++ b/sound/soc/xilinx/Makefile
@@ -3,6 +3,7 @@ obj-$(CONFIG_SND_SOC_XILINX_DP) += xilinx-dp-codec.o
 obj-$(CONFIG_SND_SOC_XILINX_DP) += xilinx-dp-card.o
 obj-$(CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER) += xlnx_formatter_pcm.o
 obj-$(CONFIG_SND_SOC_XILINX_SDI) += xlnx_sdi_audio.o
-obj-$(CONFIG_SND_SOC_XILINX_I2S) += xlnx_i2s.o
+snd-soc-xlnx-i2s-objs      := xlnx_i2s.o
+obj-$(CONFIG_SND_SOC_XILINX_I2S) += snd-soc-xlnx-i2s.o
 obj-$(CONFIG_SND_SOC_XILINX_SPDIF) += xlnx_spdif.o
 obj-$(CONFIG_SND_SOC_XILINX_PL_SND_CARD) += xlnx_pl_snd_card.o

diff --git a/sound/soc/xilinx/xlnx_i2s.c b/sound/soc/xilinx/xlnx_i2s.c
index 77f52a94b5de15184c3e5a94f08514d80e2f6297..d4ae9eff41ce51cb2f2777263b5190edf49c3e49 100644 (file)
--- a/sound/soc/xilinx/xlnx_i2s.c
+++ b/sound/soc/xilinx/xlnx_i2s.c
@@ -16,6 +16,8 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 
+#define DRV_NAME "xlnx_i2s"
+
 #define I2S_CORE_CTRL_OFFSET           0x08
 #define I2S_I2STIM_OFFSET              0x20
 #define I2S_CH0_OFFSET                 0x30
@@ -82,7 +84,7 @@ static const struct snd_soc_dai_ops xlnx_i2s_dai_ops = {
 };
 
 static const struct snd_soc_component_driver xlnx_i2s_component = {
-       .name = "xlnx_i2s",
+       .name = DRV_NAME,
 };
 
 static const struct of_device_id xlnx_i2s_of_match[] = {
@@ -170,7 +172,7 @@ static int xlnx_i2s_probe(struct platform_device *pdev)
 
 static struct platform_driver xlnx_i2s_aud_driver = {
        .driver = {
-               .name = "xlnx_i2s",
+               .name = DRV_NAME,
                .of_match_table = xlnx_i2s_of_match,
        },
        .probe = xlnx_i2s_probe,
@@ -179,5 +181,5 @@ static struct platform_driver xlnx_i2s_aud_driver = {
 module_platform_driver(xlnx_i2s_aud_driver);
 
 MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Praveen Vuppala");
-MODULE_AUTHOR("Maruthi Srinivas Bayyavarapu");
+MODULE_AUTHOR("Praveen Vuppala  <praveenv@xilinx.com>");
+MODULE_AUTHOR("Maruthi Srinivas Bayyavarapu <maruthis@xilinx.com>");