From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F242C35280 for ; Wed, 2 Oct 2019 09:07:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC47D21783 for ; Wed, 2 Oct 2019 09:07:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726784AbfJBJHQ (ORCPT ); Wed, 2 Oct 2019 05:07:16 -0400 Received: from mga06.intel.com ([134.134.136.31]:50995 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725908AbfJBJHP (ORCPT ); Wed, 2 Oct 2019 05:07:15 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Oct 2019 02:07:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,573,1559545200"; d="scan'208";a="343268371" Received: from brentlu-desk0.itwn.intel.com ([10.5.253.11]) by orsmga004.jf.intel.com with ESMTP; 02 Oct 2019 02:07:12 -0700 From: Brent Lu To: alsa-devel@alsa-project.org Cc: Cezary Rojewski , Pierre-Louis Bossart , Liam Girdwood , Jie Yang , Mark Brown , Jaroslav Kysela , Takashi Iwai , Alexios Zavras , Kuninori Morimoto , Brent Lu , Thomas Gleixner , linux-kernel@vger.kernel.org Subject: [PATCH] ASoC: bdw-rt5677: enable runtime channel merge Date: Wed, 2 Oct 2019 17:04:32 +0800 Message-Id: <1570007072-23049-1-git-send-email-brent.lu@intel.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In the DAI link "Capture PCM", the FE DAI "Capture Pin" supports 4-channel capture but the BE DAI supports only 2-channel capture. To fix the channel mismatch, we need to enable the runtime channel merge for this DAI link. Signed-off-by: Brent Lu --- sound/soc/intel/boards/bdw-rt5677.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c index 4a4d335..8d07038 100644 --- a/sound/soc/intel/boards/bdw-rt5677.c +++ b/sound/soc/intel/boards/bdw-rt5677.c @@ -273,6 +273,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { }, .dpcm_capture = 1, .dpcm_playback = 1, + .dpcm_merged_chan = 1, SND_SOC_DAILINK_REG(fe, dummy, platform), }, -- 2.7.4