Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[platform/kernel/linux-starfive.git] / sound / soc / codecs / nau8825.c

diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c
index 20e45a3..54ef7b0 100644 (file)
--- a/sound/soc/codecs/nau8825.c
+++ b/sound/soc/codecs/nau8825.c
@@ -1440,7 +1440,7 @@ static struct snd_soc_dai_driver nau8825_dai = {
        .capture = {
                .stream_name     = "Capture",
                .channels_min    = 1,
-               .channels_max    = 1,
+               .channels_max    = 2,   /* Only 1 channel of data */
                .rates           = NAU8825_RATES,
                .formats         = NAU8825_FORMATS,
        },
@@ -2478,7 +2478,6 @@ static const struct snd_soc_component_driver nau8825_component_driver = {
        .idle_bias_on           = 1,
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static void nau8825_reset_chip(struct regmap *regmap)