From patchwork Thu Jun 18 06:03:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengjiu Wang X-Patchwork-Id: 191081 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp1119469ilo; Wed, 17 Jun 2020 23:15:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxUTQGqsMS9Fj3pG24X4g3A6hcFRxzyXHZ9yX0bYiNyaLJjnuL12Vs0z1ZQPx/T/i+sNC3H X-Received: by 2002:aa7:c607:: with SMTP id h7mr2644073edq.214.1592460906583; Wed, 17 Jun 2020 23:15:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592460906; cv=none; d=google.com; s=arc-20160816; b=SB2AJo1a6VXIa1VNt2kDtcIfshPYa1gF/ds29DNWIy/fUs8IWa6zjlI4ZzM8iYkYOu 0vgrY1Pdwkb+4vvmeWXe1AOe5NryIURshbOeMEqNMMpxJZRkXYEFO70tjhl32vVTHJHy hpFqCi6yki9EFyeHgPzbnApG7DOVrFTjL+xH00KBiRpclEYvIeKMLbherrARBVoqkMQh LdcyTtsmYwiNSuOvbxYnpDTOBVeWh8Grr21P+9Y6zItF8R47iOEBk4u54EwkQ5a3PEpg E0m4ZcthrvZ1tKmEJaJTFQI9rV31W4PfzAxUnBwKJ715+CADI0ACJ8I4widtJVl4k4EQ L+2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:to:from; bh=XeTcewgM/Ho1UUIYSJsj8rci7Xg7O+D6jyzIHvrHfeU=; b=IGYdIdT97cJkl1c1iA1JajVwEZ9bO2CoMMoBCTCbw4B7ByFc6W3Q99+dZju1EMTqia L6cw/8Ii9uWb0lHtWfUrM1FtuGZ9+QIdradiTws/UGGUSyD/KYDlJqgUKMHUyZRWymvm S9ZVtqYC7Yj9vHIs6GHxbn/5kNdC0GQhy1BTkfguBcWcYZL9jsVZ3DD3ViZM3VXu/WnT /mdGS9Fgg2ALQkNFkdIi5vRDnLtDvBmvQCrtiAYFJTbIWJMecwtiv9hLDYXWMkuBBpWU P4+B0D7aq3sqI8LI6rRYFHoqYw+pMcT9s49pMG0s9ZI+Hvx0qnBM6kOVRi8T7jE0G45G O+pw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p6si1283950ejb.575.2020.06.17.23.15.06; Wed, 17 Jun 2020 23:15:06 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727824AbgFRGPG (ORCPT + 6 others); Thu, 18 Jun 2020 02:15:06 -0400 Received: from inva021.nxp.com ([92.121.34.21]:53278 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727812AbgFRGPD (ORCPT ); Thu, 18 Jun 2020 02:15:03 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 67F3E200C1E; Thu, 18 Jun 2020 08:15:01 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 97C66200068; Thu, 18 Jun 2020 08:14:57 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id F302440302; Thu, 18 Jun 2020 14:14:51 +0800 (SGT) From: Shengjiu Wang To: robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/5] ARM: dts: imx6sx: Enable ASRC device Date: Thu, 18 Jun 2020 14:03:45 +0800 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: ClamAV using ClamSMTP Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add compatible string, update the clock table, add fsl,asrc-rate and fsl,asrc-width property. Signed-off-by: Shengjiu Wang --- arch/arm/boot/dts/imx6sx.dtsi | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) -- 2.21.0 diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 94e3df47d1ad..7d4856ffd239 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -390,18 +390,28 @@ }; asrc: asrc@2034000 { + compatible = "fsl,imx6sx-asrc", "fsl,imx53-asrc"; reg = <0x02034000 0x4000>; interrupts = ; - clocks = <&clks IMX6SX_CLK_ASRC_MEM>, - <&clks IMX6SX_CLK_ASRC_IPG>, - <&clks IMX6SX_CLK_SPDIF>, - <&clks IMX6SX_CLK_SPBA>; - clock-names = "mem", "ipg", "asrck", "spba"; - dmas = <&sdma 17 20 1>, <&sdma 18 20 1>, - <&sdma 19 20 1>, <&sdma 20 20 1>, - <&sdma 21 20 1>, <&sdma 22 20 1>; + clocks = <&clks IMX6SX_CLK_ASRC_IPG>, + <&clks IMX6SX_CLK_ASRC_MEM>, <&clks 0>, + <&clks 0>, <&clks 0>, <&clks 0>, <&clks 0>, + <&clks 0>, <&clks 0>, <&clks 0>, <&clks 0>, + <&clks 0>, <&clks 0>, <&clks 0>, <&clks 0>, + <&clks IMX6SX_CLK_SPDIF>, <&clks 0>, <&clks 0>, + <&clks IMX6SX_CLK_SPBA>; + clock-names = "mem", "ipg", "asrck_0", + "asrck_1", "asrck_2", "asrck_3", "asrck_4", + "asrck_5", "asrck_6", "asrck_7", "asrck_8", + "asrck_9", "asrck_a", "asrck_b", "asrck_c", + "asrck_d", "asrck_e", "asrck_f", "spba"; + dmas = <&sdma 17 23 1>, <&sdma 18 23 1>, + <&sdma 19 23 1>, <&sdma 20 23 1>, + <&sdma 21 23 1>, <&sdma 22 23 1>; dma-names = "rxa", "rxb", "rxc", "txa", "txb", "txc"; + fsl,asrc-rate = <48000>; + fsl,asrc-width = <16>; status = "okay"; }; }; From patchwork Thu Jun 18 06:03:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengjiu Wang X-Patchwork-Id: 191083 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp1119629ilo; Wed, 17 Jun 2020 23:15:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyP0qbmKCN6Yi3z1NnmfWY8J9V1UnHXHs0t3Y49kD8nxHOUYiLJh+6/hDCLi/Vr7SMJilKB X-Received: by 2002:a17:906:51d1:: with SMTP id v17mr2426999ejk.383.1592460924135; Wed, 17 Jun 2020 23:15:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592460924; cv=none; d=google.com; s=arc-20160816; b=lTlZANbe7hvPsds5kwF3ogZFzaJSFiOfjVPHDzTJBbZEr5QqmC6rxIhfD2GhHNeao2 fW7hAZEIx26Js1Nm59gs/6hZ/fEKc2TSsF548LpItdLM37gjam52obpKEHOrdirPPMLT llCPMZONXk6I0WyT+10l+fb8GmKTVBFX5FLmInifukHHkgSveJcRUIj6ygLu/gq4NQAw pvMj4M7BHKeTY0B2Y6sSDtLpb7X8Rg7ChFDFYybX/FMJTl/H0WbpjmzgVC6WdZaJoDwL bCSh7dOuXbObFK14zH65d4BkRDQ+P26GPOuKqMfnmDixSqLZA59/D89X346UeExE/DCm ED8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:to:from; bh=dXifP0uA6d6JdOw/XTNtMliSyHXEGGJQ3Pey87nIDTg=; b=ejq9LsZ6+DWxjZVg+Cwb0w1VsqPWdpQ3Ww6etznZwuYZxFpGEVExHBjbQbhXMhYZCJ vft2RZTZPu5t+6veU3tApgQfBGqo+Ngw8TAEiLSrphDSTQuyGqiILbOHJ+oMwnbBE2xi Im3JWUutxweaIGh5VUF+MTb+wmigGA4N1ApQbfeMf2NOQcx/sm3YT1QmlHv//j9lcaQA 7lAhGp9dtel77RumsOKy3r5Pa9Hqk4RqW2wjrME66hjdMlhyuSYlq1WDSmCE1QpN1ZaX cJZ7HrjRBJ/PaPsPGK9dln9V8+vsgCoB+/oavoo69TE7KD6j7nGZPqOFt9L3d67V8zl/ pAAQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s12si1179161eju.110.2020.06.17.23.15.23; Wed, 17 Jun 2020 23:15:24 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727849AbgFRGPG (ORCPT + 6 others); Thu, 18 Jun 2020 02:15:06 -0400 Received: from inva020.nxp.com ([92.121.34.13]:47118 "EHLO inva020.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726950AbgFRGPE (ORCPT ); Thu, 18 Jun 2020 02:15:04 -0400 Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id B50A71A0E59; Thu, 18 Jun 2020 08:15:01 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id E402D1A0E46; Thu, 18 Jun 2020 08:14:57 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id E320D4030E; Thu, 18 Jun 2020 14:14:52 +0800 (SGT) From: Shengjiu Wang To: robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/5] ARM: dts: imx6sx-sdb: Add MQS support Date: Thu, 18 Jun 2020 14:03:46 +0800 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: ClamAV using ClamSMTP Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add MQS support. As the pin conflict with usdhc2, then need to add a separate dts. Signed-off-by: Shengjiu Wang --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx6sx-sdb-mqs.dts | 48 ++++++++++++++++++++++++++++ arch/arm/boot/dts/imx6sx-sdb.dtsi | 7 ++++ arch/arm/boot/dts/imx6sx.dtsi | 6 ++++ 4 files changed, 62 insertions(+) create mode 100644 arch/arm/boot/dts/imx6sx-sdb-mqs.dts -- 2.21.0 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index e6a1cac0bfc7..04f85d6a2af3 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -592,6 +592,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ imx6sx-sdb-reva.dtb \ imx6sx-sdb-sai.dtb \ imx6sx-sdb.dtb \ + imx6sx-sdb-mqs.dtb \ imx6sx-softing-vining-2000.dtb \ imx6sx-udoo-neo-basic.dtb \ imx6sx-udoo-neo-extended.dtb \ diff --git a/arch/arm/boot/dts/imx6sx-sdb-mqs.dts b/arch/arm/boot/dts/imx6sx-sdb-mqs.dts new file mode 100644 index 000000000000..a4ab2d3e960c --- /dev/null +++ b/arch/arm/boot/dts/imx6sx-sdb-mqs.dts @@ -0,0 +1,48 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2014 Freescale Semiconductor, Inc. + +#include "imx6sx-sdb.dts" +/ { + + sound { + status = "disabled"; + }; + + sound-mqs { + compatible = "fsl,imx6sx-sdb-mqs", + "fsl,imx-audio-mqs"; + model = "mqs-audio"; + audio-cpu = <&sai1>; + audio-asrc = <&asrc>; + audio-codec = <&mqs>; + }; +}; + +&usdhc2 { + /* pin conflict with mqs*/ + status = "disabled"; +}; + +&mqs { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_mqs>; + clocks = <&clks IMX6SX_CLK_SAI1>; + clock-names = "mclk"; + status = "okay"; +}; + +&sai1 { + pinctrl-0 = <>; + status = "okay"; +}; + +&ssi2 { + status = "disabled"; +}; + +&sdma { + gpr = <&gpr>; + /* SDMA event remap for SAI1 */ + fsl,sdma-event-remap = <0 15 1>, <0 16 1>; +}; diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi index 3e5fb72f21fc..69a502b369c5 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dtsi +++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi @@ -450,6 +450,13 @@ >; }; + pinctrl_mqs: mqsgrp { + fsl,pins = < + MX6SX_PAD_SD2_CLK__MQS_RIGHT 0x120b0 + MX6SX_PAD_SD2_CMD__MQS_LEFT 0x120b0 + >; + }; + pinctrl_i2c1: i2c1grp { fsl,pins = < MX6SX_PAD_GPIO1_IO01__I2C1_SDA 0x4001b8b1 diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 7d4856ffd239..8dc412b3862b 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -134,6 +134,12 @@ clock-output-names = "anaclk2"; }; + mqs: mqs { + compatible = "fsl,imx6sx-mqs"; + gpr = <&gpr>; + status = "disabled"; + }; + tempmon: tempmon { compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon"; interrupt-parent = <&gpc>; From patchwork Thu Jun 18 06:03:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengjiu Wang X-Patchwork-Id: 191084 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp1119633ilo; Wed, 17 Jun 2020 23:15:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyulvIgBTCrrkGOZTyLFK9AzQPKbJfH0nmThZ7XGPvguNcjoHPVho+Eb+LdjRr/5qdsDLDG X-Received: by 2002:a17:906:aec3:: with SMTP id me3mr2530241ejb.94.1592460924776; Wed, 17 Jun 2020 23:15:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592460924; cv=none; d=google.com; s=arc-20160816; b=e9swKFPv8gXunziaAftv4G1etZNfGAUsAXAufbgmaxklw56VNwXaKTUaGuBznEXaWd o9809l5v3jflqZ9NU+oQ2FxhzQ53DvcCQUD/5AGRLCa0FPIT/X9Gw18OTG68Rgra4MOd XS2FLl7G/4XfzW0QWzMxarJleDAEgzaA1Nm2OfDSB0/BUuAxYIGHzYM1O4x2oIFZTVMB mBV2aN6eRj9D4yu+/t5VO4k12q4oGkFz3kQ0BRj0B2CSdot3+FNoHJudysMctcb9SMZV qGnP0dn+b9kruyb5SsTvJZXVnCbiscD4CXJjd7OVhcZA/rRbIHx0wRgJgNaOfgCTO61z CLSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:to:from; bh=Hnlamuof1YBJlpegXHOeXjDowy/UJZnxFPoipFzWYyU=; b=c8i5f3oixEtF79zblFmJiQ40cIk/WmI2t5urAfQWJl+hDEYSdTfB4B3p43nBKi3R8H mMlb8L8EY9yx+BKqJJhmNPXfNrYSDREWavB2kX+6Ea3UFWXDhhbWQUXHPxOq1eEi6Zm7 qlAuY5+hidYWaBPRqDF9zqRls0leSM2ssj6pfL1Wk8svJHx2Yn5vuLwa2lbZXgKvH8n4 NUgpMaEd3SPTMCXKJ4soj+A4aS7pq5a9MP4zYBZQq1nZYpChSsG2B9bMS9sMwqc+SLKf mr6bPV6VgcX9RQYvL+Ax5lNk39Cg2f3gvLVOgXydPH4SMdaq2VRp8sxTkDZDix2jPZ8a z62A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s12si1179161eju.110.2020.06.17.23.15.24; Wed, 17 Jun 2020 23:15:24 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727843AbgFRGPG (ORCPT + 6 others); Thu, 18 Jun 2020 02:15:06 -0400 Received: from inva020.nxp.com ([92.121.34.13]:47242 "EHLO inva020.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727823AbgFRGPF (ORCPT ); Thu, 18 Jun 2020 02:15:05 -0400 Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 623E11A0E53; Thu, 18 Jun 2020 08:15:03 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 90DD11A0E4D; Thu, 18 Jun 2020 08:14:59 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id D27C1402B0; Thu, 18 Jun 2020 14:14:53 +0800 (SGT) From: Shengjiu Wang To: robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/5] ARM: dts: imx6sx-sdb: Add SPDIF support Date: Thu, 18 Jun 2020 14:03:47 +0800 Message-Id: <89e6f23c1aeb224cca2231aa61ee8472c55ad64f.1592460381.git.shengjiu.wang@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: ClamAV using ClamSMTP Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add SPDIF support. Signed-off-by: Shengjiu Wang --- arch/arm/boot/dts/imx6sx-sdb.dtsi | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- 2.21.0 diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi index 69a502b369c5..976fa8691007 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dtsi +++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi @@ -179,6 +179,15 @@ }; }; }; + + sound-spdif { + compatible = "fsl,imx-audio-spdif", + "fsl,imx6sx-sdb-spdif"; + model = "imx-spdif"; + spdif-controller = <&spdif>; + spdif-out; + }; + }; &audmux { @@ -296,6 +305,14 @@ status = "disabled"; }; +&spdif { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spdif>; + assigned-clocks = <&clks IMX6SX_CLK_SPDIF_PODF>; + assigned-clock-rates = <24576000>; + status = "okay"; +}; + &ssi2 { status = "okay"; }; @@ -569,6 +586,12 @@ >; }; + pinctrl_spdif: spdifgrp { + fsl,pins = < + MX6SX_PAD_SD4_DATA4__SPDIF_OUT 0x1b0b0 + >; + }; + pinctrl_uart1: uart1grp { fsl,pins = < MX6SX_PAD_GPIO1_IO04__UART1_DCE_TX 0x1b0b1 From patchwork Thu Jun 18 06:03:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengjiu Wang X-Patchwork-Id: 191085 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp1119640ilo; Wed, 17 Jun 2020 23:15:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJ1+ptH13FY/Jq8FiwINoCFoEdEW8l5Re64EXsh0HJKN02iPrasLnqaJulJ1i2WhIAy9Tv X-Received: by 2002:a50:9ee4:: with SMTP id a91mr2737188edf.172.1592460925602; Wed, 17 Jun 2020 23:15:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592460925; cv=none; d=google.com; s=arc-20160816; b=NqcSTH/MZRJM7zuEK67slnfbR4H03PlW0Hq8cn4BY++4Lt1X06wV1iDtu9N+PlGBnJ iDdPUa1yScnG78xOhS2ySZ92jgd+OQv5XVUOrHivmXmoEbflEvg1ci2+zJne8EE3gQbf GHQt+9CZYNX3HSTjMA0QdRhLmULsd/nkF4+i/Te+B7ICGDiY1l2cYlaBs0yg+3i1aQ3T GHalKfMghzerzH15i9iaKTFG0Su3JB0El5eJKDlP/H1pSdKcs1N8cuOQpxzhKwGIx0SD HEGVs+zkIoavsDEP6Fm6XhMyMqV1o3wA7UVODL4lxpEFXzoeCgeDctJnH/I0baXpb58y dwxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:to:from; bh=3YIZf3r8cLuQ2JNtJfO+XW5hLgfSKjEOS5q/iLOSV1s=; b=b/flh4I9pU/UAWAlb9O9AWsx61YdimUPb1FaPMVaekkwlXXgwhcCREuMNGzbvqyRbk byR6gutCyzcN1Nt7ulVPBPWCX0XfxhMBIJUIfS230CarXGhD7RtFDRv7uk/abal/ajPs 9+xWmcOGmRS9zpAvbAcrRbNkDDrpfooknKfqUKpATV2xTyBpl2og0y2gMpBjboBY1XXr 65CATVzsbMCt91HzpWHbvYxjqJQkXQEJcqZRAn0/vycCoftlHLvBzFvIZ5MHz/2X2dVp Nion/3BsUCgYv/mtykGmlg6STOzlA+w6AbUFvRZpBbtLzlAlEuHBDmOkeexczqGA3J6R v67Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s12si1179161eju.110.2020.06.17.23.15.25; Wed, 17 Jun 2020 23:15:25 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727826AbgFRGPG (ORCPT + 6 others); Thu, 18 Jun 2020 02:15:06 -0400 Received: from inva020.nxp.com ([92.121.34.13]:47232 "EHLO inva020.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726964AbgFRGPF (ORCPT ); Thu, 18 Jun 2020 02:15:05 -0400 Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 576C51A0E58; Thu, 18 Jun 2020 08:15:03 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 7ED171A0E44; Thu, 18 Jun 2020 08:14:59 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id CB493402CF; Thu, 18 Jun 2020 14:14:54 +0800 (SGT) From: Shengjiu Wang To: robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/5] ARM: dts: imx6sx-sabreauto: Add SPDIF support Date: Thu, 18 Jun 2020 14:03:48 +0800 Message-Id: <11b9a66f521aade999731477282de99cbbf6b0ad.1592460381.git.shengjiu.wang@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: ClamAV using ClamSMTP Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add SPDIF support. Signed-off-by: Shengjiu Wang --- arch/arm/boot/dts/imx6sx-sabreauto.dts | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) -- 2.21.0 diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts index 825924448ab4..772b8ac5d637 100644 --- a/arch/arm/boot/dts/imx6sx-sabreauto.dts +++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts @@ -66,6 +66,13 @@ enable-active-high; vin-supply = <®_can_en>; }; + + sound-spdif { + compatible = "fsl,imx-audio-spdif"; + model = "imx-spdif"; + spdif-controller = <&spdif>; + spdif-in; + }; }; &anaclk2 { @@ -227,6 +234,12 @@ >; }; + pinctrl_spdif: spdifgrp { + fsl,pins = < + MX6SX_PAD_ENET2_COL__SPDIF_IN 0x1b0b0 + >; + }; + pinctrl_uart1: uart1grp { fsl,pins = < MX6SX_PAD_GPIO1_IO04__UART1_DCE_TX 0x1b0b1 @@ -454,6 +467,14 @@ }; }; +&spdif { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spdif>; + assigned-clocks = <&clks IMX6SX_CLK_SPDIF_PODF>; + assigned-clock-rates = <24576000>; + status = "okay"; +}; + &wdog1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_wdog>; From patchwork Thu Jun 18 06:03:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengjiu Wang X-Patchwork-Id: 191082 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp1119595ilo; Wed, 17 Jun 2020 23:15:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXXrk204wO34v6YMUiMJiVzg+exDr92Dmllc+nWYUD5x7Rwc3fjYiuIZVN/j2CY1X33TEQ X-Received: by 2002:a17:906:1e92:: with SMTP id e18mr2669291ejj.254.1592460919816; Wed, 17 Jun 2020 23:15:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592460919; cv=none; d=google.com; s=arc-20160816; b=EW2aVnBBzH8cHEMhAJOZ7n9R1Emq+T/YHoux0rqhTvkuPWNP+JseXLF3jmF7f5hcE8 mm6pl7Y54uk2Z9jKpyNMVy3jLR4PmT7X4Q5oSIGfMy04lxhf5anuq+qru05Qfi5dYkrp Kvdzf9x/4IkXYn3h6OPzvbiguZsR461DOBSRuTusZ0rhXSUMdUuzBAmzDBJZZTaGLDJj nX3sVdFhLWNCLLybEjkzDrGCnkWFCzEtEGmRoy+rvAZFGdeviKfQ3KVMJoNm9SSpQ1jN 7XyauARuAcydeS5BPGzKR6hADOcXNHqAnj1MiNgStISYb/uHcMBromjWqluUZ21wKl7o P2og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:to:from; bh=C2vdgk/l1At9Dlhkw84i6+o94YsyCMvSubhS4bCDIxc=; b=OiEvCLLCF5ETsSQav8474z6IxDSOYFb3B3TXS70aouJHmXR5ve1FmGatytyoOlTvJX zQhCVWhzT4722Yujyl60UHhE3s4iKzt4rBw+R1ur/FOLDxkCNv/2R/SPsz9Je7+CVB7y ryqIkyive7vLC6SBZG/3aOrD6C0bhVHEWklbZNX1ov443KxgVYAoB0m+Q9oUI2DSJUUF Y5j1ZyKC78BUAxREiUXzuFLY/UE+yy+OdIUJ+A7hMacO6HIaiC+siDIhbAJ1y2d6EvNL EQJEu7hvtKkMulYLG9aAi6FNaYrHHwJ6uzBrGptxTg+tfHww+Q3Uvpv4zK/lroxi3ni5 qPsw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t23si1056013eji.737.2020.06.17.23.15.19; Wed, 17 Jun 2020 23:15:19 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727900AbgFRGPR (ORCPT + 6 others); Thu, 18 Jun 2020 02:15:17 -0400 Received: from inva021.nxp.com ([92.121.34.21]:53490 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727835AbgFRGPH (ORCPT ); Thu, 18 Jun 2020 02:15:07 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 87737200068; Thu, 18 Jun 2020 08:15:05 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 880DF200C24; Thu, 18 Jun 2020 08:15:01 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id C3BC54030D; Thu, 18 Jun 2020 14:14:55 +0800 (SGT) From: Shengjiu Wang To: robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/5] ARM: dts: imx6sx-sabreauto: Add cs42888 sound card support Date: Thu, 18 Jun 2020 14:03:49 +0800 Message-Id: <98c07c00c833080b561a2310cafcc79f8af78704.1592460381.git.shengjiu.wang@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: ClamAV using ClamSMTP Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Complete the ESAI node and Add cs42888 sound card support. Signed-off-by: Shengjiu Wang --- arch/arm/boot/dts/imx6sx-sabreauto.dts | 75 ++++++++++++++++++++++++++ arch/arm/boot/dts/imx6sx.dtsi | 4 ++ 2 files changed, 79 insertions(+) -- 2.21.0 diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts index 772b8ac5d637..76a4c06e0ff2 100644 --- a/arch/arm/boot/dts/imx6sx-sabreauto.dts +++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts @@ -67,6 +67,36 @@ vin-supply = <®_can_en>; }; + reg_cs42888: cs42888_supply { + compatible = "regulator-fixed"; + regulator-name = "cs42888_supply"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + sound-cs42888 { + compatible = "fsl,imx6-sabreauto-cs42888", + "fsl,imx-audio-cs42888"; + model = "imx-cs42888"; + audio-cpu = <&esai>; + audio-asrc = <&asrc>; + audio-codec = <&cs42888>; + audio-routing = + "Line Out Jack", "AOUT1L", + "Line Out Jack", "AOUT1R", + "Line Out Jack", "AOUT2L", + "Line Out Jack", "AOUT2R", + "Line Out Jack", "AOUT3L", + "Line Out Jack", "AOUT3R", + "Line Out Jack", "AOUT4L", + "Line Out Jack", "AOUT4R", + "AIN1L", "Line In Jack", + "AIN1R", "Line In Jack", + "AIN2L", "Line In Jack", + "AIN2R", "Line In Jack"; + }; + sound-spdif { compatible = "fsl,imx-audio-spdif"; model = "imx-spdif"; @@ -79,6 +109,25 @@ clock-frequency = <24576000>; }; +&clks { + assigned-clocks = <&clks IMX6SX_PLL4_BYPASS_SRC>, + <&clks IMX6SX_PLL4_BYPASS>, + <&clks IMX6SX_CLK_PLL4_POST_DIV>; + assigned-clock-parents = <&clks IMX6SX_CLK_LVDS2_IN>, + <&clks IMX6SX_PLL4_BYPASS_SRC>; + assigned-clock-rates = <0>, <0>, <24576000>; +}; + +&esai { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_esai>; + assigned-clocks = <&clks IMX6SX_CLK_ESAI_SEL>, + <&clks IMX6SX_CLK_ESAI_EXTAL>; + assigned-clock-parents = <&clks IMX6SX_CLK_PLL4_AUDIO_DIV>; + assigned-clock-rates = <0>, <24576000>; + status = "okay"; +}; + &fec1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet1>; @@ -200,6 +249,21 @@ >; }; + pinctrl_esai: esaigrp { + fsl,pins = < + MX6SX_PAD_CSI_DATA00__ESAI_TX_CLK 0x1b030 + MX6SX_PAD_CSI_DATA01__ESAI_TX_FS 0x1b030 + MX6SX_PAD_CSI_HSYNC__ESAI_TX0 0x1b030 + MX6SX_PAD_CSI_DATA04__ESAI_TX1 0x1b030 + MX6SX_PAD_CSI_DATA06__ESAI_TX2_RX3 0x1b030 + MX6SX_PAD_CSI_DATA07__ESAI_TX3_RX2 0x1b030 + MX6SX_PAD_CSI_DATA02__ESAI_RX_CLK 0x1b030 + MX6SX_PAD_CSI_DATA03__ESAI_RX_FS 0x1b030 + MX6SX_PAD_CSI_VSYNC__ESAI_TX5_RX0 0x1b030 + MX6SX_PAD_CSI_DATA05__ESAI_TX4_RX1 0x1b030 + >; + }; + pinctrl_flexcan1: flexcan1grp { fsl,pins = < MX6SX_PAD_QSPI1B_DQS__CAN1_TX 0x1b020 @@ -326,6 +390,17 @@ pinctrl-0 = <&pinctrl_i2c2>; status = "okay"; + cs42888: cs42888@48 { + compatible = "cirrus,cs42888"; + reg = <0x48>; + clocks = <&anaclk2 0>; + clock-names = "mclk"; + VA-supply = <®_cs42888>; + VD-supply = <®_cs42888>; + VLS-supply = <®_cs42888>; + VLC-supply = <®_cs42888>; + }; + touchscreen@4 { compatible = "eeti,egalax_ts"; reg = <0x04>; diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 8dc412b3862b..9f4f3c0aace5 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -341,6 +341,7 @@ }; esai: esai@2024000 { + compatible = "fsl,imx6sx-esai", "fsl,imx35-esai"; reg = <0x02024000 0x4000>; interrupts = ; clocks = <&clks IMX6SX_CLK_ESAI_IPG>, @@ -350,6 +351,9 @@ <&clks IMX6SX_CLK_SPBA>; clock-names = "core", "mem", "extal", "fsys", "spba"; + dmas = <&sdma 23 21 0>, + <&sdma 24 21 0>; + dma-names = "rx", "tx"; status = "disabled"; };