From patchwork Mon Aug 12 12:07:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 171065 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp2747344ily; Mon, 12 Aug 2019 05:07:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqzEmZxFjb3bwX/7HoeMvDcJprH7Ofz/fCL8KwjaePW2aJbKDMptOpK+YS1q2GfmM5dzdHKs X-Received: by 2002:a62:ac11:: with SMTP id v17mr35331985pfe.236.1565611673725; Mon, 12 Aug 2019 05:07:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565611673; cv=none; d=google.com; s=arc-20160816; b=LZ+7eh1M7zWww/2zq6tc+jF45jJdueARENXOUDXRPAy19Vi4zci1vab7Z0p23gZzB5 5EesajwkPKc0UrTVWgSbxDm9wcRcPPGnmxqZ2mlMFH2NCPIss9+IzNMVJKnqS+gjjX+e zmwQVJYHpA8tDScR1bHN1e1ULdyBa7KWmCcVgxiNKaY9NKD+Ru9AnMl2n4gYcQDfIHzT ZNF548xup21czECanB+74YcFyKy6cqqGFuSaV356ENSGKkbWYXH42J4ChLY0E6xoUaKY dk16BrM8zRHhc8vBkc0z5Sry0NCvOWeVYbRZ95KfjC+HDv9z1V3dhI2J1nE/dPbbQOaq cn0Q== 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=1wxGGO+eJqHNHPL320ZApEdBEJuHkt1WmWaw3TLqcWg=; b=iiW8WS/o01syc79VloEI949Y0IMMm9hY4bFDd8fBh7+twQDYmciTrYr6uw226fQOcs XlXNFXi0d1t5E6rnleHQ8o545aFVHdUtqXkEcfg9crYCNtUCW371O3MCS/RawpB/4J6G oSSayZHD2ZwlYTnIIlPvDZdDHvBKae2SVsstsEc9Ph6ma6C90PIb7PbPs2spi6yybbbD qzIP/v0QsCH1JLHtV33kXt/CvsW7aPzTyY4vsvx768rMlVOU2/nKWt24dMTBzU2Hf925 48CxgZ+eE7rmKrAmqvpURmTY25SB3OzQVwcFXM8aCQvcHnA2YefZHsDfw//Zr7Fnm8Vs kKFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=mj7VPqoP; 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 x8si9799540pfj.264.2019.08.12.05.07.53; Mon, 12 Aug 2019 05:07:53 -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=mj7VPqoP; 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 S1728489AbfHLMHi (ORCPT + 28 others); Mon, 12 Aug 2019 08:07:38 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:35450 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728422AbfHLMHf (ORCPT ); Mon, 12 Aug 2019 08:07:35 -0400 Received: by mail-wm1-f67.google.com with SMTP id l2so11550234wmg.0 for ; Mon, 12 Aug 2019 05:07:34 -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=1wxGGO+eJqHNHPL320ZApEdBEJuHkt1WmWaw3TLqcWg=; b=mj7VPqoP3QaypYZk5wdhlVro9KJGAVFvrtL+ktS1443PAbjOUKqGny5CD/pIW5bwl3 By1MKtNas4S3X0b1lwcmcLVPc6255JAMYCn2iAraSMcyV4K1BbTH0G1SSb5cO4QVt+hD 7bo0J0Rjcv/ydPYjs+WmXR64f7gXNpqVUx/3b6/+ynaviRLMmGPtlmvf6dyKfzSU3KPx yca4gQRCBh1PJ6440JPgr8bKQwOzWTbTmuRNmO1rdoCENmZzHLT6Wp2piNEN5PPokr0Q Kv9ujN38fe+RAP8cys4QHft3PyKqgD//+9PLkzVbz8jj/GxP+gsIN4pIpWPsAdxDKmtn WG9Q== 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=1wxGGO+eJqHNHPL320ZApEdBEJuHkt1WmWaw3TLqcWg=; b=NnC9xqOA3ndXd6Eoru89fHZjHaKK5SEy2h9DADWR06c0goCBlf8+zu76mElyl9MEWG XWVCSC/yIYouSOMTdxoGU2ndEMu6Xa8EfwNKHwUrYt5F49lLtdJ/tnicMcSkzpJtzs9W yY+JKu63Fq7sdzM5/5wEjjrsyyFhO+MaIcSfxSS9Udtp0V32JdlMTN0dfUlIbTRG0RC3 AEjTBJr/yg02rVmf4rehUgqOdod67ASVUaYkh9oWm+gDRXAMHIVkXDsPSOXw6UfDYg2r nw4QOeD5RHVlWFI6WwepBtUaxk/9A23ORJc8Qd/yHHjuvOmw9jBops4pd/mCNKuEF9Gq DPCQ== X-Gm-Message-State: APjAAAW+HelS3h4HGO+tsOX2hbxx45HPVQOTtkryszSx/JuFRHvJm3Ub cCsaUvRhQduudBFpqrWjZh5bhcjgUds= X-Received: by 2002:a1c:9d8c:: with SMTP id g134mr7473128wme.174.1565611653536; Mon, 12 Aug 2019 05:07:33 -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 j9sm1883415wrx.66.2019.08.12.05.07.32 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 12 Aug 2019 05:07:33 -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 v2 4/8] drm/bridge: dw-hdmi-i2s: enable lpcm multi channels Date: Mon, 12 Aug 2019 14:07:22 +0200 Message-Id: <20190812120726.1528-5-jbrunet@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190812120726.1528-1-jbrunet@baylibre.com> References: <20190812120726.1528-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 Reviewed-by: 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));