From patchwork Mon Aug 17 15:15:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 247814 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp2749068ilo; Mon, 17 Aug 2020 08:53:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxu338AMUoDsBWemxycjpLz14frwLaWLIWMNWV0cI/GuudUA7U9c/EOvG7no5LS2LIeqI5V X-Received: by 2002:a17:906:c7d2:: with SMTP id dc18mr16319299ejb.135.1597679622894; Mon, 17 Aug 2020 08:53:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597679622; cv=none; d=google.com; s=arc-20160816; b=h2BJrrStV2yWcICopohknx6Od76dRdcO3qL/N+dvKR8w5XYFkv6NSb8Xn7oysOkwyB SROJHhX0nn8l/xvEfY6ZVG5txkOmAKYzon2bQrnWnO8Ox7XrSeOwAH475Bn/38gh4W/V J8QFsKBtNHVa7Mgix487vTKWfMEZUMDNsHw5fa8igVhNjW0D2zFFQ3v+PIDGqiUQ3BPh kbAxM9aFRHJOxIdO+o4hukp3oiNTyM/QJh1cxtHbrmXC6ROt87lI63RBrgwI67D2I/C/ Z/dtMgycSG5csXjTSECnPRukNb9vB9f60zksGHrxVkjU10Q8mLOrsKD0GI9vDhNA08kO KC7w== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9Qk4AK3SyN2nkNq6NHLATuCSXhedvUB40Ht+GspDE5A=; b=0IPO18mQMDwFZB1YEwlBO4sI6TpoMVEvR09IpHMI8IWvWLVGRMJGZjP3Jvbigx3jDa hOnUkcWFY0SDw1dGAsgoUI3z4HMLZELpq+b4F+j6gRykpW+9ZvL77yQJOEYleXaLpWKK fONX6rFU8yxPhSZ4HCssYjCZ/PQT5LXi4fAdgUQEWaTmFO/YH+DXgoewG2OwZlkcnooF ponnKeJwRLR9k45EQz0nATU6d5H5R+qARVPcOV521Lead2UH6yogLETAdX15XQMsGqVn S2kxBtm9cMNcyHoKbyQdbReOqiAPvCyZ0BG5MAddI6Hk4eACZsr4c7NjquI9tZJcDl/H GKBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bThJa26z; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z9si11515741edr.282.2020.08.17.08.53.42; Mon, 17 Aug 2020 08:53:42 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bThJa26z; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387934AbgHQPxk (ORCPT + 15 others); Mon, 17 Aug 2020 11:53:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:40558 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387929AbgHQPxj (ORCPT ); Mon, 17 Aug 2020 11:53:39 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 39D842063A; Mon, 17 Aug 2020 15:53:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597679618; bh=5uDo564OW44HvyNxYlsZc/u02fwF7XtOjL5ThZ8US6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bThJa26z7wVDQMV4tOD2N7TXwXZUYtPt6h7UMHJa4X9eMJ9cw4L/zJ9JytLNFgkFc Tv58Dk4WMEZhr05lgVF/aOk4XQS+8eNq5G6i1uXctS9C6eEv+7mYLGCGmETnZ7Uhpc GANPiN3uoZoS7pLMAks6BLhMOGpY3tVETC/qXRGY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jerome Brunet , Mark Brown , Sasha Levin Subject: [PATCH 5.7 276/393] ASoC: meson: axg-tdmin: fix g12a skew Date: Mon, 17 Aug 2020 17:15:26 +0200 Message-Id: <20200817143833.007828101@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143819.579311991@linuxfoundation.org> References: <20200817143819.579311991@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jerome Brunet [ Upstream commit 80a254394fcfe55450b0351da298ca7231889219 ] After carefully checking the result provided by the TDMIN on the g12a and sm1 SoC families, the TDMIN skew offset appears to be 3 instead of 2 on the axg. Fixes: f01bc67f58fd ("ASoC: meson: axg-tdm-formatter: rework quirks settings") Signed-off-by: Jerome Brunet Link: https://lore.kernel.org/r/20200729154456.1983396-3-jbrunet@baylibre.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/meson/axg-tdmin.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -- 2.25.1 diff --git a/sound/soc/meson/axg-tdmin.c b/sound/soc/meson/axg-tdmin.c index 973d4c02ef8db..3d002b4eb939e 100644 --- a/sound/soc/meson/axg-tdmin.c +++ b/sound/soc/meson/axg-tdmin.c @@ -233,10 +233,26 @@ static const struct axg_tdm_formatter_driver axg_tdmin_drv = { }, }; +static const struct axg_tdm_formatter_driver g12a_tdmin_drv = { + .component_drv = &axg_tdmin_component_drv, + .regmap_cfg = &axg_tdmin_regmap_cfg, + .ops = &axg_tdmin_ops, + .quirks = &(const struct axg_tdm_formatter_hw) { + .invert_sclk = false, + .skew_offset = 3, + }, +}; + static const struct of_device_id axg_tdmin_of_match[] = { { .compatible = "amlogic,axg-tdmin", .data = &axg_tdmin_drv, + }, { + .compatible = "amlogic,g12a-tdmin", + .data = &g12a_tdmin_drv, + }, { + .compatible = "amlogic,sm1-tdmin", + .data = &g12a_tdmin_drv, }, {} }; MODULE_DEVICE_TABLE(of, axg_tdmin_of_match);