From patchwork Fri Jan 26 08:23:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Lothar_Wa=C3=9Fmann?= X-Patchwork-Id: 866195 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="nwYqNiWE"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zSX5z3k2Vz9rxj for ; Fri, 26 Jan 2018 19:25:27 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gCJYAoctqpKZEqqGmpkd2hcpKVtaZqfiMt914TY1QBY=; b=nwYqNiWEsCTVEM cUctTOdkXcOtu+WOp7zEVMrP4X/w3OTVomRk3ZPmmXukZ+HEx2Wbmje9nvaLa7pYYPWlvetX1P5pR AsFU/oT9HOez/JjhrOKEfNpTglo61bV6cDFKpdfrzJO0Hh/h5gcdL/DV9Ei7iHwmIe3JA1r6UA+VG PFyRvsL+2HNoRluDeaz5loPWy26UuzRZGe2D4saEXKDe+ZRVssIfZuhzidfIdLO5LVkOtZK5nqAsw lXWsLAv8CZvAXCUTu4ibiWDALX+3clhPtDFNHq+3zjLy/ZOFUuGfy6tYWUYY1J18A0H5AVi7ui9Ca vdTGoWP6z3wxgJPpj4dA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eezK7-0002Ao-6N; Fri, 26 Jan 2018 08:25:23 +0000 Received: from smtprelay09.ispgateway.de ([134.119.228.116]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eezJ4-0008P7-Jw for linux-arm-kernel@lists.infradead.org; Fri, 26 Jan 2018 08:24:21 +0000 Received: from [89.1.81.74] (helo=ipc1.ka-ro) by smtprelay09.ispgateway.de with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.89) (envelope-from ) id 1eezIp-0003m3-4f; Fri, 26 Jan 2018 09:24:03 +0100 Received: from lothar by ipc1.ka-ro with local (Exim 4.84_2 #2 (Debian)) id 1eezIm-0005W4-9V; Fri, 26 Jan 2018 09:24:00 +0100 From: =?utf-8?q?Lothar_Wa=C3=9Fmann?= To: Shawn Guo , Sascha Hauer , Fabio Estevam , Rob Herring , Mark Rutland , Russell King , linux-arm-kernel@lists.infradead.org (moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/3] ARM: dts: imx6ull: fix the i.MX6ULL UART8 configuration Date: Fri, 26 Jan 2018 09:23:50 +0100 Message-Id: <1516955032-21167-2-git-send-email-LW@KARO-electronics.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1516955032-21167-1-git-send-email-LW@KARO-electronics.de> References: <1516955032-21167-1-git-send-email-LW@KARO-electronics.de> MIME-Version: 1.0 X-Df-Sender: bHdAa2Fyby1lbGVjdHJvbmljcy5kZQ== X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [134.119.228.116 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Lothar_Wa=C3=9Fmann?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org UART8 on i.MX6ULL is not located on the SPBA bus like on i.MX6UL but on the (otherwise unused) AIPS-3 bus. Create the appropriate AIPS-3 bus configuration and move the uart8 definition where it belongs. Signed-off-by: Lothar Waßmann --- arch/arm/boot/dts/imx6ull.dtsi | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/arch/arm/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi index 0c18291..abc815f 100644 --- a/arch/arm/boot/dts/imx6ull.dtsi +++ b/arch/arm/boot/dts/imx6ull.dtsi @@ -41,3 +41,32 @@ #include "imx6ul.dtsi" #include "imx6ull-pinfunc.h" + +/ { + soc { + aips-bus@2000000 { + spba-bus@2000000 { + /delete-node/ serial@2024000; + }; + }; + + aips3: aips-bus@2200000 { + compatible = "fsl,aips-bus", "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x02200000 0x100000>; + ranges; + + uart8: serial@2288000 { + compatible = "fsl,imx6ul-uart", + "fsl,imx6q-uart"; + reg = <0x02288000 0x4000>; + interrupts = ; + clocks = <&clks IMX6UL_CLK_IPG>, + <&clks IMX6UL_CLK_UART8_SERIAL>; + clock-names = "ipg", "per"; + status = "disabled"; + }; + }; + }; +}; From patchwork Fri Jan 26 08:23:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Lothar_Wa=C3=9Fmann?= X-Patchwork-Id: 866194 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="N4J1591I"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zSX5Y3F4Jz9rxj for ; Fri, 26 Jan 2018 19:25:05 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=KpiiltcVdsh4iuBF85NZCj5cA0Cs48YQMAgz+CsxxIo=; b=N4J1591IXfBXf8 SXqVHI3sHnxAwwJkzGejSuxrJgwcjSLu62uL5/bwd08mS5FhEuCNy0NasmTFrbWM5+C4/dlRJyNsS gQLQnXRaiNjVGbDRBCICEAbdUgZXPlxKa5NzFnaMjxfxbRb9/2OOGBzFG2ESqfUFEH/PePuraXrQR dD4Bq84MNPsaRAMF9mX1MiTEgoNGqyzrP+L8wwX1fiHv8ZNToYnh/bL9vV1o98s/dvGPDJgOwh1yu E6QhY5tDb70LahldrwzYW5rWMoyfnzaIAJo2I+KjX0gvzcGdDNiASs5hpSYeRLdJl/DVNvFb/Ez3V AXhh2tTQYR4U7uJ3cBHA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eezJl-0000e3-24; Fri, 26 Jan 2018 08:25:01 +0000 Received: from smtprelay05.ispgateway.de ([80.67.31.99]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eezJ3-0008Or-Lz for linux-arm-kernel@lists.infradead.org; Fri, 26 Jan 2018 08:24:21 +0000 Received: from [89.1.81.74] (helo=ipc1.ka-ro) by smtprelay05.ispgateway.de with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.89) (envelope-from ) id 1eezIx-0003jb-9w; Fri, 26 Jan 2018 09:24:11 +0100 Received: from lothar by ipc1.ka-ro with local (Exim 4.84_2 #2 (Debian)) id 1eezIm-0005W9-GI; Fri, 26 Jan 2018 09:24:00 +0100 From: =?utf-8?q?Lothar_Wa=C3=9Fmann?= To: Shawn Guo , Sascha Hauer , Fabio Estevam , Rob Herring , Mark Rutland , Russell King , linux-arm-kernel@lists.infradead.org (moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/3] ARM: dts: imx6ull: add support for the esai interface Date: Fri, 26 Jan 2018 09:23:51 +0100 Message-Id: <1516955032-21167-3-git-send-email-LW@KARO-electronics.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1516955032-21167-1-git-send-email-LW@KARO-electronics.de> References: <1516955032-21167-1-git-send-email-LW@KARO-electronics.de> MIME-Version: 1.0 X-Df-Sender: bHdAa2Fyby1lbGVjdHJvbmljcy5kZQ== X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [80.67.31.99 listed in wl.mailspike.net] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [80.67.31.99 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Lothar_Wa=C3=9Fmann?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org The address space taken by the UART8 on the i.MX6UL is used for the ESAI interface on i.MX6ULL. Since the ESAI unit on i.MX6ULL has two more bits in the TFCR register (TFIN, TAENB) it deserves to get its own compatible string, though the bits are currently not used by the driver. Signed-off-by: Lothar Waßmann Acked-by: Dong Aisheng --- Documentation/devicetree/bindings/sound/fsl,esai.txt | 4 ++-- arch/arm/boot/dts/imx6ull.dtsi | 17 +++++++++++++++++ sound/soc/fsl/fsl_esai.c | 1 + 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/fsl,esai.txt b/Documentation/devicetree/bindings/sound/fsl,esai.txt index cacd18b..4103f46 100644 --- a/Documentation/devicetree/bindings/sound/fsl,esai.txt +++ b/Documentation/devicetree/bindings/sound/fsl,esai.txt @@ -7,8 +7,8 @@ other DSPs. It has up to six transmitters and four receivers. Required properties: - - compatible : Compatible list, must contain "fsl,imx35-esai" or - "fsl,vf610-esai" + - compatible : Compatible list, must contain "fsl,imx35-esai", + "fsl,vf610-esai" or "fsl,imx6ull-esai" - reg : Offset and length of the register set for the device. diff --git a/arch/arm/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi index abc815f..8724fdb2 100644 --- a/arch/arm/boot/dts/imx6ull.dtsi +++ b/arch/arm/boot/dts/imx6ull.dtsi @@ -47,6 +47,23 @@ aips-bus@2000000 { spba-bus@2000000 { /delete-node/ serial@2024000; + + esai: esai@2024000 { + compatible = "fsl,imx6ull-esai", "fsl,imx35-esai"; + reg = <0x02024000 0x4000>; + interrupts = ; + clocks = <&clks IMX6ULL_CLK_ESAI_IPG>, + <&clks IMX6ULL_CLK_ESAI_MEM>, + <&clks IMX6ULL_CLK_ESAI_EXTAL>, + <&clks IMX6ULL_CLK_ESAI_IPG>, + <&clks IMX6UL_CLK_SPBA>; + clock-names = "core", "mem", "extal", + "fsys", "spba"; + dmas = <&sdma 0 21 0>, + <&sdma 47 21 0>; + dma-names = "rx", "tx"; + status = "disabled"; + }; }; }; diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index cef79a1..5b6a53f 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -910,6 +910,7 @@ static int fsl_esai_probe(struct platform_device *pdev) } static const struct of_device_id fsl_esai_dt_ids[] = { + { .compatible = "fsl,imx6ull-esai", }, { .compatible = "fsl,imx35-esai", }, { .compatible = "fsl,vf610-esai", }, {} From patchwork Fri Jan 26 08:23:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Lothar_Wa=C3=9Fmann?= X-Patchwork-Id: 866192 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="fJCPx9XQ"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zSX4k46Wkz9sBd for ; Fri, 26 Jan 2018 19:24:22 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0l1zs72ZBTHZTKOpmsYg5+wXwrOvUPi4NFG3Yb/VNzo=; b=fJCPx9XQM2n44E RTF10YPbOLd0CkJdt098QLL5nA9yBwdLNi+ppeUSuJ26TyWCDqwL+So10izipwjxZZspWvyg5kRU5 AUrCFmHnMPL6Gc/j9oRfCIeAZx4BJWWi+bJiK6ibA37PRtNujvZDhwz/QbDow1QGTO5+dzyL3+nNf zXSxzpG9mGl0m4ouWDPs8/5t1/DjyPwHyYkpesGeO4PBZ0wEwEhyAa/QeFN0cESo5ySp64b8u3Sjo 0UrP8Mx3pCsD2+TLrAiB8JgCDB7AxmXymvTAYfm7XUFSUFRnIbW7VUGo4tLhcW7Fv0QdEAdgo3TZm 9WhvdQoVQJd38uvtSXQg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eezJ6-0008Sp-Lw; Fri, 26 Jan 2018 08:24:20 +0000 Received: from smtprelay07.ispgateway.de ([134.119.228.104]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eezJ3-0008PI-9B for linux-arm-kernel@lists.infradead.org; Fri, 26 Jan 2018 08:24:19 +0000 Received: from [89.1.81.74] (helo=ipc1.ka-ro) by smtprelay07.ispgateway.de with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.89) (envelope-from ) id 1eezIo-000773-HY; Fri, 26 Jan 2018 09:24:02 +0100 Received: from lothar by ipc1.ka-ro with local (Exim 4.84_2 #2 (Debian)) id 1eezIm-0005WE-Ol; Fri, 26 Jan 2018 09:24:00 +0100 From: =?utf-8?q?Lothar_Wa=C3=9Fmann?= To: Shawn Guo , Sascha Hauer , Fabio Estevam , Rob Herring , Mark Rutland , Russell King , linux-arm-kernel@lists.infradead.org (moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 3/3] ARM: dts: imx6ull: address some more incompatibilites between i.MX6UL and i.MX6ULL Date: Fri, 26 Jan 2018 09:23:52 +0100 Message-Id: <1516955032-21167-4-git-send-email-LW@KARO-electronics.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1516955032-21167-1-git-send-email-LW@KARO-electronics.de> References: <1516955032-21167-1-git-send-email-LW@KARO-electronics.de> MIME-Version: 1.0 X-Df-Sender: bHdAa2Fyby1lbGVjdHJvbmljcy5kZQ== X-Spam-Note: CRM114 invocation failed X-Spam-Score: -0.5 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [134.119.228.104 listed in list.dnswl.org] 2.1 RCVD_IN_MSPIKE_L5 RBL: Very bad reputation (-5) [134.119.228.104 listed in bl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 RCVD_IN_MSPIKE_BL Mailspike blacklisted X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Lothar_Wa=C3=9Fmann?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org The i.MX6ULL doesn't have the CAAM engine nor any SIM interface. These are currently not implemented for i.MX6UL but it cannot hurt to delete the corresponding nodes from the i.MX6ULL DTB anyway. Signed-off-by: Lothar Waßmann Acked-by: Dong Aisheng --- arch/arm/boot/dts/imx6ull.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi index 8724fdb2..da325cd 100644 --- a/arch/arm/boot/dts/imx6ull.dtsi +++ b/arch/arm/boot/dts/imx6ull.dtsi @@ -67,6 +67,12 @@ }; }; + aips-bus@2100000 { + /delete-node/ caam@21400000; + /delete-node/ sim@218c0000; + /delete-node/ sim@21b40000; + }; + aips3: aips-bus@2200000 { compatible = "fsl,aips-bus", "simple-bus"; #address-cells = <1>;