From patchwork Mon Aug 5 13:40:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 170555 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4312425ile; Mon, 5 Aug 2019 06:41:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqxj1S//z+rb94Wy+wlBRAH6YwFlee31OowGCIT6X2P5kla8ws1tDdArbnYqwtoBHoEv7oFH X-Received: by 2002:a17:90a:109:: with SMTP id b9mr17365969pjb.112.1565012497521; Mon, 05 Aug 2019 06:41:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565012497; cv=none; d=google.com; s=arc-20160816; b=iKTMLm3g1SNOsHi+1pylBzyvN9qiOS1i35xPtV2b/2xQze19CqjQ8Nxxh7wm9yucWf m4JF6N+LsDzUlKbY2X3zUSxm/9wjzcS1o4ckMjXF5UxZ/9Lx78DinYSrpYzFrccIsEUc 6NNpHc8lUo1xqzn2WVD6TroKM7cwyG/yV4DDs6NfO3+0e0r1OKfgPpK2VKjdPxZIos9H YHq+e4PnzhlBe491wW33WTIgzQH/FV1lGG0BO8bIPIn4vfP7BM0RH8em0EV66xQZtegB Kn9KIk+1Upg2+K5E1IjHHV69rn3fGSh4aMCH/RNBLL2oIloj2zoXAso5vOAEt13bn7sS /mYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UcxCUBbmcFwMvFJ+lzmbbweMssQIyjYeLgMmBVzMwco=; b=NtEI+oGVAfI+ZzS3GrxhcEeDRE1AGUN5UA+Rwa0/hT2MiXOYdV0aOrHe7KWG11oYOn TEzcyYtcPWztnpBcN6O8hOwrX0L2ChsZmkOUi9FQ2r2qBWMRYXWkeTcVvW/HROCuMRQV lV8qWaqDBUC0jAerF4wccYzYo46tgH05PfSXqmP/FAGj+WoviRLH6YExUKKsskSCRV56 AL9E1P5auO/UELO3STIuhl/WFBABgL5WunH80CroiDk8DMESSlmWT38c4zAFrntzBKkW 8n3pcreN9WSnbmrFNfjYdT7jUqxm+haQcM4MRBAk7fCYCrq4/3SYeIJGdmJI4UX2r8bo nH6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=Z4GCLa3Q; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ci5si42832942plb.45.2019.08.05.06.41.36; Mon, 05 Aug 2019 06:41:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=Z4GCLa3Q; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729900AbfHENlg (ORCPT + 29 others); Mon, 5 Aug 2019 09:41:36 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:46301 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729353AbfHENlM (ORCPT ); Mon, 5 Aug 2019 09:41:12 -0400 Received: by mail-wr1-f67.google.com with SMTP id z1so84466077wru.13 for ; Mon, 05 Aug 2019 06:41:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UcxCUBbmcFwMvFJ+lzmbbweMssQIyjYeLgMmBVzMwco=; b=Z4GCLa3Qh6Rov0aWhoMvXszTGWjElSstDzL3OKiiBUS0AOCza+chFFm6WBkjsSUjF2 m7xOnP1W7oEWspJ28voCXaybtNQT7tTsqqFEx7HvTKUAU3fYoR5vFmub4pqLSkJuo3oj mBEKL2w8yl024pYq1sCrC4thtkyQj4cTSdS8GOVPllKzjIeuRMOggkUldGnwUXF6GpcE iIi51y/TCARESONkSgnKt7lcAmDGBYh9N3T7XxaRVjeyf/XpaYzK2Aou97XfpPsfE5C8 7aMp3MHGEMwqTxBVSR/K8yqp3Iha6fOWk47mwTZNgm/mf5wWXhqrJXwWnoQZaOfGuF7o qNMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UcxCUBbmcFwMvFJ+lzmbbweMssQIyjYeLgMmBVzMwco=; b=TDjKQSdzXQy89QHVafZ+sgr7IMWvAc/xc4MjwQT+0//zbyT/s6xF4rYHN9mUbI8j/J WZHpil8LzgDnWqHfQVaZc70k/1YqUO/EtZQQknvo3ZboMviigJ0OCsDQk2vVPHN+E0cd 8yDuTACFu+U45FR5p1DoTE00ljkLA+5DMs5VnTxpA059uak4gSrLSFxJTfYZreLuRnTp p7gQRaDWE5+SvRNMmXdKpZ+c25Dg2rM3OO6QJJlDQ00lFWUbLaeGM3/6Op4ghKwWroQQ 5DEiMK/Lnb6ug/o1/YZopQqdATyJyq5mhH5lhHzM/CQGplR2p5xc7Bf88vp4kIxDoLwP mWVw== X-Gm-Message-State: APjAAAXsT1lQ3Mf5k9eKOAacSCEDanHB/D6LLOUvwNY7f9HMJx6kSpc7 VBL4Z635A1HW12PkCScxcslE4Q== X-Received: by 2002:adf:ef8d:: with SMTP id d13mr157062902wro.60.1565012470500; Mon, 05 Aug 2019 06:41:10 -0700 (PDT) Received: from starbuck.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id w7sm99040534wrn.11.2019.08.05.06.41.09 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 05 Aug 2019 06:41:10 -0700 (PDT) From: Jerome Brunet To: Andrzej Hajda , Neil Armstrong Cc: Jerome Brunet , Kevin Hilman , Jonas Karlman , linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH 4/8] drm/bridge: dw-hdmi-i2s: enable lpcm multi channels Date: Mon, 5 Aug 2019 15:40:58 +0200 Message-Id: <20190805134102.24173-5-jbrunet@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190805134102.24173-1-jbrunet@baylibre.com> References: <20190805134102.24173-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Properly setup the channel count and layout in dw-hdmi i2s driver so we are not limited to 2 channels. Also correct the maximum channel reported by the DAI from 6 to 8 ch Cc: Jonas Karlman Signed-off-by: Jerome Brunet --- drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.21.0 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c index 2b624cff541d..caf8aed78fea 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c @@ -84,6 +84,7 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data, } dw_hdmi_set_sample_rate(hdmi, hparms->sample_rate); + dw_hdmi_set_channel_count(hdmi, hparms->channels); hdmi_write(audio, inputclkfs, HDMI_AUD_INPUTCLKFS); hdmi_write(audio, conf0, HDMI_AUD_CONF0); @@ -139,7 +140,7 @@ static int snd_dw_hdmi_probe(struct platform_device *pdev) pdata.ops = &dw_hdmi_i2s_ops; pdata.i2s = 1; - pdata.max_i2s_channels = 6; + pdata.max_i2s_channels = 8; pdata.data = audio; memset(&pdevinfo, 0, sizeof(pdevinfo));