From patchwork Wed May 30 11:02:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 137245 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp5167689lji; Wed, 30 May 2018 04:02:52 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIVrCxtOAk1enMtjTZeJamvyziffkAdKrkCQm3+bxBKp/3F2qt6e5Alg+p/6POwwIuEa6kD X-Received: by 2002:adf:878c:: with SMTP id b12-v6mr1811524wrb.92.1527678172921; Wed, 30 May 2018 04:02:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527678172; cv=none; d=google.com; s=arc-20160816; b=zvodnluE2cmLrq533ucSnzj62tfReoozpHlzH2ll0cS5h3GQ5Zvj+WHb7C95LKH8TS Rf+UbteohMm8WpB7WFgTI8aQkfyWvEH5v+Agrr9hcP1/zftZqHL9KkV1Q8qdTCxhGtzf WtDwAtsbuDHfQfCD1JF3vGI4Jnn/3ntHovPnyJhl90GZ3+zxfrJZr0YSAoHx5BK3aeBV nfsl8Z7/OtaH45VbDfRtpb5SffdkAvyf0nEToyguAyN2rbc6eL4uEtfLCn7x5Xvaosqd zJzcYZg9O4X2rVQV/znG8nSBxqfBlciPe/Vf7NKAo4/zHAv78a5f5mU4l62MPP6xQ8MA 1eDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=hDwt7S4x8+rJ3PXbDxnAxQtWbVhwepYTCmyRhCqcJD4=; b=T516ty1xyHPxu80G7L0oyJe+4xj6jEm8gCd9fYiB/PsS5YJsRl39kyh8MhWfLKNoRd JC6Ry1DlpKURKJGWYJV6m7SBZBLj3Gfpxx7EsUYcPsJysRpIN+c/V7zqSd+W18ho8Y2u HfKTvoao6xOBegF5UY/wUpf8MZ73eeLon7iYuPSLp6i2eBSwskuuumVlAJtCFViWzZDx PoxYjVOiLgR/coKSd9LyoBnetKBwDQHqVbBWwRhH+DS1zcWU64Da/nWl7L/QceTH4Nq3 BLpTgytxETWQJdFl5PBuOdMFTrYvyzZK4bnfITjrWQI5NVyPhzw2Wuity8vZikIRYfb2 NLFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=SBaCC769; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id r2-v6si7354346wmf.162.2018.05.30.04.02.52; Wed, 30 May 2018 04:02:52 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=SBaCC769; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 9DF372676D8; Wed, 30 May 2018 13:02:51 +0200 (CEST) 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 EE4562676D9; Wed, 30 May 2018 13:02:49 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id BAE622676D7 for ; Wed, 30 May 2018 13:02:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=0ebbvHFuqMiTLAMRfTxEgssuFwS5xiIqDWjvvvIjqiU=; b=SBaCC769tqVt 5VT7kOcq25Bt1Su8qK4zKpw7dKOaSmd16VMqLUnAGiWjz0I/lDjsYhOe8UrDBvl5BxuQ9Uwci6ljj j/SLzFz7rn3ByiFUZJkhouKoYNFXMzg+otJgE+LmqXJnXC8ZZmvGZUNwHArB+Fckq5JsoHlRHpGYH pkosQ=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1fNysM-0007JD-TH; Wed, 30 May 2018 11:02:42 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fNysM-0006fs-FS; Wed, 30 May 2018 12:02:42 +0100 From: Mark Brown To: Philipp Zabel In-Reply-To: <20180523094300.8780-1-m.felsch@pengutronix.de> Message-Id: Date: Wed, 30 May 2018 12:02:42 +0100 Cc: alsa-devel@alsa-project.org, timur@tabi.org, Xiubo.Lee@gmail.com, lgirdwood@gmail.com, Marco Felsch , nicoleotsuka@gmail.com, broonie@kernel.org, kernel@pengutronix.de, fabio.estevam@nxp.com Subject: [alsa-devel] Applied "ASoC: imx-audmux: add RXFS/RXCLK defines for 6-wire connections" to the asoc tree 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 The patch ASoC: imx-audmux: add RXFS/RXCLK defines for 6-wire connections has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From c25f2566250cc58491a489c854013aecdf75dfef Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 23 May 2018 11:43:00 +0200 Subject: [PATCH] ASoC: imx-audmux: add RXFS/RXCLK defines for 6-wire connections In asynchronous mode, a RxFS and RxClk connection needs to be made between two ports. Add a define for the bit to be set in the *SEL fields. Signed-off-by: Philipp Zabel [m.felsch@pengutronix.de: fixed comment to include i.MX21 and 35] Signed-off-by: Marco Felsch Signed-off-by: Mark Brown --- include/dt-bindings/sound/fsl-imx-audmux.h | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.17.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/include/dt-bindings/sound/fsl-imx-audmux.h b/include/dt-bindings/sound/fsl-imx-audmux.h index 751fe1416f95..15f138bebe16 100644 --- a/include/dt-bindings/sound/fsl-imx-audmux.h +++ b/include/dt-bindings/sound/fsl-imx-audmux.h @@ -25,6 +25,13 @@ #define MX51_AUDMUX_PORT6 5 #define MX51_AUDMUX_PORT7 6 +/* + * TFCSEL/RFCSEL (i.MX27) or TFSEL/TCSEL/RFSEL/RCSEL (i.MX31/51/53/6Q) + * can be sourced from Rx/Tx. + */ +#define IMX_AUDMUX_RXFS 0x8 +#define IMX_AUDMUX_RXCLK 0x8 + /* Register definitions for the i.MX21/27 Digital Audio Multiplexer */ #define IMX_AUDMUX_V1_PCR_INMMASK(x) ((x) & 0xff) #define IMX_AUDMUX_V1_PCR_INMEN (1 << 8)