From patchwork Wed Nov 4 00:13:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: yang.a.fang@intel.com X-Patchwork-Id: 7547541 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7E82E9F2F7 for ; Wed, 4 Nov 2015 00:15:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A8F072077D for ; Wed, 4 Nov 2015 00:15:44 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 6DB322078D for ; Wed, 4 Nov 2015 00:15:43 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 1A273265132; Wed, 4 Nov 2015 01:15:37 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 6BB9F261B19; Wed, 4 Nov 2015 01:15:28 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id E6CD6262631; Wed, 4 Nov 2015 01:15:27 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by alsa0.perex.cz (Postfix) with ESMTP id 846812617C1 for ; Wed, 4 Nov 2015 01:15:20 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP; 03 Nov 2015 16:15:12 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,240,1444719600"; d="scan'208";a="811132026" Received: from mocha.sc.intel.com ([143.183.245.87]) by orsmga001.jf.intel.com with ESMTP; 03 Nov 2015 16:15:12 -0800 From: yang.a.fang@intel.com To: broonie@kernel.org, lgirdwood@gmail.com Date: Tue, 3 Nov 2015 16:13:39 -0800 Message-Id: <1446596019-83464-1-git-send-email-yang.a.fang@intel.com> X-Mailer: git-send-email 1.7.9.5 Cc: alsa-devel@alsa-project.org, srinivas.sripathi@intel.com, vinod.koul@intel.com, joe.konno@intel.com, yang.a.fang@intel.com, sathyanarayana.nujella@intel.com, naveen.m@intel.com, vedang.patel@intel.com Subject: [alsa-devel] [PATCH] ASoC: nau8825: fix stream_name conflicting X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: M Naveen There is naming conflict with dai stream_name defined in dmic.c so assign different name Signed-off-by: Fang, Yang A Signed-off-by: M Naveen --- sound/soc/codecs/nau8825.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index 7fc7b4e..4d00ac0 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -298,8 +298,8 @@ static const struct snd_kcontrol_new nau8825_dacr_mux = static const struct snd_soc_dapm_widget nau8825_dapm_widgets[] = { - SND_SOC_DAPM_AIF_OUT("AIFTX", "Capture", 0, NAU8825_REG_I2S_PCM_CTRL2, - 15, 1), + SND_SOC_DAPM_AIF_OUT("AIFTX", "AIF1 Capture", 0, + NAU8825_REG_I2S_PCM_CTRL2, 15, 1), SND_SOC_DAPM_INPUT("MIC"), SND_SOC_DAPM_MICBIAS("MICBIAS", NAU8825_REG_MIC_BIAS, 8, 0), @@ -365,8 +365,8 @@ static const struct snd_soc_dapm_route nau8825_dapm_routes[] = { {"ADC", NULL, "ADC Power"}, {"AIFTX", NULL, "ADC"}, - {"DDACL", NULL, "Playback"}, - {"DDACR", NULL, "Playback"}, + {"DDACL", NULL, "AIF1 Playback"}, + {"DDACR", NULL, "AIF1 Playback"}, {"DDACL", NULL, "DDAC Clock"}, {"DDACR", NULL, "DDAC Clock"}, {"DACL Mux", "DACL", "DDACL"}, @@ -495,14 +495,14 @@ static const struct snd_soc_dai_ops nau8825_dai_ops = { static struct snd_soc_dai_driver nau8825_dai = { .name = "nau8825-hifi", .playback = { - .stream_name = "Playback", + .stream_name = "AIF1 Playback", .channels_min = 1, .channels_max = 2, .rates = NAU8825_RATES, .formats = NAU8825_FORMATS, }, .capture = { - .stream_name = "Capture", + .stream_name = "AIF1 Capture", .channels_min = 1, .channels_max = 1, .rates = NAU8825_RATES,