From patchwork Fri May 24 13:19:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 10959881 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 5B6CD112C for ; Fri, 24 May 2019 13:35:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4ABAA287F2 for ; Fri, 24 May 2019 13:35:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3ED3B2875F; Fri, 24 May 2019 13:35:23 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E25D7287F2 for ; Fri, 24 May 2019 13:35:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403778AbfEXNfW (ORCPT ); Fri, 24 May 2019 09:35:22 -0400 Received: from mickerik.phytec.de ([195.145.39.210]:55744 "EHLO mickerik.phytec.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391549AbfEXNfW (ORCPT ); Fri, 24 May 2019 09:35:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1558704004; x=1561296004; 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=zTue6fDgJesKsY8LkGGVfgOtIsQ8SjFxkDyJKT2pZ/U=; b=uGrKDJ9OPxKD1t15JG5I7fIzMogZ77w3LfaU1hhxxvJdAfD1t+TrMJOq9Y92fbGq fBwSMeUvOLKhsVQFBddUrpRgGAvoN3CHIctHNYDfmpv/dlRAW/8txKDT7zfWeAwn 8zFqPDnp0WfMLQ0GBN5mTSw6P/m/tLQOAs3EAiricgM=; X-AuditID: c39127d2-6d5ff70000000df6-ba-5ce7ef84c2fd Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 8A.81.03574.48FE7EC5; Fri, 24 May 2019 15:20:04 +0200 (CEST) Received: from augenblix2.phytec.de ([172.16.21.122]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2019052415200372-20933 ; Fri, 24 May 2019 15:20:03 +0200 From: Teresa Remmet To: linux-omap@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: =?utf-8?q?Beno=C3=AEt_Cousson?= , Tony Lindgren , Rob Herring , Mark Rutland , Daniel Schultz Subject: [PATCH 1/7] ARM: dts: am335x phytec boards: Fix cd-gpios active level Date: Fri, 24 May 2019 15:19:57 +0200 Message-Id: <1558704003-393769-2-git-send-email-t.remmet@phytec.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1558704003-393769-1-git-send-email-t.remmet@phytec.de> References: <1558704003-393769-1-git-send-email-t.remmet@phytec.de> X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 24.05.2019 15:20:03, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 24.05.2019 15:20:03, Serialize complete at 24.05.2019 15:20:03 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrILMWRmVeSWpSXmKPExsWyRoCBS7fl/fMYgyeH+S3uzP/LajH/yDlW i02Pr7FazF7Sz2Kx9PpFJovWvUfYLfZf8XJg91gzbw2jx7evk1g83t9oZffYtKqTzWPzknqP z5vkAtiiuGxSUnMyy1KL9O0SuDJ6H/9lKZjFWdG2axJbA+Md9i5GTg4JAROJ782PWboYuTiE BHYwSqyc+poZwrnAKHF//yNmkCo2AQ2JpytOM3UxcnCICCRI3HopBFLDLHCGUeJu/zI2kBph AT+JK38eM4LYLAKqEov+r2MCsXkFnCUWNrUyQ2yTk7h5rhPM5hRwkfh9+BkriC0EVPN0/VFW kKESAo1MEtufn4JqEJI4vfgs8wRGvgWMDKsYhXIzk7NTizKz9QoyKktSk/VSUjcxAgPu8ET1 SzsY++Z4HGIU4GBU4uFNuPw8Rog1say4MvcQowQHs5IIb+z+ZzFCvCmJlVWpRfnxRaU5qcWH GKU5WJTEeTfwloQJCaQnlqRmp6YWpBbBZJk4OKUaGP1WMdZPKm/ZPatEV9G9vGmhcvtx3Q2K RodEOJfJO54uTYu6a/1w2nzm3y4njdYUeQRtsb4Y9fRLXe6bkw4PXLZXWk9fyXZ/W+VBqdJ1 MYn/cz63NUj5vD+621nD49IF5rjKK8/WNIruvtjPpOsvrnz+Q2/Jplvd7ceCNq/W/nSjqsj6 w7KSiUosxRmJhlrMRcWJANOOLVg0AgAA Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Active level of the mmc1 cd gpio needs to be low instead of high. Fix PCM-953 and phyBOARD-WEGA. Signed-off-by: Teresa Remmet --- arch/arm/boot/dts/am335x-pcm-953.dtsi | 2 +- arch/arm/boot/dts/am335x-wega.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/am335x-pcm-953.dtsi b/arch/arm/boot/dts/am335x-pcm-953.dtsi index baceaa7bb33b..20a3d9827692 100644 --- a/arch/arm/boot/dts/am335x-pcm-953.dtsi +++ b/arch/arm/boot/dts/am335x-pcm-953.dtsi @@ -197,7 +197,7 @@ bus-width = <4>; pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; - cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; status = "okay"; }; diff --git a/arch/arm/boot/dts/am335x-wega.dtsi b/arch/arm/boot/dts/am335x-wega.dtsi index b7d28a20341f..84581fed3d06 100644 --- a/arch/arm/boot/dts/am335x-wega.dtsi +++ b/arch/arm/boot/dts/am335x-wega.dtsi @@ -157,7 +157,7 @@ bus-width = <4>; pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; - cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; status = "okay"; }; From patchwork Fri May 24 13:19:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 10959877 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 BE77516C1 for ; Fri, 24 May 2019 13:35:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD9BC2875F for ; Fri, 24 May 2019 13:35:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A16982883A; Fri, 24 May 2019 13:35:22 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A1A02875F for ; Fri, 24 May 2019 13:35:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391584AbfEXNfV (ORCPT ); Fri, 24 May 2019 09:35:21 -0400 Received: from mickerik.phytec.de ([195.145.39.210]:55746 "EHLO mickerik.phytec.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391519AbfEXNfV (ORCPT ); Fri, 24 May 2019 09:35:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1558704004; x=1561296004; 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=Sv8dItRbnhS5+Z1A8o49huaEXdoFdM+ZLa46oIqO270=; b=LKDA3EnK8eTxrvD0OPQmGv7BNtaTToL8eJH9UO355Pm6PzkYZLCLFK943MCgB9mS iKhPdg0eCSIZT0dFInTGkUwcpzgb8AAkwft2KyySm3uUA1y8ditm4M5vv/lFuqzr etLi9ZbhV632gOCb/2pjm+ToP2ZCEkrYFdzrHhAGGjM=; X-AuditID: c39127d2-6bdff70000000df6-bc-5ce7ef843bc0 Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 0B.81.03574.48FE7EC5; Fri, 24 May 2019 15:20:04 +0200 (CEST) Received: from augenblix2.phytec.de ([172.16.21.122]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2019052415200396-20934 ; Fri, 24 May 2019 15:20:03 +0200 From: Teresa Remmet To: linux-omap@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: =?utf-8?q?Beno=C3=AEt_Cousson?= , Tony Lindgren , Rob Herring , Mark Rutland , Daniel Schultz Subject: [PATCH 2/7] ARM: dts: am335x phytec boards: Remove regulator node Date: Fri, 24 May 2019 15:19:58 +0200 Message-Id: <1558704003-393769-3-git-send-email-t.remmet@phytec.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1558704003-393769-1-git-send-email-t.remmet@phytec.de> References: <1558704003-393769-1-git-send-email-t.remmet@phytec.de> X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 24.05.2019 15:20:04, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 24.05.2019 15:20:04, Serialize complete at 24.05.2019 15:20:04 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprHLMWRmVeSWpSXmKPExsWyRoCBS7fl/fMYg7nfZCzuzP/LajH/yDlW i02Pr7FazF7Sz2Kx9PpFJovWvUfYLfZf8XJg91gzbw2jx7evk1g83t9oZffYtKqTzWPzknqP z5vkAtiiuGxSUnMyy1KL9O0SuDIevTjFWNDHX/F95THGBsa9PF2MnBwSAiYSBxvfsoPYQgI7 GCV+PzbqYuQCsi8wSpw4tZQVJMEmoCHxdMVppi5GDg4RgQSJWy+FQGqYBc4wStztX8YGEhcW 8JJ43RYMUs4ioCpx6EMDC4jNK+As0XziCRvELjmJm+c6mUFsTgEXid+Hn7FC7HWWeLr+KCtE TSOTxM1PERC2kMTpxWeZJzDyLWBkWMUolJuZnJ1alJmtV5BRWZKarJeSuokRGGqHJ6pf2sHY N8fjEKMAB6MSD2/C5ecxQqyJZcWVuYcYJTiYlUR4Y/c/ixHiTUmsrEotyo8vKs1JLT7EKM3B oiTOu4G3JExIID2xJDU7NbUgtQgmy8TBKdXAyBhWz3er5cTSTXrv1dXdVVP4r16/xuWlbWV5 ky9fib0yvJ5RbBmHnOdbI72MK9WpHC5rjCT2S3DnXpzQyOS+47hToVhUxsobOeKt7Mke1lPN /0n6m9wpvBN2uIl73dQgad44Gfuri+fcnpl64lxRuVrr7jKjqEDeMNlDzfaN/Dm1eTaev5RY ijMSDbWYi4oTAVvf9PUxAgAA Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move regulators directly to the root node like most am335x boards do. Signed-off-by: Teresa Remmet --- arch/arm/boot/dts/am335x-phycore-som.dtsi | 18 +++++++----------- arch/arm/boot/dts/am335x-wega.dtsi | 16 ++++++---------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi index 23c3039c567e..f5b53d30e9a9 100644 --- a/arch/arm/boot/dts/am335x-phycore-som.dtsi +++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi @@ -30,17 +30,13 @@ reg = <0x80000000 0x10000000>; /* 256 MB */ }; - regulators { - compatible = "simple-bus"; - - vcc5v: fixedregulator0 { - compatible = "regulator-fixed"; - regulator-name = "vcc5v"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-boot-on; - regulator-always-on; - }; + vcc5v: fixedregulator0 { + compatible = "regulator-fixed"; + regulator-name = "vcc5v"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + regulator-always-on; }; }; diff --git a/arch/arm/boot/dts/am335x-wega.dtsi b/arch/arm/boot/dts/am335x-wega.dtsi index 84581fed3d06..d91ff3e99470 100644 --- a/arch/arm/boot/dts/am335x-wega.dtsi +++ b/arch/arm/boot/dts/am335x-wega.dtsi @@ -15,16 +15,12 @@ compatible = "ti,da830-evm-audio"; }; - regulators { - compatible = "simple-bus"; - - vcc3v3: fixedregulator1 { - compatible = "regulator-fixed"; - regulator-name = "vcc3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - }; + vcc3v3: fixedregulator1 { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; }; }; From patchwork Fri May 24 13:19:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 10959883 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 C6ACF16C1 for ; Fri, 24 May 2019 13:35:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5E6D2875F for ; Fri, 24 May 2019 13:35:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA317287F2; Fri, 24 May 2019 13:35:23 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5320A28879 for ; Fri, 24 May 2019 13:35:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403779AbfEXNfW (ORCPT ); Fri, 24 May 2019 09:35:22 -0400 Received: from mickerik.phytec.de ([195.145.39.210]:55740 "EHLO mickerik.phytec.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391470AbfEXNfV (ORCPT ); Fri, 24 May 2019 09:35:21 -0400 X-Greylist: delayed 915 seconds by postgrey-1.27 at vger.kernel.org; Fri, 24 May 2019 09:35:20 EDT DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1558704004; x=1561296004; 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=htBm2Z1l/RpGwgrP/iupQ5lRtnAvKDrdd+EzKAZZ6Yw=; b=N9+3u7T7Pj5rLd2ohLNxYZxqaABOrzwJYQKASBT489AjKWmu6ass7OWr/JRyuq2t 9YSxxof2JPZohr5vSjfw6UKxhiWX15sYCImWaCs7okYaFih5Ca4UfN0rGT15m8do IyDF6j5pc1gucswITNfiVQDpOtheCaIilpZdI3qiTf4=; X-AuditID: c39127d2-6bdff70000000df6-be-5ce7ef84f8e3 Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 9B.81.03574.48FE7EC5; Fri, 24 May 2019 15:20:04 +0200 (CEST) Received: from augenblix2.phytec.de ([172.16.21.122]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2019052415200419-20935 ; Fri, 24 May 2019 15:20:04 +0200 From: Teresa Remmet To: linux-omap@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: =?utf-8?q?Beno=C3=AEt_Cousson?= , Tony Lindgren , Rob Herring , Mark Rutland , Daniel Schultz Subject: [PATCH 3/7] ARM: dts: am335x-phycore-som: Add emmc node Date: Fri, 24 May 2019 15:19:59 +0200 Message-Id: <1558704003-393769-4-git-send-email-t.remmet@phytec.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1558704003-393769-1-git-send-email-t.remmet@phytec.de> References: <1558704003-393769-1-git-send-email-t.remmet@phytec.de> X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 24.05.2019 15:20:04, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 24.05.2019 15:20:04, Serialize complete at 24.05.2019 15:20:04 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLLMWRmVeSWpSXmKPExsWyRoCBS7fl/fMYg8dTtSzuzP/LajH/yDlW i02Pr7FazF7Sz2Kx9PpFJovWvUfYLfZf8XJg91gzbw2jx7evk1g83t9oZffYtKqTzWPzknqP z5vkAtiiuGxSUnMyy1KL9O0SuDLeb8gqWCxQMbthKVMDYyNfFyMnh4SAicTzSfsYQWwhgR2M EkcvG3QxcgHZFxgljsxuB0uwCWhIPF1xmqmLkYNDRCBB4tZLIZAaZoEzjBJ3+5exgdQICzhI rL05mRGkhkVAVeLflyyQMK+As8Tauf2sELvkJG6e62QGsTkFXCR+H37GCrHXWeLp+qNQNY1M Ejc/RUDYQhKnF59lnsDIt4CRYRWjUG5mcnZqUWa2XkFGZUlqsl5K6iZGYKAdnqh+aQdj3xyP Q4wCHIxKPLwJl5/HCLEmlhVX5h5ilOBgVhLhjd3/LEaINyWxsiq1KD++qDQntfgQozQHi5I4 7wbekjAhgfTEktTs1NSC1CKYLBMHp1QDo4HPCv2Sf9NsI44xczZYrbNZtSd72SX12UenaRv0 PrFc6mW+ouAu05OdZe98TEVuTuC4c2r/3Hkztq+Yekpzas4Xk+VzTNb4SOuXf95aYSmXeDxm OUfK9YiX0yqXnD1skSImnvpAvzxBPG6NonbU9Nx5S3ee4Sl46vnpqcqErJgFAveZNTfxtCix FGckGmoxFxUnAgDw53SmMAIAAA== Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel Schultz The phyCORE-AM335x EMMC modules have an EMMC populated and are based on the phyCORE-AM335x R2 SOM. Therefore, the EMMC node will be added to the phycore-som devce tree but is by default disabled. Signed-off-by: Daniel Schultz Signed-off-by: Teresa Remmet --- arch/arm/boot/dts/am335x-phycore-som.dtsi | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi index f5b53d30e9a9..2bc2265534e1 100644 --- a/arch/arm/boot/dts/am335x-phycore-som.dtsi +++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi @@ -49,6 +49,33 @@ status = "okay"; }; +/* EMMC */ +&am33xx_pinmux { + emmc_pins: pinmux_emmc_pins { + pinctrl-single,pins = < + AM33XX_PADCONF(AM335X_PIN_GPMC_CSN1, PIN_INPUT_PULLUP, MUX_MODE2) /* gpmc_csn1.mmc1_clk */ + AM33XX_PADCONF(AM335X_PIN_GPMC_CSN2, PIN_INPUT_PULLUP, MUX_MODE2) /* gpmc_csn2.mmc1_cmd */ + AM33XX_PADCONF(AM335X_PIN_GPMC_AD0, PIN_INPUT_PULLUP, MUX_MODE1) /* gpmc_ad0.mmc1_dat0 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_AD1, PIN_INPUT_PULLUP, MUX_MODE1) /* gpmc_ad1.mmc1_dat1 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_AD2, PIN_INPUT_PULLUP, MUX_MODE1) /* gpmc_ad2.mmc1_dat2 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_AD3, PIN_INPUT_PULLUP, MUX_MODE1) /* gpmc_ad3.mmc1_dat3 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_AD4, PIN_INPUT_PULLUP, MUX_MODE1) /* gpmc_ad4.mmc1_dat4 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_AD5, PIN_INPUT_PULLUP, MUX_MODE1) /* gpmc_ad5.mmc1_dat5 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_AD6, PIN_INPUT_PULLUP, MUX_MODE1) /* gpmc_ad6.mmc1_dat6 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_AD7, PIN_INPUT_PULLUP, MUX_MODE1) /* gpmc_ad7.mmc1_dat7 */ + >; + }; +}; + +&mmc2 { + pinctrl-names = "default"; + pinctrl-0 = <&emmc_pins>; + vmmc-supply = <&vmmc_reg>; + bus-width = <8>; + ti,non-removable; + status = "disabled"; +}; + /* Ethernet */ &am33xx_pinmux { ethernet0_pins: pinmux_ethernet0 { From patchwork Fri May 24 13:20:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 10959879 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 3C71876 for ; Fri, 24 May 2019 13:35:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2BC0F2875F for ; Fri, 24 May 2019 13:35:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1FFFD28879; Fri, 24 May 2019 13:35:23 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1FCB2875F for ; Fri, 24 May 2019 13:35:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403770AbfEXNfW (ORCPT ); Fri, 24 May 2019 09:35:22 -0400 Received: from mickerik.phytec.de ([195.145.39.210]:55742 "EHLO mickerik.phytec.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391550AbfEXNfV (ORCPT ); Fri, 24 May 2019 09:35:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1558704004; x=1561296004; 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=nr/MP/EJb08qxjtAA/Sazh/uEcySMwykL1EGXSLih5Q=; b=D324WY+ITrzao5BAPh+0su2b47mKq4miLYXFiVUut+wcIUvqhKzo1Nzbw+9EgYCY d2kgKo4ZuPvluSgLU7duIS1/iEWsjw1nEjBPuuWZ+1N6doMmf7x0fpSuza0zH33I 6vZWdjCUCCZ6XpRhClDcAAY+80/Ds7dCpPRMasquPlM=; X-AuditID: c39127d2-6d5ff70000000df6-bf-5ce7ef84b1a5 Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 1C.81.03574.48FE7EC5; Fri, 24 May 2019 15:20:04 +0200 (CEST) Received: from augenblix2.phytec.de ([172.16.21.122]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2019052415200443-20936 ; Fri, 24 May 2019 15:20:04 +0200 From: Teresa Remmet To: linux-omap@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: =?utf-8?q?Beno=C3=AEt_Cousson?= , Tony Lindgren , Rob Herring , Mark Rutland , Daniel Schultz Subject: [PATCH 4/7] ARM: dts: am335x-phycore-som: Enable gpmc node in dts files Date: Fri, 24 May 2019 15:20:00 +0200 Message-Id: <1558704003-393769-5-git-send-email-t.remmet@phytec.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1558704003-393769-1-git-send-email-t.remmet@phytec.de> References: <1558704003-393769-1-git-send-email-t.remmet@phytec.de> X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 24.05.2019 15:20:04, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 24.05.2019 15:20:04, Serialize complete at 24.05.2019 15:20:04 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprPLMWRmVeSWpSXmKPExsWyRoCBS7fl/fMYgz1brSzuzP/LajH/yDlW i02Pr7FazF7Sz2Kx9PpFJovWvUfYLfZf8XJg91gzbw2jx7evk1g83t9oZffYtKqTzWPzknqP z5vkAtiiuGxSUnMyy1KL9O0SuDJmHnAteMFTsa23k62B8SFXFyMnh4SAicTuDROYuxi5OIQE djBK3FjTBeVcYJQ4sXUzK0gVm4CGxNMVp5m6GDk4RAQSJG69FAKpYRY4wyhxt38ZG0iNsECA xI77P1lAbBYBVYlbLzaB2bwCzhLfzn9hh9gmJ3HzXCcziM0p4CLx+/AzsPlCQDVP1x9lhahp ZJK4+SkCwhaSOL34LPMERr4FjAyrGIVyM5OzU4sys/UKMipLUpP1UlI3MQKD7fBE9Us7GPvm eBxiFOBgVOLhTbj8PEaINbGsuDL3EKMEB7OSCG/s/mcxQrwpiZVVqUX58UWlOanFhxilOViU xHk38JaECQmkJ5akZqemFqQWwWSZODilGhhDXz9vm6B53iqzTt5Nafn1gmBjOR6e5KUzAsqz FzzhMVF9cc7mVhiztsvt9tkLtx/s4FsxeX/ronO2vtLNNm3xNkd5qx95i54zEHLZVJsUuDp5 weSQB5Kzw3I9L+RN/D6/g93CddPBTTGH7rvdv/bgS9Lkoo0KptNe1V2XLXD5dyiI3fSmSbsS S3FGoqEWc1FxIgDJTD8lMgIAAA== Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As nand flash is not always the primary storage device any more disable it in the phycore-som include file. Enable it the device tree files where it is populated. Signed-off-by: Teresa Remmet --- arch/arm/boot/dts/am335x-phycore-rdk.dts | 4 ++++ arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 +- arch/arm/boot/dts/am335x-wega-rdk.dts | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/am335x-phycore-rdk.dts b/arch/arm/boot/dts/am335x-phycore-rdk.dts index 305f0b35d6ea..d674d91e18c7 100644 --- a/arch/arm/boot/dts/am335x-phycore-rdk.dts +++ b/arch/arm/boot/dts/am335x-phycore-rdk.dts @@ -13,6 +13,10 @@ #include "am335x-pcm-953.dtsi" /* SoM */ +&gpmc { + status = "okay"; +}; + &i2c_eeprom { status = "okay"; }; diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi index 2bc2265534e1..adf04dbefe28 100644 --- a/arch/arm/boot/dts/am335x-phycore-som.dtsi +++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi @@ -190,7 +190,7 @@ }; &gpmc { - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&nandflash_pins>; ranges = <0 0 0x08000000 0x1000000>; /* CS0: NAND */ diff --git a/arch/arm/boot/dts/am335x-wega-rdk.dts b/arch/arm/boot/dts/am335x-wega-rdk.dts index 6431b7db8109..fd8a844ba780 100644 --- a/arch/arm/boot/dts/am335x-wega-rdk.dts +++ b/arch/arm/boot/dts/am335x-wega-rdk.dts @@ -13,6 +13,10 @@ #include "am335x-wega.dtsi" /* SoM */ +&gpmc { + status = "okay"; +}; + &i2c_eeprom { status = "okay"; }; From patchwork Fri May 24 13:20:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 10959885 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 2D719112C for ; Fri, 24 May 2019 13:35:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CCA3287F2 for ; Fri, 24 May 2019 13:35:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10CFC2883A; Fri, 24 May 2019 13:35:24 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB9CB28879 for ; Fri, 24 May 2019 13:35:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403801AbfEXNfX (ORCPT ); Fri, 24 May 2019 09:35:23 -0400 Received: from mickerik.phytec.de ([195.145.39.210]:55740 "EHLO mickerik.phytec.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403768AbfEXNfW (ORCPT ); Fri, 24 May 2019 09:35:22 -0400 X-Greylist: delayed 915 seconds by postgrey-1.27 at vger.kernel.org; Fri, 24 May 2019 09:35:20 EDT DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1558704005; x=1561296005; 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=0AvxtVk/ZzZnCeIX1qspRxwNNu7VhFGWSGUeAzIxEL4=; b=Co1iYzZm0TpxV1KJAuCFqtEmEgVi7xxms+RI96yeEZBfWrDYOf2kClRtZ1CpdCyI lq9rNrTIYVU9+gM2N2KzTM+tQ4FxS9iQciVHNq2b+vgE0+9GtIhTu30YRlq1+geu 6aMCgYp+LAYKljEUfWGiBqX2Dn4wfC+Vj/ObZ+om64I=; X-AuditID: c39127d2-6bdff70000000df6-c0-5ce7ef85f812 Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id AC.81.03574.58FE7EC5; Fri, 24 May 2019 15:20:05 +0200 (CEST) Received: from augenblix2.phytec.de ([172.16.21.122]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2019052415200466-20937 ; Fri, 24 May 2019 15:20:04 +0200 From: Teresa Remmet To: linux-omap@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: =?utf-8?q?Beno=C3=AEt_Cousson?= , Tony Lindgren , Rob Herring , Mark Rutland , Daniel Schultz Subject: [PATCH 5/7] ARM: dts: am335x-pcm-953: Update user led names Date: Fri, 24 May 2019 15:20:01 +0200 Message-Id: <1558704003-393769-6-git-send-email-t.remmet@phytec.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1558704003-393769-1-git-send-email-t.remmet@phytec.de> References: <1558704003-393769-1-git-send-email-t.remmet@phytec.de> X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 24.05.2019 15:20:04, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 24.05.2019 15:20:05, Serialize complete at 24.05.2019 15:20:05 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprPLMWRmVeSWpSXmKPExsWyRoCBS7f1/fMYg8VLBC3uzP/LajH/yDlW i02Pr7FazF7Sz2Kx9PpFJovWvUfYLfZf8XJg91gzbw2jx7evk1g83t9oZffYtKqTzWPzknqP z5vkAtiiuGxSUnMyy1KL9O0SuDLWrn3CWPCTreLB/cNsDYwnWLsYOTkkBEwkFk7uYe5i5OIQ EtjBKPH53gV2kISQwAVGiRNt1iA2m4CGxNMVp5m6GDk4RAQSJG69FAKpZxY4wyhxt38ZG0iN sICLxOML25lBbBYBVYltd/aB2bwCzhL/br9nhFgmJ3HzXCdYnBOo/vfhZ6wQu5wlnq4/CnVQ I5PE+o08ELaQxOnFZ5knMPItYGRYxSiUm5mcnVqUma1XkFFZkpqsl5K6iREYbIcnql/awdg3 x+MQowAHoxIPb8Ll5zFCrIllxZW5hxglOJiVRHhj9z+LEeJNSaysSi3Kjy8qzUktPsQozcGi JM67gbckTEggPbEkNTs1tSC1CCbLxMEp1cC48bx8p2KC4PZP97R9VaSjl7z+VaOvWX611+JI 6vQizQYDG1XJ6yKl15mq6+eFFzHuzSuQCJuQINf1lz3083n1cD/eEF+FyZpFW+LmczBuWpH8 5bSh6VYbDtbk14ptyaEV0ia9bLf6gxbNOSw5L/IV95/mpPJPE4+ul/gjUf/dvf1HVJVDoBJL cUaioRZzUXEiANii4XcyAgAA Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Rename user led nodes to match the phytec user leds name scheme. Signed-off-by: Teresa Remmet --- arch/arm/boot/dts/am335x-pcm-953.dtsi | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/am335x-pcm-953.dtsi b/arch/arm/boot/dts/am335x-pcm-953.dtsi index 20a3d9827692..70fb4a15cad9 100644 --- a/arch/arm/boot/dts/am335x-pcm-953.dtsi +++ b/arch/arm/boot/dts/am335x-pcm-953.dtsi @@ -39,15 +39,13 @@ pinctrl-names = "default"; pinctrl-0 = <&user_leds_pins>; - green { - label = "green:user"; + user-led0 { gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>; linux,default-trigger = "gpio"; default-state = "on"; }; - yellow { - label = "yellow:user"; + user-led1 { gpios = <&gpio1 31 GPIO_ACTIVE_LOW>; linux,default-trigger = "gpio"; default-state = "on"; From patchwork Fri May 24 13:20:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 10959887 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 6798317E0 for ; Fri, 24 May 2019 13:35:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5538F2875F for ; Fri, 24 May 2019 13:35:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 496042883A; Fri, 24 May 2019 13:35:24 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EEBC72875F for ; Fri, 24 May 2019 13:35:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403800AbfEXNfX (ORCPT ); Fri, 24 May 2019 09:35:23 -0400 Received: from mickerik.phytec.de ([195.145.39.210]:55744 "EHLO mickerik.phytec.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403772AbfEXNfW (ORCPT ); Fri, 24 May 2019 09:35:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1558704005; x=1561296005; 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=NYdOw3xLCcJk9B4HDUN0mOmZh9/CEB4GcXXSIRBzQrg=; b=tzEzrm9I1zFijt2/5HBQjaeTgMuXFxomAsY6y3pgfVEycq0AjnSTu4Vxn61Fi5Tc eDFhNrsCq3wX58Rk8rc7AtwLpwycrIh4IDrHbbFlPQs+VlVHD156grhCGydORvcI 6h7HFjlingF7S+tnIl/iOOLmw8+hFG7eu3UgrcxANtE=; X-AuditID: c39127d2-6d5ff70000000df6-c1-5ce7ef859429 Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 2D.81.03574.58FE7EC5; Fri, 24 May 2019 15:20:05 +0200 (CEST) Received: from augenblix2.phytec.de ([172.16.21.122]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2019052415200491-20938 ; Fri, 24 May 2019 15:20:04 +0200 From: Teresa Remmet To: linux-omap@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: =?utf-8?q?Beno=C3=AEt_Cousson?= , Tony Lindgren , Rob Herring , Mark Rutland , Daniel Schultz Subject: [PATCH 6/7] ARM: dts: am335x-pcm-953: Remove eth phy delay Date: Fri, 24 May 2019 15:20:02 +0200 Message-Id: <1558704003-393769-7-git-send-email-t.remmet@phytec.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1558704003-393769-1-git-send-email-t.remmet@phytec.de> References: <1558704003-393769-1-git-send-email-t.remmet@phytec.de> MIME-Version: 1.0 X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 24.05.2019 15:20:05, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 24.05.2019 15:20:05 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrOLMWRmVeSWpSXmKPExsWyRoCBS7f1/fMYg59r5C3uzP/LajH/yDlW i02Pr7FazF7Sz2Kx9PpFJovWvUfYLfZf8XJg91gzbw2jx7evk1g83t9oZffYtKqTzWPzknqP z5vkAtiiuGxSUnMyy1KL9O0SuDLm/z7HVrCXs2Lj7B7WBsYb7F2MnBwSAiYS23Z/Zuxi5OIQ EtjBKLH+fw87hHOBUeLprOcsIFVsAhoST1ecZupi5OAQEUiQuPVSCKSGWeAMo8Td/mVsIDXC As4SbdfegNksAqoSL09eBtvACxRvP38BapucxM1zncwgNqeAi8Tvw89YQWwhoJqn64+yQtQL Spyc+YQFZIGEwBVGif/X/zJCNAtJnF58lhnkCGYBdYn184RAwswC2hLLFr5mnsAoOAtJ+yyE qllIqhYwMq9iFMrNTM5OLcrM1ivIqCxJTdZLSd3ECAz+wxPVL+1g7JvjcYhRgINRiYc34fLz GCHWxLLiytxDjBIczEoivLH7n8UI8aYkVlalFuXHF5XmpBYfYpTmYFES593AWxImJJCeWJKa nZpakFoEk2Xi4JRqYDScHZWoXLPSq//ijd5XPdIfGLZcVDkkfeztTemmvyrHGlbXrZ36rcM8 /OGJQvt1YTy1uvvn2jHnbmPRWSxrxv9J0EjQyrzg4RkJ0RWqDcINu5+tlTTs4Npw+f1FX+61 AfI75J/x5/t/sJm59Pj5/ZL9rku+Tv/VqsR8542B7UIGnwOhj5jn1CuxFGckGmoxFxUnAgDg VvFIegIAAA== Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Default values fit better than these historical settings. Hardware layout had been adapted accordingly already in alpha stage. They did not cause problems for a long time. Removed values now. Signed-off-by: Teresa Remmet --- arch/arm/boot/dts/am335x-pcm-953.dtsi | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/arch/arm/boot/dts/am335x-pcm-953.dtsi b/arch/arm/boot/dts/am335x-pcm-953.dtsi index 70fb4a15cad9..dd78db76c877 100644 --- a/arch/arm/boot/dts/am335x-pcm-953.dtsi +++ b/arch/arm/boot/dts/am335x-pcm-953.dtsi @@ -136,22 +136,6 @@ &davinci_mdio { phy1: ethernet-phy@2 { reg = <2>; - - /* Register 260 (104h) – RGMII Clock and Control Pad Skew */ - rxc-skew-ps = <1400>; - rxdv-skew-ps = <0>; - txc-skew-ps = <1400>; - txen-skew-ps = <0>; - /* Register 261 (105h) – RGMII RX Data Pad Skew */ - rxd3-skew-ps = <0>; - rxd2-skew-ps = <0>; - rxd1-skew-ps = <0>; - rxd0-skew-ps = <0>; - /* Register 262 (106h) – RGMII TX Data Pad Skew */ - txd3-skew-ps = <0>; - txd2-skew-ps = <0>; - txd1-skew-ps = <0>; - txd0-skew-ps = <0>; }; }; From patchwork Fri May 24 13:20:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 10959889 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 1AE5D112C for ; Fri, 24 May 2019 13:35:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08CF3287F2 for ; Fri, 24 May 2019 13:35:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F168528879; Fri, 24 May 2019 13:35:25 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 492BC287F2 for ; Fri, 24 May 2019 13:35:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403767AbfEXNfY (ORCPT ); Fri, 24 May 2019 09:35:24 -0400 Received: from mickerik.phytec.de ([195.145.39.210]:55740 "EHLO mickerik.phytec.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403784AbfEXNfX (ORCPT ); Fri, 24 May 2019 09:35:23 -0400 X-Greylist: delayed 915 seconds by postgrey-1.27 at vger.kernel.org; Fri, 24 May 2019 09:35:20 EDT DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1558704005; x=1561296005; 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=hYEpleMpxOeYevHr5TccStgbxzNS31ATYfBTOJaAuuM=; b=sXbf5EW7KnMqMqN44qaa6bGHIbhb8OmdY+GqsyCtDxaVJNBoUIOt54WcaWZ2fuma rQ9yjoqkDw0+9EdzDTtrLTCVb/YQ/LCUEbll+EJDu5iXMm1bmwjJebu8kLWLd8PH Eld+yBXRZbS/s3h3nYA2uE8MBVtiOeuHX9JcEl/msJA=; X-AuditID: c39127d2-6d5ff70000000df6-c2-5ce7ef8566df Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id BD.81.03574.58FE7EC5; Fri, 24 May 2019 15:20:05 +0200 (CEST) Received: from augenblix2.phytec.de ([172.16.21.122]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2019052415200514-20939 ; Fri, 24 May 2019 15:20:05 +0200 From: Teresa Remmet To: linux-omap@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: =?utf-8?q?Beno=C3=AEt_Cousson?= , Tony Lindgren , Rob Herring , Mark Rutland , Daniel Schultz Subject: [PATCH 7/7] ARM: dts: Add support for phyBOARD-REGOR-AM335x Date: Fri, 24 May 2019 15:20:03 +0200 Message-Id: <1558704003-393769-8-git-send-email-t.remmet@phytec.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1558704003-393769-1-git-send-email-t.remmet@phytec.de> References: <1558704003-393769-1-git-send-email-t.remmet@phytec.de> X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 24.05.2019 15:20:05, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 24.05.2019 15:20:05, Serialize complete at 24.05.2019 15:20:05 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprPLMWRmVeSWpSXmKPExsWyRoCBS7f1/fMYg0nNmhZ35v9ltZh/5Byr xabH11gtZi/pZ7FYev0ik0Xr3iPsFvuveDmwe6yZt4bR49vXSSwe72+0sntsWtXJ5rF5Sb3H 501yAWxRXDYpqTmZZalF+nYJXBmfn7xkKljiUTFtwnPWBsblNl2MHBwSAiYSq/+kdzFycQgJ 7GCUOHR1OyOEc4FRomfiSpYuRk4ONgENiacrTjOBNIgIJEjceikEUsMscIZR4m7/MjaQuLCA i8SE3yYg5SwCqhK3Jq1hArF5BZwlXj5uZgWxJQTkJG6e62QGsTmByn8ffgYWFwKqebr+KCvI TAmBRiaJq1ees0M0CEmcXnyWeQIj3wJGhlWMQrmZydmpRZnZegUZlSWpyXopqZsYgcF2eKL6 pR2MfXM8DjEKcDAq8fAmXH4eI8SaWFZcmXuIUYKDWUmEN3b/sxgh3pTEyqrUovz4otKc1OJD jNIcLErivBt4S8KEBNITS1KzU1MLUotgskwcnFINjPuE31i+2hSy+dQ39TcvElSEHP2Fc3oO aXLYia9vnLcxQ651idkbY9alH3rf/4nXC7FJ/3/4W+OPa1Hnr9s9THMtulzV6va498VXg6bF 2+O0UzMeVrn5flpSeLnu5MTgxerixQ9nMNUIJd/ILMkqOh2T5vz4xPkV7Obz9h2wkdZPOuO5 SffEbiWW4oxEQy3mouJEALL8OkYyAgAA Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Adding support for phyBOARD-REGOR-AM335x: - CAN - UART0 / UART2 - RS485 - USB device - i2c RTC - SD - ethernet0 RMII - ethernet1 MII - Digital I/Os Signed-off-by: Teresa Remmet --- .../devicetree/bindings/arm/omap/omap.txt | 3 + arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/am335x-regor-rdk.dts | 24 +++ arch/arm/boot/dts/am335x-regor.dtsi | 223 +++++++++++++++++++++ 4 files changed, 251 insertions(+) create mode 100644 arch/arm/boot/dts/am335x-regor-rdk.dts create mode 100644 arch/arm/boot/dts/am335x-regor.dtsi diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt index 1c1e48fd94b5..b301f753ed2c 100644 --- a/Documentation/devicetree/bindings/arm/omap/omap.txt +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt @@ -160,6 +160,9 @@ Boards: - AM335X phyCORE-AM335x: Development kit compatible = "phytec,am335x-pcm-953", "phytec,am335x-phycore-som", "ti,am33xx" +- AM335x phyBOARD-REGOR: Single Board Computer + compatible = "phytec,am335x-regor", "phytec,am335x-phycore-som", "ti,am33xx" + - AM335X UC-8100-ME-T: Communication-centric industrial computing platform compatible = "moxa,uc-8100-me-t", "ti,am33xx"; diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index dab2914fa293..ca42400dc5e8 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -748,6 +748,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \ am335x-pepper.dtb \ am335x-phycore-rdk.dtb \ am335x-pocketbeagle.dtb \ + am335x-regor-rdk.dtb \ am335x-sancloud-bbe.dtb \ am335x-shc.dtb \ am335x-sbc-t335.dtb \ diff --git a/arch/arm/boot/dts/am335x-regor-rdk.dts b/arch/arm/boot/dts/am335x-regor-rdk.dts new file mode 100644 index 000000000000..66a1360b83d5 --- /dev/null +++ b/arch/arm/boot/dts/am335x-regor-rdk.dts @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2019 Phytec Messtechnik GmbH + * Author: Teresa Remmet + * + */ + +/dts-v1/; + +#include "am335x-phycore-som.dtsi" +#include "am335x-regor.dtsi" + +/* SoM */ +&gpmc { + status = "okay"; +}; + +&i2c_eeprom { + status = "okay"; +}; + +&serial_flash { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/am335x-regor.dtsi b/arch/arm/boot/dts/am335x-regor.dtsi new file mode 100644 index 000000000000..5aff02a95766 --- /dev/null +++ b/arch/arm/boot/dts/am335x-regor.dtsi @@ -0,0 +1,223 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2019 Phytec Messtechnik GmbH + * Author: Teresa Remmet + * + */ + +/ { + model = "Phytec AM335x phyBOARD-REGOR"; + compatible = "phytec,am335x-regor", "phytec,am335x-phycore-som", "ti,am33xx"; + + vcc3v3: fixedregulator@1 { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + }; + + /* User IO */ + user_leds: user_leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&user_leds_pins>; + + run_stop-led { + gpios = <&gpio2 22 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "gpio"; + default-state = "off"; + }; + + error-led { + gpios = <&gpio3 15 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "gpio"; + default-state = "off"; + }; + }; +}; + +/* User Leds */ +&am33xx_pinmux { + user_leds_pins: pinmux_user_leds { + pinctrl-single,pins = < + AM33XX_PADCONF(AM335X_PIN_LCD_VSYNC, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* lcd_hsync.gpio2_22 */ + AM33XX_PADCONF(AM335X_PIN_MCASP0_FSX, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* mcasp0_fsx.gpio3_15 */ + >; + }; +}; + +/* CAN Busses */ +&am33xx_pinmux { + dcan1_pins: pinmux_dcan1 { + pinctrl-single,pins = < + AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT_PULLUP, MUX_MODE2) /* uart0_ctsn.d_can1_tx */ + AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_INPUT_PULLUP, MUX_MODE2) /* uart0_rtsn.d_can1_rx */ + >; + }; +}; + +&dcan1 { + pinctrl-names = "default"; + pinctrl-0 = <&dcan1_pins>; + status = "okay"; +}; + +/* Ethernet */ +&am33xx_pinmux { + ethernet1_pins: pinmux_ethernet1 { + pinctrl-single,pins = < + AM33XX_PADCONF(AM335X_PIN_GPMC_A0, PIN_OUTPUT, MUX_MODE1) /* gpmc_a0.mii2_txen */ + AM33XX_PADCONF(AM335X_PIN_GPMC_A1, PIN_INPUT_PULLDOWN, MUX_MODE1) /* gpmc_a1.mii2_rxdv */ + AM33XX_PADCONF(AM335X_PIN_GPMC_A2, PIN_OUTPUT, MUX_MODE1) /* gpmc_a2.mii2_txd3 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_A3, PIN_OUTPUT, MUX_MODE1) /* gpmc_a3.mii2_txd2 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_A4, PIN_OUTPUT, MUX_MODE1) /* gpmc_a4.mii2_txd1 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_A5, PIN_OUTPUT, MUX_MODE1) /* gpmc_a5.mii2_txd0 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_A6, PIN_INPUT_PULLDOWN, MUX_MODE1) /* gpmc_a6.mii2_txclk */ + AM33XX_PADCONF(AM335X_PIN_GPMC_A7, PIN_INPUT_PULLDOWN, MUX_MODE1) /* gpmc_a7.mii2_rxclk */ + AM33XX_PADCONF(AM335X_PIN_GPMC_A8, PIN_INPUT_PULLDOWN, MUX_MODE1) /* gpmc_a8.mii2_rxd3 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_A9, PIN_INPUT_PULLDOWN, MUX_MODE1) /* gpmc_a9.mii2_rxd2 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_A10, PIN_INPUT_PULLDOWN, MUX_MODE1) /* gpmc_a10.mii2_rxd1 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_A11, PIN_INPUT_PULLDOWN, MUX_MODE1) /* gpmc_a11.mii2_rxd0 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_WPN, PIN_INPUT_PULLDOWN, MUX_MODE1) /* gpmc_wpn.mii2_rxerr */ + AM33XX_PADCONF(AM335X_PIN_GPMC_BEN1, PIN_INPUT_PULLDOWN, MUX_MODE1) /* gpmc_ben1.mii2_col */ + >; + }; +}; + +&cpsw_emac1 { + phy-handle = <&phy1>; + phy-mode = "mii"; + dual_emac_res_vlan = <2>; +}; + +&davinci_mdio { + phy1: ethernet-phy@1 { + reg = <1>; + }; +}; + +&mac { + slaves = <2>; + pinctrl-names = "default"; + pinctrl-0 = <ðernet0_pins ðernet1_pins>; + dual_emac = <1>; +}; + +/* GPIOs */ +&am33xx_pinmux { + pinctrl-names = "default"; + pinctrl-0 = <&user_gpios_pins>; + + user_gpios_pins: pinmux_user_gpios { + pinctrl-single,pins = < + /* DIGIN 1-4 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_AD11, PIN_INPUT, MUX_MODE7) /* gpmc_ad11.gpio0_27 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_AD10, PIN_INPUT, MUX_MODE7) /* gpmc_ad10.gpio0_26 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_AD9, PIN_INPUT, MUX_MODE7) /* gpmc_ad9.gpio0_23 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_AD8, PIN_INPUT, MUX_MODE7) /* gpmc_ad8.gpio0_22 */ + /* DIGOUT 1-4 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_AD15, PIN_OUTPUT, MUX_MODE7) /* gpmc_ad15.gpio1_15 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_AD14, PIN_OUTPUT, MUX_MODE7) /* gpmc_ad14.gpio1_14 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_AD13, PIN_OUTPUT, MUX_MODE7) /* gpmc_ad13.gpio1_13 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_AD12, PIN_OUTPUT, MUX_MODE7) /* gpmc_ad12.gpio1_12 */ + >; + }; +}; + +/* MMC */ +&am33xx_pinmux { + mmc1_pins: pinmux_mmc1 { + pinctrl-single,pins = < + AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLUP, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_MMC0_DAT1, PIN_INPUT_PULLUP, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_MMC0_DAT0, PIN_INPUT_PULLUP, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_MMC0_CLK, PIN_INPUT_PULLUP, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_MMC0_CMD, PIN_INPUT_PULLUP, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_SPI0_CS1, PIN_INPUT_PULLUP, MUX_MODE7) /* spi0_cs1.mmc0_sdcd */ + >; + }; +}; + +&mmc1 { + vmmc-supply = <&vcc3v3>; + bus-width = <4>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins>; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; + status = "okay"; +}; + +/* RTC */ +&i2c_rtc { + status = "okay"; +}; + +/* UARTs */ +&am33xx_pinmux { + uart0_pins: pinmux_uart0 { + pinctrl-single,pins = < + AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0) + >; + }; + + uart2_pins: pinmux_uart2 { + pinctrl-single,pins = < + AM33XX_PADCONF(AM335X_PIN_MII1_TX_CLK, PIN_INPUT_PULLUP, MUX_MODE1) /* mii1_tx_clk.uart2_rxd */ + AM33XX_PADCONF(AM335X_PIN_MII1_RX_CLK, PIN_OUTPUT_PULLDOWN, MUX_MODE1) /* mii1_rx_clk.uart2_txd */ + >; + }; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins>; + status = "okay"; +}; + +&uart2 { + pinctrl-names = "default"; + pinctrl-0 = <&uart2_pins>; + status = "okay"; +}; + +/* RS485 - UART1 */ +&am33xx_pinmux { + uart1_rs485_pins: pinmux_uart1_rs485_pins { + pinctrl-single,pins = < + AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT_PULLUP, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0) + AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_OUTPUT_PULLUP, MUX_MODE0) + >; + }; +}; + +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&uart1_rs485_pins>; + status = "okay"; + linux,rs485-enabled-at-boot-time; +}; + +/* USB */ +&cppi41dma { + status = "okay"; +}; + +&usb_ctrl_mod { + status = "okay"; +}; + +&usb { + status = "okay"; +}; + +&usb0 { + status = "okay"; +}; + +&usb0_phy { + status = "okay"; +};