From patchwork Tue Jul 9 07:19:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Stefan_Riedm=C3=BCller?= X-Patchwork-Id: 11036467 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BC2121395 for ; Tue, 9 Jul 2019 07:19:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A2C0C2836F for ; Tue, 9 Jul 2019 07:19:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96F5527F90; Tue, 9 Jul 2019 07:19:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8E7CC2836F for ; Tue, 9 Jul 2019 07:19:40 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=txGZKUiftt8lWrUTc/jP+jjR+tBP3hVDyT+lo6qaxm4=; b=S1AAusC4MYPJGq4ob3AwdMUOmA lgaJqNV01FtWONGmjFAT7Cakd1kMNRxpZLg6FSeiHsg071zmRNDwETKWrnDdC/3CAXqmv7dRaSzZT BcTKmRZyz/w1pjtY/ldmcVZXE2AeIrsLsqyPb1uK81YAwbecEB25NPydMD1YJTJFVX20wpz4udcg1 iqSohJb6/BpieU19CjxYc70zOyeL8puULu15wcteVypOJuGZFInDgIxjkwrGL+FM+4vfBXrWgNZiK qmzju7H5r683XZhGaNkynQPOAlzRHgREXmHSg6t/C5/pjfvj3LQrlgtZ+LM0FXyhAzrnqilqTkS+Z iqksvRLA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkPX-0007Ux-Fv; Tue, 09 Jul 2019 07:19:35 +0000 Received: from mickerik.phytec.de ([195.145.39.210]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkPS-0007T2-Ji for linux-arm-kernel@lists.infradead.org; Tue, 09 Jul 2019 07:19:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1562656768; x=1565248768; h=From:Sender:Reply-To:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Q9+l9nZByzaX+KgMAAJlCsUEhKypi72xbb0pMY2tm+Y=; b=MsJaBN8gs1mRjMqse84PL87RHPwX/5bZdX7IsIx4ZCckcG1Onh9nBhNUQW5XZfqm OmwZBDa2zEQ4qARJTF3dMM7uM2DuzM6U+eu0vgR8jkWiGa68wGVTGStWe/cyBZ3X ASmZV5oa7lSgJcJsX+6pVEw58BXpZEleeUHAdaR09zg=; X-AuditID: c39127d2-193ff70000001aee-00-5d243fff74f1 Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id D7.B0.06894.FFF342D5; Tue, 9 Jul 2019 09:19:27 +0200 (CEST) Received: from augenblix2.phytec.de ([172.16.21.122]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2019070909192756-309704 ; Tue, 9 Jul 2019 09:19:27 +0200 From: Stefan Riedmueller To: shawnguo@kernel.org, s.hauer@pengutronix.de, robh+dt@kernel.org, mark.rutland@arm.com Subject: [PATCH 01/10] ARM: dts: imx6ul: phyboard-segin: Rename dts to PHYTEC name scheme Date: Tue, 9 Jul 2019 09:19:18 +0200 Message-Id: <1562656767-273566-2-git-send-email-s.riedmueller@phytec.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> References: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:27, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:27, Serialize complete at 09.07.2019 09:19:27 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrALMWRmVeSWpSXmKPExsWyRoCBS/e/vUqswcpH1hbzj5xjtXh41d9i 1dSdLBabHl9jtej6tZLZ4vKuOWwWS69fZLJ4cLGLxaJ17xF2i7/bN7FYvNgi7sDtsWbeGkaP HXeXMHrsnHWX3WPTqk42j81L6j02vtvB5NH/18Dj8ya5AI4oLpuU1JzMstQifbsEroz1M66z FXySrzjzdg1rA+N/6S5GTg4JAROJZ29fs3cxcnEICexglDix5BIzhHOBUWJK5ywmkCo2ASOJ BdMawWwRgUiJd9t/g3UwC+xhlJh2/TojSEIYKHH50Dt2EJtFQEVi0sITzCA2r4CHxNSbr9kh 1slJ3DzXCRbnFPCUOHrxF5gtBFRzecE0FpChEgKNTBLtVw+wQjQISZxefJZ5AiPfAkaGVYxC uZnJ2alFmdl6BRmVJanJeimpmxiBoXp4ovqlHYx9czwOMTJxMB5ilOBgVhLh3eeuHCvEm5JY WZValB9fVJqTWnyIUZqDRUmcdwNvSZiQQHpiSWp2ampBahFMlomDU6qBMeHaDm3LsLOm99Xy W0y9nC7em+7T1SrcfL30reMr5mVHotZpzFPLkNVOzjJ4+Pzl8/sbKhOuanCdaEnePF1W3dDx TGBtq5NsgOqv5PN3Z0/nPC1tm2Fdu2zGV567C1a9DlzidlW26Fl9u1V4fnBKvvnMCZFcnItq tp065PTgxxQL/qn8u3+mKrEUZyQaajEXFScCAE6N57BDAgAA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190709_001930_807884_5E51273F X-CRM114-Status: UNSURE ( 9.82 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, martyn.welch@collabora.com, linux-kernel@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, festevam@gmail.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Use the same name scheme for the phyBOARD-Segin and the phyCORE-i.MX 6UL as is used for the PHYTEC phyBOARD-Mira and phyCORE-i.MX 6. This is only a cosmetic change and there is no functional change intended. Signed-off-by: Stefan Riedmueller --- arch/arm/boot/dts/Makefile | 2 +- .../{imx6ul-phytec-pcl063.dtsi => imx6ul-phytec-phycore-som.dtsi} | 2 +- ...tec-phyboard-segin-full.dts => imx6ul-phytec-segin-ff-rdk.dts} | 8 ++++---- ...ytec-peb-eval-01.dtsi => imx6ul-phytec-segin-peb-eval-01.dtsi} | 0 ...imx6ul-phytec-phyboard-segin.dtsi => imx6ul-phytec-segin.dtsi} | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename arch/arm/boot/dts/{imx6ul-phytec-pcl063.dtsi => imx6ul-phytec-phycore-som.dtsi} (98%) rename arch/arm/boot/dts/{imx6ul-phytec-phyboard-segin-full.dts => imx6ul-phytec-segin-ff-rdk.dts} (84%) rename arch/arm/boot/dts/{imx6ul-phytec-peb-eval-01.dtsi => imx6ul-phytec-segin-peb-eval-01.dtsi} (100%) rename arch/arm/boot/dts/{imx6ul-phytec-phyboard-segin.dtsi => imx6ul-phytec-segin.dtsi} (99%) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index dab2914fa293..e1924b06f3cb 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -573,7 +573,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ul-opos6uldev.dtb \ imx6ul-pico-hobbit.dtb \ imx6ul-pico-pi.dtb \ - imx6ul-phytec-phyboard-segin-full.dtb \ + imx6ul-phytec-segin-ff-rdk.dtb \ imx6ul-tx6ul-0010.dtb \ imx6ul-tx6ul-0011.dtb \ imx6ul-tx6ul-mainboard.dtb \ diff --git a/arch/arm/boot/dts/imx6ul-phytec-pcl063.dtsi b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi similarity index 98% rename from arch/arm/boot/dts/imx6ul-phytec-pcl063.dtsi rename to arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi index fc2997449b49..bff13d0eb064 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-pcl063.dtsi +++ b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi @@ -10,7 +10,7 @@ #include "imx6ul.dtsi" / { - model = "Phytec phyCORE i.MX6 UltraLite"; + model = "PHYTEC phyCORE-i.MX6 UltraLite"; compatible = "phytec,imx6ul-pcl063", "fsl,imx6ul"; chosen { diff --git a/arch/arm/boot/dts/imx6ul-phytec-phyboard-segin-full.dts b/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk.dts similarity index 84% rename from arch/arm/boot/dts/imx6ul-phytec-phyboard-segin-full.dts rename to arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk.dts index b6a1407a9d44..1e59183a2f7c 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-phyboard-segin-full.dts +++ b/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk.dts @@ -5,12 +5,12 @@ */ /dts-v1/; -#include "imx6ul-phytec-pcl063.dtsi" -#include "imx6ul-phytec-phyboard-segin.dtsi" -#include "imx6ul-phytec-peb-eval-01.dtsi" +#include "imx6ul-phytec-phycore-som.dtsi" +#include "imx6ul-phytec-segin.dtsi" +#include "imx6ul-phytec-segin-peb-eval-01.dtsi" / { - model = "Phytec phyBOARD-Segin i.MX6 UltraLite Full Featured"; + model = "PHYTEC phyBOARD-Segin i.MX6 UltraLite Full Featured"; compatible = "phytec,imx6ul-pbacd10", "phytec,imx6ul-pcl063", "fsl,imx6ul"; }; diff --git a/arch/arm/boot/dts/imx6ul-phytec-peb-eval-01.dtsi b/arch/arm/boot/dts/imx6ul-phytec-segin-peb-eval-01.dtsi similarity index 100% rename from arch/arm/boot/dts/imx6ul-phytec-peb-eval-01.dtsi rename to arch/arm/boot/dts/imx6ul-phytec-segin-peb-eval-01.dtsi diff --git a/arch/arm/boot/dts/imx6ul-phytec-phyboard-segin.dtsi b/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi similarity index 99% rename from arch/arm/boot/dts/imx6ul-phytec-phyboard-segin.dtsi rename to arch/arm/boot/dts/imx6ul-phytec-segin.dtsi index 7bf439a77d2c..78425c3290a1 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-phyboard-segin.dtsi +++ b/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi @@ -5,7 +5,7 @@ */ / { - model = "Phytec phyBOARD-Segin i.MX6 UltraLite"; + model = "PHYTEC phyBOARD-Segin i.MX6 UltraLite"; compatible = "phytec,imx6ul-pbacd-10", "phytec,imx6ul-pcl063", "fsl,imx6ul"; aliases { From patchwork Tue Jul 9 07:19:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Stefan_Riedm=C3=BCller?= X-Patchwork-Id: 11036473 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3C11214DB for ; Tue, 9 Jul 2019 07:20:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2213628450 for ; Tue, 9 Jul 2019 07:20:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14A37286A2; Tue, 9 Jul 2019 07:20:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B877C20CCF for ; Tue, 9 Jul 2019 07:20:28 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=2B3NTF8HCB6W9o3OxlUeKm6wYZX+mc8WKE8r2o2FMc4=; b=YUP1bY1su5fc0SDQfZLkidj4r5 5gob1d9LNUf1fMDDTaKDM+Fvyeg1iW1rkDu+JVIRpgF5EOy8+85DljtYJkQkNPDG/WVNhgIVL2aBL Pg0Fla0F43bDWeP1qGpTBpPzGRPnKiyW5cEGrXzLmgEWLWA5y6WpTEwu5AUcat2ggDI3qK3G/wMVV 5sn1dmw/sEL9IDpa8hRMxmo2qmEyQrh6H45QZFpQNsyP6w98P2h8HGIpgVvIUGafnpL7FtTbPH79c sPzjjCvAAAYnqNe5HU6+kNTIjFl/lsATNDbkw0GECC1zXoTRJu14XSRnQPs/NyVeYjMYu3SBW3i7p MK5lCryA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkQD-0000nt-SK; Tue, 09 Jul 2019 07:20:18 +0000 Received: from mickerik.phytec.de ([195.145.39.210]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkPS-0007TH-KI for linux-arm-kernel@lists.infradead.org; Tue, 09 Jul 2019 07:19:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1562656768; x=1565248768; h=From:Sender:Reply-To:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=xqMLgEWD4pnHmhIMK3kiX0AvERv5gfUwO2HMQR7B+8o=; b=rvUwayDSg6Zqlc1ItCNk9SLvLYdFlgaQbjmLO/HMQhIJSlTY+TXwRQHNSmmyQASW RcCe9lOilMweF+2rnLFZ5z+yNiHnEUw8aIy9B6SNoyh6qStiCQDR3A00Lb8L0v5y qGb8NDoZJQW5xzmXlkhAU4FqwX8jTYeQjcuc856QUp4=; X-AuditID: c39127d2-17dff70000001aee-01-5d244000f909 Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 98.B0.06894.000442D5; Tue, 9 Jul 2019 09:19:28 +0200 (CEST) Received: from augenblix2.phytec.de ([172.16.21.122]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2019070909192779-309705 ; Tue, 9 Jul 2019 09:19:27 +0200 From: Stefan Riedmueller To: shawnguo@kernel.org, s.hauer@pengutronix.de, robh+dt@kernel.org, mark.rutland@arm.com Subject: [PATCH 02/10] ARM: dts: imx6ul: segin: Add boot media to dts filename Date: Tue, 9 Jul 2019 09:19:19 +0200 Message-Id: <1562656767-273566-3-git-send-email-s.riedmueller@phytec.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> References: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:27, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:28, Serialize complete at 09.07.2019 09:19:28 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrALMWRmVeSWpSXmKPExsWyRoCBS5fBQSXW4OsSLov5R86xWjy86m+x aupOFotNj6+xWnT9WslscXnXHDaLpdcvMlk8uNjFYtG69wi7xd/tm1gsXmwRd+D2WDNvDaPH jrtLGD12zrrL7rFpVSebx+Yl9R4b3+1g8uj/a+DxeZNcAEcUl01Kak5mWWqRvl0CV8aMrhcs Bdf4Kj7c38jYwHiYp4uRk0NCwERiwrPZbF2MXBxCAjsYJXZdWsEM4VxglHh+6SkbSBWbgJHE gmmNTCC2iECkxLvtv9lBipgF9jBKTLt+nREkISzgJ7FrcyM7iM0ioCKx5+MvZhCbV8BDYlPH HVaIdXISN891gsU5BTwljl6EqBECqrm8YBoLyFAJgUYmiSM/9zJCNAhJnF58lnkCI98CRoZV jEK5mcnZqUWZ2XoFGZUlqcl6KambGIGhenii+qUdjH1zPA4xMnEwHmKU4GBWEuHd564cK8Sb klhZlVqUH19UmpNafIhRmoNFSZx3A29JmJBAemJJanZqakFqEUyWiYNTqoFxytujW8I4/1y2 79Wt35d5u2L1hF3mEvLHvlQfCuipeZl2KF7zUKlBdkiMz+3Sb8cPehwRaDJWaRI9Yi0p2un4 Z1Et07p78X9MdHnaNso8Mmu9aWCwXODRLC0pu9xQxYkS10rdIzMjz12IDM9/JvnSae2Tw3/j vznknfFMvf7z3jYOpjV2V5YosRRnJBpqMRcVJwIACi+2tUMCAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190709_001930_811602_459895B0 X-CRM114-Status: GOOD ( 10.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, martyn.welch@collabora.com, linux-kernel@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, festevam@gmail.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP There is now a PHYTEC phyCORE-i.MX 6UL with eMMC instead of NAND flash available. The dts filename needs to reflect that to differentiate both. Signed-off-by: Stefan Riedmueller --- arch/arm/boot/dts/Makefile | 2 +- ...l-phytec-segin-ff-rdk.dts => imx6ul-phytec-segin-ff-rdk-nand.dts} | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) rename arch/arm/boot/dts/{imx6ul-phytec-segin-ff-rdk.dts => imx6ul-phytec-segin-ff-rdk-nand.dts} (85%) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index e1924b06f3cb..668b57c8cc57 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -573,7 +573,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ul-opos6uldev.dtb \ imx6ul-pico-hobbit.dtb \ imx6ul-pico-pi.dtb \ - imx6ul-phytec-segin-ff-rdk.dtb \ + imx6ul-phytec-segin-ff-rdk-nand.dtb \ imx6ul-tx6ul-0010.dtb \ imx6ul-tx6ul-0011.dtb \ imx6ul-tx6ul-mainboard.dtb \ diff --git a/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk.dts b/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts similarity index 85% rename from arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk.dts rename to arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts index 1e59183a2f7c..dc06029c5701 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk.dts +++ b/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts @@ -10,8 +10,9 @@ #include "imx6ul-phytec-segin-peb-eval-01.dtsi" / { - model = "PHYTEC phyBOARD-Segin i.MX6 UltraLite Full Featured"; - compatible = "phytec,imx6ul-pbacd10", "phytec,imx6ul-pcl063", "fsl,imx6ul"; + model = "PHYTEC phyBOARD-Segin i.MX6 UltraLite Full Featured with NAND"; + compatible = "phytec,imx6ul-pbacd10-nand", "phytec,imx6ul-pbacd10", + "phytec,imx6ul-pcl063", "fsl,imx6ul"; }; &adc1 { From patchwork Tue Jul 9 07:19:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Stefan_Riedm=C3=BCller?= X-Patchwork-Id: 11036483 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 37B9D1395 for ; Tue, 9 Jul 2019 07:21:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CA0F283BB for ; Tue, 9 Jul 2019 07:21:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1007128514; Tue, 9 Jul 2019 07:21:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9FB52283BB for ; Tue, 9 Jul 2019 07:21:01 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=//W3p+KICSkHjwsdPCOvunRtTSsXwGr9BndPQnZqQQw=; b=le84CWR2o8WqmQI1fgQEN2cxv1 ylA+d4vpKg9s3MNdmbUKV5+TgkriI7sQVXkLFl8RQ0GBNWnOhyaQtysOdf1eW1lJ+RfSGzWnEEwji vbIvczY8WZ1ak99fhRIvRjzH3+5FtD2/kCkYuHZPDu63wlo1yY0aA/ptrLLaLYp5SobKV/5DkNUKm mjLm+pfsGF5hqEUNem+US5ACySrCIajh5FPmsbaNOxOF3C6nc+BAIbTtRYCbaWMsTq42SecSIDDca x1zFdoIXiFiMiROqQ0lHIroCxkpOt9LrBds0C8+PjoUfitcnvGGey18mKiFekJyoIw/VWbokZRRHY +ACRUMJw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkQo-0001Iw-TH; Tue, 09 Jul 2019 07:20:55 +0000 Received: from mickerik.phytec.de ([195.145.39.210]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkPV-0007T2-1I for linux-arm-kernel@lists.infradead.org; Tue, 09 Jul 2019 07:19:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1562656768; x=1565248768; h=From:Sender:Reply-To:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=gHD7ubzNG2RKZFBDvA+A4Pf1yRHu2u+2z8XxFtTJI1M=; b=VLEeK/E5E3T/sjGXL8NsyAyoQq+t76dKKlbz8NwZcVzBchBu/aeugtdWl7JSMY8V +V8D4g0RCLM3alDMZ5vd6/m6hlO+iSnl7CRFCeseVZGKjA6qK5riLHS8XUH0BwHZ jBGwa2BgSgHIdtG1z+LQLi3FDd2eSetvFhQvBadG/Q4=; X-AuditID: c39127d2-193ff70000001aee-02-5d2440001c90 Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 59.B0.06894.000442D5; Tue, 9 Jul 2019 09:19:28 +0200 (CEST) Received: from augenblix2.phytec.de ([172.16.21.122]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2019070909192802-309706 ; Tue, 9 Jul 2019 09:19:28 +0200 From: Stefan Riedmueller To: shawnguo@kernel.org, s.hauer@pengutronix.de, robh+dt@kernel.org, mark.rutland@arm.com Subject: [PATCH 03/10] ARM: dts: imx6ul: segin: Reduce eth drive strength Date: Tue, 9 Jul 2019 09:19:20 +0200 Message-Id: <1562656767-273566-4-git-send-email-s.riedmueller@phytec.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> References: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:28, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:28, Serialize complete at 09.07.2019 09:19:28 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrPLMWRmVeSWpSXmKPExsWyRoCBS5fBQSXWoHOPhMX8I+dYLR5e9bdY NXUni8Wmx9dYLbp+rWS2uLxrDpvF0usXmSweXOxisWjde4Td4u/2TSwWL7aIO3B7rJm3htFj x90ljB47Z91l99i0qpPNY/OSeo+N73YwefT/NfD4vEkugCOKyyYlNSezLLVI3y6BK2Nl2zy2 gjvCFec7PjE1MHYKdjFyckgImEhc/72KqYuRi0NIYAejxM8VXxhBEkICFxgldvYWg9hsAkYS C6Y1MoHYIgKREu+2/2YHaWAW2MMoMe36dbAGYQFPictbprGC2CwCKhJbP71jBrF5BTwknvW8 ZofYJidx81wnWJwTqP7oxV/MEMs8JC4vmMYCMlRCoJFJYvGj04wQDUISpxefZZ7AyLeAkWEV o1BuZnJ2alFmtl5BRmVJarJeSuomRmCgHp6ofmkHY98cj0OMTByMhxglOJiVRHj3uSvHCvGm JFZWpRblxxeV5qQWH2KU5mBREufdwFsSJiSQnliSmp2aWpBaBJNl4uCUamC0WlGhnFw3X0lZ 54zTRcXvKxomGU932ay7bPX+rnn2v1Nn75lp2r/lPXfaoi07lXWuC/w/eGDOnzNZqd9WpnUc Panm4S+u9J+vSlGOi/0Fo6GYqMnhnX67WqO5Ox+ah4c2C7od2ZA17+KzM0VbnNQqDIwfiG0N iDgy8UjUG82guO0z55vUPdusxFKckWioxVxUnAgA5DZ+2kICAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190709_001933_243386_648039C0 X-CRM114-Status: UNSURE ( 9.55 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, martyn.welch@collabora.com, linux-kernel@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, festevam@gmail.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Reduce the drive strength for the MDC, MDIO and TX pins of FEC1 and FEC2 on the phyBOARD-Segin to improve signal quality and EMC. Also disable internal pull-ups on the MDC and MDIO pins. Signed-off-by: Stefan Riedmueller --- arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi | 12 ++++++------ arch/arm/boot/dts/imx6ul-phytec-segin.dtsi | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi index bff13d0eb064..1b745582911c 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi +++ b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi @@ -93,16 +93,16 @@ &iomuxc { pinctrl_enet1: enet1grp { fsl,pins = < - MX6UL_PAD_GPIO1_IO07__ENET1_MDC 0x1b0b0 - MX6UL_PAD_GPIO1_IO06__ENET1_MDIO 0x1b0b0 + MX6UL_PAD_GPIO1_IO07__ENET1_MDC 0x10010 + MX6UL_PAD_GPIO1_IO06__ENET1_MDIO 0x10010 MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN 0x1b0b0 MX6UL_PAD_ENET1_RX_ER__ENET1_RX_ER 0x1b0b0 MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00 0x1b0b0 MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x1b0b0 - MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN 0x1b0b0 - MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0 - MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0 - MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 0x4001b031 + MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN 0x1b010 + MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b010 + MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b010 + MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 0x4001b010 MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0x17059 >; }; diff --git a/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi b/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi index 78425c3290a1..28ba3a4c4c74 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi +++ b/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi @@ -230,10 +230,10 @@ MX6UL_PAD_ENET2_RX_ER__ENET2_RX_ER 0x1b0b0 MX6UL_PAD_ENET2_RX_DATA0__ENET2_RDATA00 0x1b0b0 MX6UL_PAD_ENET2_RX_DATA1__ENET2_RDATA01 0x1b0b0 - MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN 0x1b0b0 - MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00 0x1b0b0 - MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01 0x1b0b0 - MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x4001b031 + MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN 0x1b010 + MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00 0x1b010 + MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01 0x1b010 + MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x4001b010 >; }; From patchwork Tue Jul 9 07:19:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Stefan_Riedm=C3=BCller?= X-Patchwork-Id: 11036481 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 234AE1395 for ; Tue, 9 Jul 2019 07:20:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0ACA11FF2D for ; Tue, 9 Jul 2019 07:20:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0897828174; Tue, 9 Jul 2019 07:20:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AB21326246 for ; Tue, 9 Jul 2019 07:20:40 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=HwefnExSXfprTjW5cp3DkKk1k7f7herxMVv8uifSebk=; b=b95GR5eeRC64fvP+p0t4lPzPDr qKHPcpy+kD68pDqXLUh6z63omwZAVfR8HOA1BEHPD+ID625XgU/AUA12DEbQG1SiCFy5pT4iwBtvu ZPZP/M7jI5eGjzDrA32ENzT40fCIaVbQdRKmHr8bSnEOL0xk1O/oSy/tdzrlVTfmcLPtqasR+8nyg Iz9Sif/qGjrsid78Fl2xdE1uPvDGfuUBcgq25kdHsUrnRtQ3sCWaKw6t4EhNu0AtZ2dgX6WswNxNj EquDABCzKILE6Ub9D4FD5K5n6WNXBgPaLThqN5f+XVenkt1rWqTn07TOoMuVuypoV9lxup24M84yw r4gXSLcg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkQZ-000151-Tl; Tue, 09 Jul 2019 07:20:40 +0000 Received: from mickerik.phytec.de ([195.145.39.210]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkPV-0007T1-1H for linux-arm-kernel@lists.infradead.org; Tue, 09 Jul 2019 07:19:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1562656768; x=1565248768; h=From:Sender:Reply-To:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=NQp0WuZNIK00kO3yS17/LbuLzrs05MUOLARt1ohweH4=; b=D4hJBmDJn4jYKLM4Hb9bnTPl4SRsZKS+H5LSeID29SqPmqNENG0+pbKWpBmJ+zg5 7o8c0T+FF7Mg/Yb/Z5d6OTIWs99MsNF+CztCok1gaa/tBWVyN8rv1siApVL5l4HJ 0Tzn5HPXL1S5ySXzdVlPMKQeK7Km6nWeVfjpEyQa808=; X-AuditID: c39127d2-17dff70000001aee-03-5d2440009ef3 Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 1A.B0.06894.000442D5; Tue, 9 Jul 2019 09:19:28 +0200 (CEST) Received: from augenblix2.phytec.de ([172.16.21.122]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2019070909192826-309707 ; Tue, 9 Jul 2019 09:19:28 +0200 From: Stefan Riedmueller To: shawnguo@kernel.org, s.hauer@pengutronix.de, robh+dt@kernel.org, mark.rutland@arm.com Subject: [PATCH 04/10] ARM: dts: imx6ul: segin: Fix LED naming for phyCORE and PEB-EVAL-01 Date: Tue, 9 Jul 2019 09:19:21 +0200 Message-Id: <1562656767-273566-5-git-send-email-s.riedmueller@phytec.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> References: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:28, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:28, Serialize complete at 09.07.2019 09:19:28 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrALMWRmVeSWpSXmKPExsWyRoCBS5fBQSXW4PJXbYv5R86xWjy86m+x aupOFotNj6+xWnT9WslscXnXHDaLpdcvMlk8uNjFYtG69wi7xd/tm1gsXmwRd+D2WDNvDaPH jrtLGD12zrrL7rFpVSebx+Yl9R4b3+1g8uj/a+DxeZNcAEcUl01Kak5mWWqRvl0CV0bD7ztM Be38Fd07b7M0MK7n6WLk5JAQMJHoWf+UrYuRi0NIYAejxN03h5ggnAuMEq83fmQFqWITMJJY MK2RCcQWEYiUeLf9NztIEbPAHkaJadevM4IkhAWiJG69ecUCYrMIqEjcnPoALM4r4CFxetsD Joh1chI3z3Uyg9icAp4SRy/+ArOFgGouL5jGAjJUQqCRSWLxo9OMEA1CEqcXn2WewMi3gJFh FaNQbmZydmpRZrZeQUZlSWqyXkrqJkZgqB6eqH5pB2PfHI9DjEwcjIcYJTiYlUR497krxwrx piRWVqUW5ccXleakFh9ilOZgURLn3cBbEiYkkJ5YkpqdmlqQWgSTZeLglGpgjBa13zj1xP31 rRImAneesj77d/3qzHUqUqudF1y+brRqbtnxWeESclPzbrmytC5T49MvbrbW2WbhMU3BoYP7 kOp1h5gSLwFV7p+24tFTp7Fm+/jsObNhgci9k49rbWovc//79+lZalpo8Bnhl8yzYyq1mA27 UkTlVyv842f/yXOPwXWfUmWQEktxRqKhFnNRcSIAFmvFoEMCAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190709_001933_224669_B0445F02 X-CRM114-Status: GOOD ( 11.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, martyn.welch@collabora.com, linux-kernel@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, festevam@gmail.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Fix node name for the user LEDs to prevent the pinctrl of the phyCORE's leds node from being overwritten. Also use more generic names for user LEDs. Signed-off-by: Stefan Riedmueller --- arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi | 3 +-- arch/arm/boot/dts/imx6ul-phytec-segin-peb-eval-01.dtsi | 16 +++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi index 1b745582911c..73266b4a889b 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi +++ b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi @@ -31,8 +31,7 @@ pinctrl-0 = <&pinctrl_gpioleds_som>; compatible = "gpio-leds"; - led_green { - label = "phycore:green"; + phycore-green { gpios = <&gpio5 4 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; diff --git a/arch/arm/boot/dts/imx6ul-phytec-segin-peb-eval-01.dtsi b/arch/arm/boot/dts/imx6ul-phytec-segin-peb-eval-01.dtsi index e2f38f39a6ad..2f3fd32a1167 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-segin-peb-eval-01.dtsi +++ b/arch/arm/boot/dts/imx6ul-phytec-segin-peb-eval-01.dtsi @@ -21,20 +21,22 @@ }; }; - user_leds: leds { + user_leds: user-leds { compatible = "gpio-leds"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_user_leds>; status = "disabled"; - led_yellow { - gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "default-on"; + user-led1 { + gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "gpio"; + default-state = "on"; }; - led_red { - gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "default-on"; + user-led2 { + gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "gpio"; + default-state = "on"; }; }; }; From patchwork Tue Jul 9 07:19:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Stefan_Riedm=C3=BCller?= X-Patchwork-Id: 11036485 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 91BCC14DB for ; Tue, 9 Jul 2019 07:21:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7936928514 for ; Tue, 9 Jul 2019 07:21:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6DAC6286D5; Tue, 9 Jul 2019 07:21:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1A4AA285BA for ; Tue, 9 Jul 2019 07:21:15 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=HqyQNI+As8+tTefGe2fUbMfx93/r5DFdKXi4mYBNpxo=; b=DIrRtbLprskiJxtrzIfn16Ird1 b22ew0Uz3nBvO/BHy+RCpjZXfuw+/ZLz1R9YkX+9I4fQwCejIpSkIWhW+bKt99HSHq5Hpf8+idCho oOa/RPQjondN0fpzMdSGQd9K+ZtUwbND9WEx2MxSjzWKFqUHMOUzb2yoUQJ623NjPQulGo3IV0jma g7M45UrjR369zy/rxU88quyKg59m2rkwZadFbXW9EGd0XHxGGc04lVLg6kcM2TpTGxjS+LwmdGX+O MMZRV061VejLd8lpbvOL15yaHnzaOqjE5muQym28vKeEbra2Gy9I2Ftc9ElEbAr1t91yUjEiUi895 hs/2hyJQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkR8-0001WZ-Cz; Tue, 09 Jul 2019 07:21:14 +0000 Received: from mickerik.phytec.de ([195.145.39.210]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkPW-0007TH-Nk for linux-arm-kernel@lists.infradead.org; Tue, 09 Jul 2019 07:19:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1562656768; x=1565248768; h=From:Sender:Reply-To:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=s1zdktaUgi8FD5Dd3rpCZWrmcQvNrrlNSk3dVdiF9OQ=; b=D/24DhkEnr9C73VWm6s2YtHz16ECsSV4296exQp5BNqcqEn5bRRuOc0CMTzISToI H6/F7fSOqiCPxWmM+6CUjXKcz28cbnsjC3+g5syJHFKHdHFksv2ZiycU/XaLZcfL YITLqWo2+pisknbZHnRF9HCMeRWuluUKtezWE8Rpzmw=; X-AuditID: c39127d2-193ff70000001aee-04-5d244000701c Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id DA.B0.06894.000442D5; Tue, 9 Jul 2019 09:19:28 +0200 (CEST) Received: from augenblix2.phytec.de ([172.16.21.122]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2019070909192851-309708 ; Tue, 9 Jul 2019 09:19:28 +0200 From: Stefan Riedmueller To: shawnguo@kernel.org, s.hauer@pengutronix.de, robh+dt@kernel.org, mark.rutland@arm.com Subject: [PATCH 05/10] ARM: dts: imx6ul: segin: Make FEC and ethphy configurable in dts Date: Tue, 9 Jul 2019 09:19:22 +0200 Message-Id: <1562656767-273566-6-git-send-email-s.riedmueller@phytec.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> References: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:28, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:28, Serialize complete at 09.07.2019 09:19:28 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrALMWRmVeSWpSXmKPExsWyRoCBS5fBQSXWYOEyS4v5R86xWjy86m+x aupOFotNj6+xWnT9WslscXnXHDaLpdcvMlk8uNjFYtG69wi7xd/tm1gsXmwRd+D2WDNvDaPH jrtLGD12zrrL7rFpVSebx+Yl9R4b3+1g8uj/a+DxeZNcAEcUl01Kak5mWWqRvl0CV8bCLU/Y CmaJVMyZ/5axgXGnQBcjJ4eEgInEibYJjF2MXBxCAjsYJea/2skE4VxglFj0r5MFpIpNwEhi wbRGJhBbRCBS4t323+wgRcwCexglpl2/zgiSEBYIl1j2YwVYA4uAisS5jZvYQGxeAQ+J1ZO3 s0Gsk5O4ea6TGcTmFPCUOHrxF5gtBFRzecE0FpChEgKNTBKLH51mhGgQkji9+CzzBEa+BYwM qxiFcjOTs1OLMrP1CjIqS1KT9VJSNzECQ/XwRPVLOxj75ngcYmTiYDzEKMHBrCTCu89dOVaI NyWxsiq1KD++qDQntfgQozQHi5I47wbekjAhgfTEktTs1NSC1CKYLBMHp1QDo+ndVZ+vvC9f lnZrwvsdpYc/Mya0rwnVKwvepHylxqLl+w7GtbFSLovmPI/xmKzy4vrWw1qfKzIbjt09GpLS NLfinZuJTIeXKt/xosuXPT4fEV6iz+b/mydn+nvjNVOuLz3vcGbh96V7+D7nHOv+URd4z0Y8 qP92I5N2ieHyiXEJxScvJs95t1CJpTgj0VCLuag4EQABBJ4NQwIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190709_001935_092231_0B5CD7B1 X-CRM114-Status: GOOD ( 12.48 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, martyn.welch@collabora.com, linux-kernel@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, festevam@gmail.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP To disable Ethernet interfaces in case they are not populated make the FEC and Ethernet PHY status configurable in the dts files. Also change the Ethernet PHYs labels to make them correspond to the MDIO address. Signed-off-by: Stefan Riedmueller --- arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi | 7 ++++--- arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts | 12 ++++++++++++ arch/arm/boot/dts/imx6ul-phytec-segin.dtsi | 5 +++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi index 73266b4a889b..fee7a7e938ee 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi +++ b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi @@ -42,20 +42,21 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet1>; phy-mode = "rmii"; - phy-handle = <ðphy0>; - status = "okay"; + phy-handle = <ðphy1>; + status = "disabled"; mdio: mdio { #address-cells = <1>; #size-cells = <0>; - ethphy0: ethernet-phy@1 { + ethphy1: ethernet-phy@1 { reg = <1>; interrupt-parent = <&gpio1>; interrupts = <2 IRQ_TYPE_LEVEL_LOW>; micrel,led-mode = <1>; clocks = <&clks IMX6UL_CLK_ENET_REF>; clock-names = "rmii-ref"; + status = "disabled"; }; }; }; diff --git a/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts b/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts index dc06029c5701..81a82dd65019 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts +++ b/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts @@ -34,6 +34,18 @@ status = "okay"; }; +ðphy1 { + status = "okay"; +}; + +ðphy2 { + status = "okay"; +}; + +&fec1 { + status = "okay"; +}; + &fec2 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi b/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi index 28ba3a4c4c74..7cd24ec40c36 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi +++ b/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi @@ -107,7 +107,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet2>; phy-mode = "rmii"; - phy-handle = <ðphy1>; + phy-handle = <ðphy2>; status = "disabled"; }; @@ -160,11 +160,12 @@ }; &mdio { - ethphy1: ethernet-phy@2 { + ethphy2: ethernet-phy@2 { reg = <2>; micrel,led-mode = <1>; clocks = <&clks IMX6UL_CLK_ENET2_REF>; clock-names = "rmii-ref"; + status = "disabled"; }; }; From patchwork Tue Jul 9 07:19:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Stefan_Riedm=C3=BCller?= X-Patchwork-Id: 11036487 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E182913B1 for ; Tue, 9 Jul 2019 07:21:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C94B22858A for ; Tue, 9 Jul 2019 07:21:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BDFEC286D5; Tue, 9 Jul 2019 07:21:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 73064286E4 for ; Tue, 9 Jul 2019 07:21:35 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=4mKmTrBLsldZAcVq5wJzX2R59fSx7Cid0jqcTdSy6yE=; b=BSkb0qAIRHAH5+A82L5/I8qcCd jeNduRSjr9P5YXFgbvbvGNTmhsZmd9woTo/11mUBaVvuDqoXRLsb6hBNUj5qY8G4WLDMjKvJod6bI t/GfXe+F0kl8ij+r92rSRoeYgsqzgC0BCixfKNplB9sy+evW9a/5OFH/qXFIPskU9LZlZXjn/p62f ab1QjnO+19mXGzEp/2ePg8dl1arNuzWjDDgygXJ60wfDWXs8daG3Ks0HqThkjLBIUmkn9uLnz5inm bYo9bioIj3jsH0LgGgemRS/BvzZeNZv21D4mGtZEac0rmD9Nj5dQspdOc7dOFzQTHydz5ka+EedXj w6WKFHKg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkRO-0001lU-0g; Tue, 09 Jul 2019 07:21:30 +0000 Received: from mickerik.phytec.de ([195.145.39.210]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkPX-0007T1-Ce for linux-arm-kernel@lists.infradead.org; Tue, 09 Jul 2019 07:19:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1562656769; x=1565248769; h=From:Sender:Reply-To:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=z/Ce/mLF65vxqmXovjOXbBz9hT5T4pHaAptHuYI5I90=; b=Bk59+xg0GUKvuP9xK1qEx1MPp1VeUT6dI/VlX+NYBGGM0x0Y9L2RF5S76F4xQecB 4V/I256BmfEZt7QKDfbNqVT7QkS8GCMn8kMKy7nCwU1gRfllgdlE39MGHvYg30Ir DAVyvQbj10T93RBSGb3RZ70VSjqjoHS5pZ3Wh4EhjLY=; X-AuditID: c39127d2-17dff70000001aee-05-5d244001f440 Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 9B.B0.06894.100442D5; Tue, 9 Jul 2019 09:19:29 +0200 (CEST) Received: from augenblix2.phytec.de ([172.16.21.122]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2019070909192876-309709 ; Tue, 9 Jul 2019 09:19:28 +0200 From: Stefan Riedmueller To: shawnguo@kernel.org, s.hauer@pengutronix.de, robh+dt@kernel.org, mark.rutland@arm.com Subject: [PATCH 06/10] ARM: dts: imx6ul: segin: Only enable NAND if it is populated Date: Tue, 9 Jul 2019 09:19:23 +0200 Message-Id: <1562656767-273566-7-git-send-email-s.riedmueller@phytec.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> References: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:28, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:29, Serialize complete at 09.07.2019 09:19:29 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrPLMWRmVeSWpSXmKPExsWyRoCBS5fRQSXW4PJBTov5R86xWjy86m+x aupOFotNj6+xWnT9WslscXnXHDaLpdcvMlk8uNjFYtG69wi7xd/tm1gsXmwRd+D2WDNvDaPH jrtLGD12zrrL7rFpVSebx+Yl9R4b3+1g8uj/a+DxeZNcAEcUl01Kak5mWWqRvl0CV8bEmauY C9ZxVRzZvZW5gfElRxcjB4eEgInEth1cXYxcHEICOxglXl2ZwAzhXGCUuNO7EMjh5GATMJJY MK2RCcQWEYiUeLf9NztIEbPAHkaJadevM4IkhAWCJU4dmc0CYrMIqEi8u/yODcTmFfCQeHJx PzuILSEgJ3HzXCfYUE4BT4mjF3+B2UJANZcXTGMBGSoh0Mgk8frUNiaIBiGJ04vPMk9g5FvA yLCKUSg3Mzk7tSgzW68go7IkNVkvJXUTIzBQD09Uv7SDsW+OxyFGJg7GQ4wSHMxKIrz73JVj hXhTEiurUovy44tKc1KLDzFKc7AoifNu4C0JExJITyxJzU5NLUgtgskycXBKNTB2BKi17e5e IVYefYdD6GJ/5au9b62+XFZddyFtsdyl2C+XRBObejuu9Gusu93canWiqMRj0W0J96oK9b1c /Ambf23ysS+8sav8XOHGz6KzQnKDui/zXGF/KHdr7++pvBcOKb454ug6/Xj4uWvlBjkmC0td p02Z7nDL/Yj504V/nF9JPxCUmXlCiaU4I9FQi7moOBEAuVJR6EICAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190709_001935_693774_14B33CDF X-CRM114-Status: GOOD ( 12.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, martyn.welch@collabora.com, linux-kernel@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, festevam@gmail.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The phyCORE-i.MX 6UL/ULL now comes either with NAND flash or eMMC. We have to configure the populated memory type in the device tree files. So the GPMI node gets disabled by default and only enabled if populated. Signed-off-by: Stefan Riedmueller --- arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi | 2 +- arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi index fee7a7e938ee..de6ffbb0183c 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi +++ b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi @@ -65,7 +65,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpmi_nand>; nand-on-flash-bbt; - status = "okay"; + status = "disabled"; }; &i2c1 { diff --git a/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts b/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts index 81a82dd65019..c6ef13685a7c 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts +++ b/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts @@ -50,6 +50,10 @@ status = "okay"; }; +&gpmi { + status = "okay"; +}; + &i2c_rtc { status = "okay"; }; From patchwork Tue Jul 9 07:19:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Stefan_Riedm=C3=BCller?= X-Patchwork-Id: 11036489 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DA7E413B1 for ; Tue, 9 Jul 2019 07:21:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF4B92871F for ; Tue, 9 Jul 2019 07:21:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B25C828179; Tue, 9 Jul 2019 07:21:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 663962873B for ; Tue, 9 Jul 2019 07:21:57 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=GqBT01fyo0xW4tfn0LhgN4QcL/YT1HiQovWXu/xN1U4=; b=iNc60K1Cmrm0nIwLwWUqhEkp3s H85XL7sl3HJH9+TS3Q7W9W6h6W9c86bOFTJyt34myUFjBB3taZUekKW4I8QlbktQwLuAEH3IqwqWy lZG8ZUGdB1DAj5xr5QRa7hdHR1UXu1E9ZYYirLhNiHlRbRdhMHfL30OnQuleDZYivdPKdb8O2zgfX 96Np7o/UGf4Lg7MeHVgK967+yu5uCQbgow3W9kYt7pXrWMdr+ANfy+iQGueqUmFp/SqS9MD1S9cmV nCKQy1f3UacfzvXj3sggaUWcpa/7BUZ0H9y1HYNARbhR570vStLEHMIc9rFTfkwNAFUmUG5XdVsVC YEbcujJg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkRj-00023E-8J; Tue, 09 Jul 2019 07:21:51 +0000 Received: from mickerik.phytec.de ([195.145.39.210]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkPX-0007T2-Iv for linux-arm-kernel@lists.infradead.org; Tue, 09 Jul 2019 07:19:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1562656769; x=1565248769; h=From:Sender:Reply-To:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=6ULrCnQ2EXZKEZiCe54JkHz/IplY+eiMTmG6iPQMJ3w=; b=Dod327QbHiD3fTXVvysNZkgKhhvSF+GEYBCpaJtt76MbBg+xYAqlpMrC7eBenIFV gXq+s8NZebDVow92tEVwR+88xIaHJ1CMHjH4FtgBWLoVQp2kpJssbanj6mWQsdHA VSMWIuTdbWqml5jS9gWyEsRdb+Dq0n7uyVexbLBBeYw=; X-AuditID: c39127d2-193ff70000001aee-06-5d244001f5c9 Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 5C.B0.06894.100442D5; Tue, 9 Jul 2019 09:19:29 +0200 (CEST) Received: from augenblix2.phytec.de ([172.16.21.122]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2019070909192901-309710 ; Tue, 9 Jul 2019 09:19:29 +0200 From: Stefan Riedmueller To: shawnguo@kernel.org, s.hauer@pengutronix.de, robh+dt@kernel.org, mark.rutland@arm.com Subject: [PATCH 07/10] ARM: dts: imx6ul: phycore: Add eMMC at usdhc2 Date: Tue, 9 Jul 2019 09:19:24 +0200 Message-Id: <1562656767-273566-8-git-send-email-s.riedmueller@phytec.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> References: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:29, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:29, Serialize complete at 09.07.2019 09:19:29 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrPLMWRmVeSWpSXmKPExsWyRoCBS5fRQSXW4OcSWYv5R86xWjy86m+x aupOFotNj6+xWnT9WslscXnXHDaLpdcvMlk8uNjFYtG69wi7xd/tm1gsXmwRd+D2WDNvDaPH jrtLGD12zrrL7rFpVSebx+Yl9R4b3+1g8uj/a+DxeZNcAEcUl01Kak5mWWqRvl0CV8bbjoVM BVe5K85132drYLzN2cXIySEhYCLxZuk29i5GLg4hgR2MEtffbmOBcC4wSmzb/ZIJpIpNwEhi wbRGMFtEIFLi3fbfYB3MAnsYJaZdv87YxcjBISzgIvH+FhdIDYuAisScq5PYQGxeAQ+J9S8W MkJsk5O4ea6TGcTmFPCUOHrxF5gtBFRzecE0sMUSAo1MEtdeb4FqEJI4vfgs8wRGvgWMDKsY hXIzk7NTizKz9QoyKktSk/VSUjcxAgP18ET1SzsY++Z4HGJk4mA8xCjBwawkwrvPXTlWiDcl sbIqtSg/vqg0J7X4EKM0B4uSOO8G3pIwIYH0xJLU7NTUgtQimCwTB6dUA+Me1e9xeddCTUz7 /GPWfEqxy1v/wNX6xc/iFy8DdZ76bZ1zWOBLWasSR8cSiZNn9RYa/Pu4NSaJMbHo6+fvcnfn HCpSc3Qv1bWZzjbL7JPB5pVT3rWrFDA8t7q6s1tzAuszvx4LdZNlM0Mczp9n0VRkDWk8+2bH I6ePgjvuF/seXGB04fulRgUlluKMREMt5qLiRAA22/WSQgIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190709_001935_891796_94E0BBEB X-CRM114-Status: GOOD ( 10.82 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, martyn.welch@collabora.com, linux-kernel@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, festevam@gmail.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The phyCORE-i.MX 6UL/ULL now can have eMMC instead of the NAND flash memory. Add the eMMC node and disable it by default so it can be enabled in case it is populated. Signed-off-by: Stefan Riedmueller --- arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi index de6ffbb0183c..09a313daedb8 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi +++ b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi @@ -90,6 +90,15 @@ status = "okay"; }; +&usdhc2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc2>; + bus-width = <8>; + no-1-8-v; + non-removable; + status = "disabled"; +}; + &iomuxc { pinctrl_enet1: enet1grp { fsl,pins = < @@ -145,4 +154,19 @@ >; }; + pinctrl_usdhc2: usdhc2grp { + fsl,pins = < + MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x170f9 + MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x100f9 + MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x170f9 + MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x170f9 + MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x170f9 + MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x170f9 + MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x170f9 + MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x170f9 + MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x170f9 + MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x170f9 + >; + }; + }; From patchwork Tue Jul 9 07:19:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Stefan_Riedm=C3=BCller?= X-Patchwork-Id: 11036491 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8D7821395 for ; Tue, 9 Jul 2019 07:22:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E40728736 for ; Tue, 9 Jul 2019 07:22:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5FD4828737; Tue, 9 Jul 2019 07:22:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DF894286FF for ; Tue, 9 Jul 2019 07:22:10 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=z00unx+ySqC2Rr4ZzbFwX3za1MSIn4bX46M0bPZpIMQ=; b=WJKon5T/hMdLNTJL1JpJkIrVUC Bx5sFMd+LRIRFg1Kv81PS55QGMCL/Rc4f90lYNWyC7sZVLng8R819wXox7jschwmTMmOSIwLjWMKd 9ds/rx9/SHmaOxythjYNZqy/9kpmm+EDsb78ZyrxHThkK0BCnr8NiuUi6rGLC5rGtoZoOp6pBt/1U meX9NEdo1BvWvsoj0m7p8wLJuTA2r7RyMFGJx6ILJGtPIaQn6C9Mq1HHjXz0lju4OmWz0xz3V2x28 9X6I7iCgfWsWjbBbYGBKf9rL9nouI0w9bzyWkzkoh+ATA7DtUXPgZx3hd5M85CryrIHu+Kdhg2SOo L8CQW7OQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkS2-0002Rs-63; Tue, 09 Jul 2019 07:22:10 +0000 Received: from mickerik.phytec.de ([195.145.39.210]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkPZ-0007TH-8U for linux-arm-kernel@lists.infradead.org; Tue, 09 Jul 2019 07:19:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1562656769; x=1565248769; h=From:Sender:Reply-To:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=aDw5hzswtjO4S2Z52rF4tVaiyeGPvfY6gqilXLeQpJA=; b=O2r2OFQhSQAavReuIhL9NwrA07VvlouMsps+J6512YpcobsDTjAXntJ7WiZYpgdd 2FntbANeXdx0m3aU+o1DF+K+t4CAQFRp7l+lERub/u+V7VPMFHNqun2pKpiKBFuo v0nlCy841IMxZooB2iedh84wGEHEcwFtcyXXgKY/KAM=; X-AuditID: c39127d2-193ff70000001aee-08-5d2440018592 Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 1D.B0.06894.100442D5; Tue, 9 Jul 2019 09:19:29 +0200 (CEST) Received: from augenblix2.phytec.de ([172.16.21.122]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2019070909192926-309711 ; Tue, 9 Jul 2019 09:19:29 +0200 From: Stefan Riedmueller To: shawnguo@kernel.org, s.hauer@pengutronix.de, robh+dt@kernel.org, mark.rutland@arm.com Subject: [PATCH 08/10] ARM: dts: imx6ul: segin: Move ECSPI interface to board include file Date: Tue, 9 Jul 2019 09:19:25 +0200 Message-Id: <1562656767-273566-9-git-send-email-s.riedmueller@phytec.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> References: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:29, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:29, Serialize complete at 09.07.2019 09:19:29 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrPLMWRmVeSWpSXmKPExsWyRoCBS5fRQSXW4NUBHYv5R86xWjy86m+x aupOFotNj6+xWnT9WslscXnXHDaLpdcvMlk8uNjFYtG69wi7xd/tm1gsXmwRd+D2WDNvDaPH jrtLGD12zrrL7rFpVSebx+Yl9R4b3+1g8uj/a+DxeZNcAEcUl01Kak5mWWqRvl0CV8bEZ0dZ Cr4KVGz9cp61gbGHr4uRk0NCwETi0PRm1i5GLg4hgR2MEt2nL7BAOBcYJY4ubWUGqWITMJJY MK2RCcQWEYiUeLf9NztIEbPAHkaJadevM4IkhAWiJH4e/8YCYrMIqEi8mHQQyObg4BXwkLi2 jwdim5zEzXOdYDM5BTwljl78BWYLAZVcXjANbLGEQCOTxLXXWxghGoQkTi8+yzyBkW8BI8Mq RqHczOTs1KLMbL2CjMqS1GS9lNRNjMBAPTxR/dIOxr45HocYmTgYDzFKcDArifDuc1eOFeJN SaysSi3Kjy8qzUktPsQozcGiJM67gbckTEggPbEkNTs1tSC1CCbLxMEp1cBYdHyvxSH2s/+j tdX8drN6Byy5/0939ZYp5444zX4kJjjx6sMV1UzM/Aa1D1Q2TAmfo7f14t4/xwSTWBmLrpxJ nyT062jrim/BTyrPliU1lh67tb/Zy+bYoTfKaZE/JnckvZm/XsGw9Q7f10fCUw2m9sV83/9z dtu2/Kchftb6LJ+Kbjitfc9yR4mlOCPRUIu5qDgRAK9K5zVCAgAA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190709_001937_706704_F225B6F9 X-CRM114-Status: GOOD ( 11.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, martyn.welch@collabora.com, linux-kernel@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, festevam@gmail.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The ECSPI interface is available on the expansion connector of every PHYTEC phyBOARD-Segin. Move its definition to the board include file for better reuse. Signed-off-by: Stefan Riedmueller --- arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts | 14 -------------- arch/arm/boot/dts/imx6ul-phytec-segin.dtsi | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts b/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts index c6ef13685a7c..32d90c67a6f2 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts +++ b/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts @@ -28,9 +28,6 @@ }; &ecspi3 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ecspi3>; - cs-gpios = <&gpio1 20 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -93,14 +90,3 @@ &usdhc1 { status = "okay"; }; - -&iomuxc { - pinctrl_ecspi3: ecspi3grp { - fsl,pins = < - MX6UL_PAD_UART2_RTS_B__ECSPI3_MISO 0x10b0 - MX6UL_PAD_UART2_CTS_B__ECSPI3_MOSI 0x10b0 - MX6UL_PAD_UART2_RX_DATA__ECSPI3_SCLK 0x10b0 - MX6UL_PAD_UART2_TX_DATA__GPIO1_IO20 0x10b0 - >; - }; -}; diff --git a/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi b/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi index 7cd24ec40c36..8d5f8dc6ad58 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi +++ b/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi @@ -103,6 +103,13 @@ assigned-clock-rates = <786432000>; }; +&ecspi3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ecspi3>; + cs-gpios = <&gpio1 20 GPIO_ACTIVE_HIGH>; + status = "disabled"; +}; + &fec2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet2>; @@ -225,6 +232,15 @@ >; }; + pinctrl_ecspi3: ecspi3grp { + fsl,pins = < + MX6UL_PAD_UART2_RTS_B__ECSPI3_MISO 0x10b0 + MX6UL_PAD_UART2_CTS_B__ECSPI3_MOSI 0x10b0 + MX6UL_PAD_UART2_RX_DATA__ECSPI3_SCLK 0x10b0 + MX6UL_PAD_UART2_TX_DATA__GPIO1_IO20 0x10b0 + >; + }; + pinctrl_enet2: enet2grp { fsl,pins = < MX6UL_PAD_ENET2_RX_EN__ENET2_RX_EN 0x1b0b0 From patchwork Tue Jul 9 07:19:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Stefan_Riedm=C3=BCller?= X-Patchwork-Id: 11036493 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B03411395 for ; Tue, 9 Jul 2019 07:22:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 955AA2871F for ; Tue, 9 Jul 2019 07:22:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 891DE2872F; Tue, 9 Jul 2019 07:22:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 34B4B28726 for ; Tue, 9 Jul 2019 07:22:32 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=rEXgmCf6+ih5aTx91jBmXzpA3Djaf0wimrhZRFVlDxs=; b=Q7xgo8dE1DdFeGRQilmzLY/XbF R7XcxURAKNrv+FNnTQIvtJLKp2zZ0tTfiTVHv144cSxUsqU4yZyFjolOUoYMIVPdPv2SxUANaohCy 9ZcNmObG6t3FHVocNZTt1wBwn9R6fHaHzSce6LVAyo/LMK4OS69AUTZYiE7CrCV/h1ccD5tu2eJ13 r0JECrz+hEVyx0UyDp8O6MpE38zJ3l7Po6Jb/pKYqMbQxZpOlo7abyLHZUYy035W4jLYM+RoM3BZV uNJ/p1Q4NEPDWRQ6gxMTT2wlD+yU3DkQCE1CiSuq+L2yVQxZESRlqRi0/FbkJ5awBi7/yV1/UQU6F ZRft9ikA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkSG-0002gO-UR; Tue, 09 Jul 2019 07:22:25 +0000 Received: from mickerik.phytec.de ([195.145.39.210]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkPa-0007T1-46 for linux-arm-kernel@lists.infradead.org; Tue, 09 Jul 2019 07:19:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1562656769; x=1565248769; h=From:Sender:Reply-To:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=UoyMOrIVOLmkAP68dGafSoo6TcUNycT9H09rWKScbJk=; b=LC45CRS2kT9zZoGYmUjtpBjqWJ7YAwaFAmCEjajsx5+we9i6mdcnHI+ziFDz+/cj 10No8bn7QUEGrQCbnr/uzZFqq9r3+MqSGwp69nzf1C1jagzZUCK/FC9aXnr+sCIQ fSJBr9q4BgJOYeHUchIG+sRkzceOA9OZcRZcZvR72fo=; X-AuditID: c39127d2-193ff70000001aee-0a-5d2440014793 Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id ED.B0.06894.100442D5; Tue, 9 Jul 2019 09:19:29 +0200 (CEST) Received: from augenblix2.phytec.de ([172.16.21.122]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2019070909192949-309712 ; Tue, 9 Jul 2019 09:19:29 +0200 From: Stefan Riedmueller To: shawnguo@kernel.org, s.hauer@pengutronix.de, robh+dt@kernel.org, mark.rutland@arm.com Subject: [PATCH 09/10] ARM: dts: imx6ul: segin: Move machine include to dts files Date: Tue, 9 Jul 2019 09:19:26 +0200 Message-Id: <1562656767-273566-10-git-send-email-s.riedmueller@phytec.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> References: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:29, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:29, Serialize complete at 09.07.2019 09:19:29 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrHLMWRmVeSWpSXmKPExsWyRoCBS5fRQSXWoLHLwmL+kXOsFg+v+lus mrqTxWLT42usFl2/VjJbXN41h81i6fWLTBYPLnaxWLTuPcJu8Xf7JhaLF1vEHbg91sxbw+ix 4+4SRo+ds+6ye2xa1cnmsXlJvcfGdzuYPPr/Gnh83iQXwBHFZZOSmpNZllqkb5fAlfH8eW7B bq6KU+fWMzYwTufsYuTkkBAwkTj95zNLFyMXh5DADkaJFTs2MkM4Fxglru1bxQ5SxSZgJLFg WiMTiC0iECnxbvtvdpAiZoE9jBLTrl9nBEkICwRKnJ18G6yIRUBF4sKpD0CTODh4BTwlFj0z htgmJ3HzXCcziM0JFD568ReYLSTgIXF5wTSwKyQEGpkkrr3ewgjRICRxevFZ5gmMfAsYGVYx CuVmJmenFmVm6xVkVJakJuulpG5iBIbp4Ynql3Yw9s3xOMTIxMF4iFGCg1lJhHefu3KsEG9K YmVValF+fFFpTmrxIUZpDhYlcd4NvCVhQgLpiSWp2ampBalFMFkmDk6pBsapBjnqLsx5N/3t GhJUNpfNLzq2UF/x6AOXpKv3SkM0udzuKQbP2l/FtO1m1NTadw4dzWnbf9590Pft162be2K7 ny8zU2XLuCewuuyT2/8DOiltL/hj1E2qK7jPeC/m02U6rTxP83EVU33irYrLS8wTzq364X1t mfztg0HxE7v870vo8nx6d0+JpTgj0VCLuag4EQBOF+Y5QQIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190709_001938_649849_D23E4E83 X-CRM114-Status: GOOD ( 11.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, martyn.welch@collabora.com, linux-kernel@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, festevam@gmail.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Move the imx6ul.dtsi include to the dts files so it is easier to reuse the SOM dtsi for e.g. an i.MX 6ULL SOM. Signed-off-by: Stefan Riedmueller --- arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi | 1 - arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi index 09a313daedb8..92bf91674056 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi +++ b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi @@ -7,7 +7,6 @@ #include #include #include -#include "imx6ul.dtsi" / { model = "PHYTEC phyCORE-i.MX6 UltraLite"; diff --git a/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts b/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts index 32d90c67a6f2..699dfcbf9a60 100644 --- a/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts +++ b/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts @@ -5,6 +5,7 @@ */ /dts-v1/; +#include "imx6ul.dtsi" #include "imx6ul-phytec-phycore-som.dtsi" #include "imx6ul-phytec-segin.dtsi" #include "imx6ul-phytec-segin-peb-eval-01.dtsi" From patchwork Tue Jul 9 07:19:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Stefan_Riedm=C3=BCller?= X-Patchwork-Id: 11036495 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 690021395 for ; Tue, 9 Jul 2019 07:22:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EE16286FF for ; Tue, 9 Jul 2019 07:22:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4D37F28736; Tue, 9 Jul 2019 07:22:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 79607286FF for ; Tue, 9 Jul 2019 07:22:49 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=aDTMxNpGPbcU4sG8IUnQFQYSWUeJdirRR0t96mQ+mXY=; b=VL0WC+20AxAgCj2OPCbPSN6MZ+ x27WbmcbFKvibdABXNkBy9SVdbOQrw6+ljdg9s95hBvj4aNmrAJ6AslnuxAEujwgbKt143EOKR9rh oXy+wUvtxzcHMe7pM/q8SghFkrJSBf09ZCkTWfXK9ZV9kWHqe5zS40tPK0OHSqUb3K0LEQ/dxr7R6 wZd5aVI+VOj/mZ10YuFDYWucJMKxZJVm+Klhqh0xEIteGX6x7TS9Hg6nR1lh25EfLsFh5v4+UtMCl 4Lz77K9hzIC0Fyxo4KuCiMr+6CurvybNGO47Mxr8Bo1sIehmd2htYqaBv6QWML+LP5GB11ripeR3W 3RqThtcg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkSd-0002uk-Cp; Tue, 09 Jul 2019 07:22:47 +0000 Received: from mickerik.phytec.de ([195.145.39.210]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hkkPa-0007T2-Ft for linux-arm-kernel@lists.infradead.org; Tue, 09 Jul 2019 07:19:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1562656770; x=1565248770; h=From:Sender:Reply-To:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=TFYVH++ymITTvRsNe27dgjYWVA/VnBsrmCSeRpwRHtw=; b=kv1V60DK4fdYX3dIFnj/j/cZYAgdMKdIDnX9DtgBiJMUaIQz0YX9k0T0PC8Fx/aB y57TRqwI/Z9c2xqNwVxuvb9zkG6+sa8HMpZfVITwIk1ZMRYLsLXOQR/R7fnM7f88 pgyAjqBhUtIILjSRl5ANLRr/kh3q8GOcRWfoC0EOxOk=; X-AuditID: c39127d2-17dff70000001aee-0b-5d2440025fc4 Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id BE.B0.06894.200442D5; Tue, 9 Jul 2019 09:19:30 +0200 (CEST) Received: from augenblix2.phytec.de ([172.16.21.122]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2019070909192976-309713 ; Tue, 9 Jul 2019 09:19:29 +0200 From: Stefan Riedmueller To: shawnguo@kernel.org, s.hauer@pengutronix.de, robh+dt@kernel.org, mark.rutland@arm.com Subject: [PATCH 10/10] ARM: dts: imx6ull: Add support for PHYTEC phyBOARD-Segin with i.MX 6ULL Date: Tue, 9 Jul 2019 09:19:27 +0200 Message-Id: <1562656767-273566-11-git-send-email-s.riedmueller@phytec.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> References: <1562656767-273566-1-git-send-email-s.riedmueller@phytec.de> X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:29, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 09.07.2019 09:19:30, Serialize complete at 09.07.2019 09:19:30 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrALMWRmVeSWpSXmKPExsWyRoCBS5fJQSXWoOsjp8X8I+dYLR5e9bdY NXUni8Wmx9dYLbp+rWS2uLxrDpvF0usXmSweXOxisWjde4Td4u/2TSwWL7aIO3B7rJm3htFj x90ljB47Z91l99i0qpPNY/OSeo+N73YwefT/NfD4vEkugCOKyyYlNSezLLVI3y6BK2P1tFam gkceFWe3LGNrYNxn3cXIySEhYCLRPbWZpYuRi0NIYAejROOEs4wQzgVGiQdvLrCBVLEJGEks mNbIBGKLCERKvNv+mx2kiFlgD6PEtOvXGUESwgJxEg0X74M1sAioSEzuncIKYvMKeEqcOH2B EWKdnMTNc53MIDYnUPzoxV9gtpCAh8TlBdPAzpAQaGSSaPi+hh2iQUji9OKzzBMY+RYwMqxi FMrNTM5OLcrM1ivIqCxJTdZLSd3ECAzVwxPVL+1g7JvjcYiRiYPxEKMEB7OSCO8+d+VYId6U xMqq1KL8+KLSnNTiQ4zSHCxK4rwbeEvChATSE0tSs1NTC1KLYLJMHJxSDYy8d+SNrul4mMhM Cak42/P2cKCDe5iLVa+AtFqMgFpSloS52fIHUSWrXdtUp5uzTzerX1y8LmGxeLDjui01Wp/5 mJW4NilEPH0mN2HW46anXN0/+ucxLBF/om7FffhhwG3958tCbvgdi/VZa79jUkPSxGfzDrG8 OScZf1hU89Dn2npthXdL+5VYijMSDbWYi4oTAd4pPhdDAgAA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190709_001939_125042_CEA53D80 X-CRM114-Status: GOOD ( 15.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, martyn.welch@collabora.com, linux-kernel@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, festevam@gmail.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In addition to the PHYTEC phyCORE-i.MX 6UL the PHYTEC phyBOARD-Segin is also available with the PHYTEC phyCORE-i.MX 6ULL. So this adds support for this SOM and its baseboards. It comes in a full featured option with either NAND flash or eMMC and in a low cost option only available with NAND flash. The hardware specs are: - Full featured with NAND or eMMC: * i.MX 6ULL Y2 * 512MB DDR3 memory * 512MB NAND flash or 4GB/8GB eMMC * Dual 10/100 Ethernet * USB Host and USB OTG * RS232 * MicroSD external storage * Audio, RS232, I2C, SPI, CAN headers * Further I/O options via A/V and Expansion headers - Low cost with NAND: * i.MX 6ULL Y0 * 256MB DDR3 memory * 128MB NAND flash * Single 10/100 Ethernet * USB OTG * RS232 * MicroSD external storage * I2C * Further I/O options via Expansion headers Signed-off-by: Stefan Riedmueller --- arch/arm/boot/dts/Makefile | 3 + arch/arm/boot/dts/imx6ull-phytec-phycore-som.dtsi | 24 ++++++ .../boot/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts | 93 ++++++++++++++++++++++ .../boot/dts/imx6ull-phytec-segin-ff-rdk-nand.dts | 93 ++++++++++++++++++++++ .../boot/dts/imx6ull-phytec-segin-lc-rdk-nand.dts | 45 +++++++++++ .../boot/dts/imx6ull-phytec-segin-peb-eval-01.dtsi | 19 +++++ arch/arm/boot/dts/imx6ull-phytec-segin.dtsi | 38 +++++++++ 7 files changed, 315 insertions(+) create mode 100644 arch/arm/boot/dts/imx6ull-phytec-phycore-som.dtsi create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-ff-rdk-nand.dts create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-lc-rdk-nand.dts create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-peb-eval-01.dtsi create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin.dtsi diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 668b57c8cc57..16efd11cf20f 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -580,6 +580,9 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ull-14x14-evk.dtb \ imx6ull-colibri-eval-v3.dtb \ imx6ull-colibri-wifi-eval-v3.dtb \ + imx6ull-phytec-segin-ff-rdk-nand.dtb \ + imx6ull-phytec-segin-ff-rdk-emmc.dtb \ + imx6ull-phytec-segin-lc-rdk-nand.dtb \ imx6ulz-14x14-evk.dtb dtb-$(CONFIG_SOC_IMX7D) += \ imx7d-cl-som-imx7.dtb \ diff --git a/arch/arm/boot/dts/imx6ull-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx6ull-phytec-phycore-som.dtsi new file mode 100644 index 000000000000..56cd16e5a77f --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-phytec-phycore-som.dtsi @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2019 PHYTEC Messtechnik GmbH + * Author: Stefan Riedmueller + */ + +#include "imx6ul-phytec-phycore-som.dtsi" + +/ { + model = "PHYTEC phyCORE-i.MX6 ULL"; + compatible = "phytec,imx6ull-pcl063", "fsl,imx6ull"; +}; + +&iomuxc { + /delete-node/ gpioledssomgrp; +}; + +&iomuxc_snvs { + pinctrl_gpioleds_som: gpioledssomgrp { + fsl,pins = < + MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0x0b0b0 + >; + }; +}; diff --git a/arch/arm/boot/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts b/arch/arm/boot/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts new file mode 100644 index 000000000000..9648d4ecaf58 --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts @@ -0,0 +1,93 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2019 PHYTEC Messtechnik GmbH + * Author: Stefan Riedmueller + */ + +/dts-v1/; +#include "imx6ull.dtsi" +#include "imx6ull-phytec-phycore-som.dtsi" +#include "imx6ull-phytec-segin.dtsi" +#include "imx6ull-phytec-segin-peb-eval-01.dtsi" + +/ { + model = "PHYTEC phyBOARD-Segin i.MX6 ULL Full Featured with eMMC"; + compatible = "phytec,imx6ull-pbacd10-emmc", "phytec,imx6ull-pbacd10", + "phytec,imx6ull-pcl063","fsl,imx6ull"; +}; + +&adc1 { + status = "okay"; +}; + +&can1 { + status = "okay"; +}; + +&tlv320 { + status = "okay"; +}; + +&ecspi3 { + status = "okay"; +}; + +ðphy1 { + status = "okay"; +}; + +ðphy2 { + status = "okay"; +}; + +&fec1 { + status = "okay"; +}; + +&fec2 { + status = "okay"; +}; + +&i2c_rtc { + status = "okay"; +}; + +®_can1_en { + status = "okay"; +}; + +®_sound_1v8 { + status = "okay"; +}; + +®_sound_3v3 { + status = "okay"; +}; + +&sai2 { + status = "okay"; +}; + +&sound { + status = "okay"; +}; + +&uart5 { + status = "okay"; +}; + +&usbotg1 { + status = "okay"; +}; + +&usbotg2 { + status = "okay"; +}; + +&usdhc1 { + status = "okay"; +}; + +&usdhc2 { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6ull-phytec-segin-ff-rdk-nand.dts b/arch/arm/boot/dts/imx6ull-phytec-segin-ff-rdk-nand.dts new file mode 100644 index 000000000000..656baf846453 --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-phytec-segin-ff-rdk-nand.dts @@ -0,0 +1,93 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2019 PHYTEC Messtechnik GmbH + * Author: Stefan Riedmueller + */ + +/dts-v1/; +#include "imx6ull.dtsi" +#include "imx6ull-phytec-phycore-som.dtsi" +#include "imx6ull-phytec-segin.dtsi" +#include "imx6ull-phytec-segin-peb-eval-01.dtsi" + +/ { + model = "PHYTEC phyBOARD-Segin i.MX6 ULL Full Featured with NAND"; + compatible = "phytec,imx6ull-pbacd10-nand", "phytec,imx6ull-pbacd10", + "phytec,imx6ull-pcl063", "fsl,imx6ull"; +}; + +&adc1 { + status = "okay"; +}; + +&can1 { + status = "okay"; +}; + +&tlv320 { + status = "okay"; +}; + +&ecspi3 { + status = "okay"; +}; + +ðphy1 { + status = "okay"; +}; + +ðphy2 { + status = "okay"; +}; + +&fec1 { + status = "okay"; +}; + +&fec2 { + status = "okay"; +}; + +&gpmi { + status = "okay"; +}; + +&i2c_rtc { + status = "okay"; +}; + +®_can1_en { + status = "okay"; +}; + +®_sound_1v8 { + status = "okay"; +}; + +®_sound_3v3 { + status = "okay"; +}; + +&sai2 { + status = "okay"; +}; + +&sound { + status = "okay"; +}; + +&uart5 { + status = "okay"; +}; + +&usbotg1 { + status = "okay"; +}; + +&usbotg2 { + status = "okay"; +}; + +&usdhc1 { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6ull-phytec-segin-lc-rdk-nand.dts b/arch/arm/boot/dts/imx6ull-phytec-segin-lc-rdk-nand.dts new file mode 100644 index 000000000000..e168494e0a6d --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-phytec-segin-lc-rdk-nand.dts @@ -0,0 +1,45 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2019 PHYTEC Messtechnik GmbH + * Author: Stefan Riedmueller + */ + +/dts-v1/; +#include "imx6ull.dtsi" +#include "imx6ull-phytec-phycore-som.dtsi" +#include "imx6ull-phytec-segin.dtsi" +#include "imx6ull-phytec-segin-peb-eval-01.dtsi" + +/ { + model = "PHYTEC phyBOARD-Segin i.MX6 ULL Low Cost with NAND"; + compatible = "phytec,imx6ull-pbacd10-nand", "phytec,imx6ull-pbacd10", + "phytec,imx6ull-pcl063", "fsl,imx6ull"; +}; + +&adc1 { + status = "okay"; +}; + +ðphy1 { + status = "okay"; +}; + +&fec1 { + status = "okay"; +}; + +&gpmi { + status = "okay"; +}; + +&i2c_rtc { + status = "okay"; +}; + +&usbotg1 { + status = "okay"; +}; + +&usdhc1 { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6ull-phytec-segin-peb-eval-01.dtsi b/arch/arm/boot/dts/imx6ull-phytec-segin-peb-eval-01.dtsi new file mode 100644 index 000000000000..ff08d95a1aa2 --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-phytec-segin-peb-eval-01.dtsi @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2019 PHYTEC Messtechnik GmbH + * Author: Stefan Riedmueller + */ + +#include "imx6ul-phytec-segin-peb-eval-01.dtsi" + +&iomuxc { + /delete-node/ gpio_keysgrp; +}; + +&iomuxc_snvs { + pinctrl_gpio_keys: gpio_keysgrp { + fsl,pins = < + MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x79 + >; + }; +}; diff --git a/arch/arm/boot/dts/imx6ull-phytec-segin.dtsi b/arch/arm/boot/dts/imx6ull-phytec-segin.dtsi new file mode 100644 index 000000000000..c1595fc785f7 --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-phytec-segin.dtsi @@ -0,0 +1,38 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2019 PHYTEC Messtechnik GmbH + * Author: Stefan Riedmueller + */ + +#include "imx6ul-phytec-segin.dtsi" + +/ { + model = "PHYTEC phyBOARD-Segin i.MX6 ULL"; + compatible = "phytec,imx6ull-pbacd-10", "phytec,imx6ull-pcl063","fsl,imx6ull"; +}; + +&iomuxc { + /delete-node/ flexcan1engrp; + /delete-node/ rtcintgrp; + /delete-node/ stmpegrp; +}; + +&iomuxc_snvs { + princtrl_flexcan1_en: flexcan1engrp { + fsl,pins = < + MX6ULL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x17059 + >; + }; + + pinctrl_rtc_int: rtcintgrp { + fsl,pins = < + MX6ULL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x17059 + >; + }; + + pinctrl_stmpe: stmpegrp { + fsl,pins = < + MX6ULL_PAD_SNVS_TAMPER3__GPIO5_IO03 0x17059 + >; + }; +};