From patchwork Wed Jul 7 12:57:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 1501718 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.a=rsa-sha256 header.s=a4 header.b=DZ9hkR82; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GKfcT5Npfz9t0k for ; Wed, 7 Jul 2021 22:58:33 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7D11482DF5; Wed, 7 Jul 2021 14:58:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.b="DZ9hkR82"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 200A682E2B; Wed, 7 Jul 2021 14:58:12 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mickerik.phytec.de (mickerik.phytec.de [195.145.39.210]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1D4CE82BD9 for ; Wed, 7 Jul 2021 14:58:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=t.remmet@phytec.de DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a4; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1625662685; x=1628254685; 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=vPZiI3Ey+1PrOQdWPOp2QAURC7Mk1T248a+39GkyPbs=; b=DZ9hkR827PhKMv4B1oJaWwkx1YVFXKZ7PptQICUNgs5isi+gNZ35KKMMt8aqnkLB Kqx6n1zcH6yxc533drqiabpdZkTfC+sMucAJPQYQHgbf19znmV4CAL9Zwc1reY4I CB9GZQrKN9X+3uQlH8noNxJ216gk86qmoHD1KOHRCX4=; X-AuditID: c39127d2-1e4f970000001daf-f1-60e5a4dc644b Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 8A.71.07599.CD4A5E06; Wed, 7 Jul 2021 14:58:04 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070714580463-1108500 ; Wed, 7 Jul 2021 14:58:04 +0200 From: Teresa Remmet To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , "NXP i . MX U-Boot Team" , Peng Fan , Jagan Teki , Heiko Schocher Subject: [PATCH v3 1/9] arm: dts: imx8mp: Resync imx8mp device tree include Date: Wed, 7 Jul 2021 12:57:56 +0000 Message-Id: <20210707125804.3010652-2-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210707125804.3010652-1-t.remmet@phytec.de> References: <20210707125804.3010652-1-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 07.07.2021 14:58:04, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 07.07.2021 14:58:04 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHLMWRmVeSWpSXmKPExsWyRoCBS/fOkqcJBj2vbCweXvW32HHnPrPF l00T2Cx+rPrCatF+ysfi7d5Odospj9ezO7B7rP14n9Vj3qwTLB47Z91l9zh7Zwejx8Z3O5gC WKO4bFJSczLLUov07RK4Ms62GxUssa74+mszSwPjTb0uRk4OCQETiRUfb7N0MXJxCAlsY5SY tXkOK4RzgVHi2qpORpAqNgENiacrTjOB2CICEhK/+q8yghQxC1xnlJi8/gRYQljAW+LcuUcs IDaLgIrE67XPgGwODl4BS4m7D7QgtslLzLz0nR3E5hSwkth74h6YLQRUcnP6B1YQm1dAUOLk zCdgF0kIXGGU+LNtHztEs5DE6cVnmUFsZgFtiWULXzNPYBSYhaRnFpLUAkamVYxCuZnJ2alF mdl6BRmVJanJeimpmxiBYXx4ovqlHYx9czwOMTJxMB5ilOBgVhLhZXR4miDEm5JYWZValB9f VJqTWnyIUZqDRUmcdwNvSZiQQHpiSWp2ampBahFMlomDU6qBsav+Jf99/rmKCyJ22m941BN1 aNu9wvM/Ba8K1j664dL8kevywUS1VfkLAv7MzKwteJpk6s1UncBWxbJkc+it0sz1C1UrHF+K BrDPDbDdXq+a0+Lx/f554Yd2R9Oa1z15XS3Xupdp6ZvFcvffTP12KaBbs/fg94UlL2/zRc07 5LP0+Hnjwxzbm5VYijMSDbWYi4oTARxoHmtRAgAA X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Sync imx8mp include with kernel commit: d1689cd3c0f4 ("arm64: dts: imx8mp: Use the correct name for child node "snps, dwc3"") Signed-off-by: Teresa Remmet Reviewed-by: Fabio Estevam Reviewed-by: Heiko Schocher --- No changes in v2 and v3. arch/arm/dts/imx8mp.dtsi | 146 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 141 insertions(+), 5 deletions(-) diff --git a/arch/arm/dts/imx8mp.dtsi b/arch/arm/dts/imx8mp.dtsi index ecccfbb4f5ad..c2d51a46cb3c 100644 --- a/arch/arm/dts/imx8mp.dtsi +++ b/arch/arm/dts/imx8mp.dtsi @@ -18,6 +18,7 @@ aliases { ethernet0 = &fec; + ethernet1 = &eqos; gpio0 = &gpio1; gpio1 = &gpio2; gpio2 = &gpio3; @@ -218,10 +219,12 @@ }; soc@0 { - compatible = "simple-bus"; + compatible = "fsl,imx8mp-soc", "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x0 0x0 0x3e000000>; + nvmem-cells = <&imx8mp_uid>; + nvmem-cell-names = "soc_unique_id"; aips1: bus@30000000 { compatible = "fsl,aips-bus", "simple-bus"; @@ -266,7 +269,7 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; - gpio-ranges = <&iomuxc 0 56 26>, <&iomuxc 0 144 4>; + gpio-ranges = <&iomuxc 0 56 26>, <&iomuxc 26 144 4>; }; gpio4: gpio@30230000 { @@ -310,6 +313,22 @@ status = "disabled"; }; + wdog2: watchdog@30290000 { + compatible = "fsl,imx8mp-wdt", "fsl,imx21-wdt"; + reg = <0x30290000 0x10000>; + interrupts = ; + clocks = <&clk IMX8MP_CLK_WDOG2_ROOT>; + status = "disabled"; + }; + + wdog3: watchdog@302a0000 { + compatible = "fsl,imx8mp-wdt", "fsl,imx21-wdt"; + reg = <0x302a0000 0x10000>; + interrupts = ; + clocks = <&clk IMX8MP_CLK_WDOG3_ROOT>; + status = "disabled"; + }; + iomuxc: pinctrl@30330000 { compatible = "fsl,imx8mp-iomuxc"; reg = <0x30330000 0x10000>; @@ -328,9 +347,17 @@ #address-cells = <1>; #size-cells = <1>; + imx8mp_uid: unique-id@420 { + reg = <0x8 0x8>; + }; + cpu_speed_grade: speed-grade@10 { reg = <0x10 4>; }; + + eth_mac1: mac-address@90 { + reg = <0x90 6>; + }; }; anatop: anatop@30360000 { @@ -762,13 +789,40 @@ assigned-clocks = <&clk IMX8MP_CLK_ENET_AXI>, <&clk IMX8MP_CLK_ENET_TIMER>, <&clk IMX8MP_CLK_ENET_REF>, - <&clk IMX8MP_CLK_ENET_TIMER>; + <&clk IMX8MP_CLK_ENET_PHY_REF>; assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_266M>, <&clk IMX8MP_SYS_PLL2_100M>, - <&clk IMX8MP_SYS_PLL2_125M>; - assigned-clock-rates = <0>, <0>, <125000000>, <100000000>; + <&clk IMX8MP_SYS_PLL2_125M>, + <&clk IMX8MP_SYS_PLL2_50M>; + assigned-clock-rates = <0>, <100000000>, <125000000>, <0>; fsl,num-tx-queues = <3>; fsl,num-rx-queues = <3>; + nvmem-cells = <ð_mac1>; + nvmem-cell-names = "mac-address"; + fsl,stop-mode = <&gpr 0x10 3>; + nvmem_macaddr_swap; + status = "disabled"; + }; + + eqos: ethernet@30bf0000 { + compatible = "nxp,imx8mp-dwmac-eqos", "snps,dwmac-5.10a"; + reg = <0x30bf0000 0x10000>; + interrupts = , + ; + interrupt-names = "eth_wake_irq", "macirq"; + clocks = <&clk IMX8MP_CLK_ENET_QOS_ROOT>, + <&clk IMX8MP_CLK_QOS_ENET_ROOT>, + <&clk IMX8MP_CLK_ENET_QOS_TIMER>, + <&clk IMX8MP_CLK_ENET_QOS>; + clock-names = "stmmaceth", "pclk", "ptp_ref", "tx"; + assigned-clocks = <&clk IMX8MP_CLK_ENET_AXI>, + <&clk IMX8MP_CLK_ENET_QOS_TIMER>, + <&clk IMX8MP_CLK_ENET_QOS>; + assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_266M>, + <&clk IMX8MP_SYS_PLL2_100M>, + <&clk IMX8MP_SYS_PLL2_125M>; + assigned-clock-rates = <0>, <100000000>, <125000000>; + intf_mode = <&gpr 0x4>; status = "disabled"; }; }; @@ -788,5 +842,87 @@ reg = <0x3d800000 0x400000>; interrupts = ; }; + + usb3_phy0: usb-phy@381f0040 { + compatible = "fsl,imx8mp-usb-phy"; + reg = <0x381f0040 0x40>; + clocks = <&clk IMX8MP_CLK_USB_PHY_ROOT>; + clock-names = "phy"; + assigned-clocks = <&clk IMX8MP_CLK_USB_PHY_REF>; + assigned-clock-parents = <&clk IMX8MP_CLK_24M>; + #phy-cells = <0>; + status = "disabled"; + }; + + usb3_0: usb@32f10100 { + compatible = "fsl,imx8mp-dwc3"; + reg = <0x32f10100 0x8>; + clocks = <&clk IMX8MP_CLK_HSIO_ROOT>, + <&clk IMX8MP_CLK_USB_ROOT>; + clock-names = "hsio", "suspend"; + interrupts = ; + #address-cells = <1>; + #size-cells = <1>; + dma-ranges = <0x40000000 0x40000000 0xc0000000>; + ranges; + status = "disabled"; + + usb_dwc3_0: usb@38100000 { + compatible = "snps,dwc3"; + reg = <0x38100000 0x10000>; + clocks = <&clk IMX8MP_CLK_HSIO_AXI>, + <&clk IMX8MP_CLK_USB_CORE_REF>, + <&clk IMX8MP_CLK_USB_ROOT>; + clock-names = "bus_early", "ref", "suspend"; + assigned-clocks = <&clk IMX8MP_CLK_HSIO_AXI>; + assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_500M>; + assigned-clock-rates = <500000000>; + interrupts = ; + phys = <&usb3_phy0>, <&usb3_phy0>; + phy-names = "usb2-phy", "usb3-phy"; + snps,dis-u2-freeclk-exists-quirk; + }; + + }; + + usb3_phy1: usb-phy@382f0040 { + compatible = "fsl,imx8mp-usb-phy"; + reg = <0x382f0040 0x40>; + clocks = <&clk IMX8MP_CLK_USB_PHY_ROOT>; + clock-names = "phy"; + assigned-clocks = <&clk IMX8MP_CLK_USB_PHY_REF>; + assigned-clock-parents = <&clk IMX8MP_CLK_24M>; + #phy-cells = <0>; + }; + + usb3_1: usb@32f10108 { + compatible = "fsl,imx8mp-dwc3"; + reg = <0x32f10108 0x8>; + clocks = <&clk IMX8MP_CLK_HSIO_ROOT>, + <&clk IMX8MP_CLK_USB_ROOT>; + clock-names = "hsio", "suspend"; + interrupts = ; + #address-cells = <1>; + #size-cells = <1>; + dma-ranges = <0x40000000 0x40000000 0xc0000000>; + ranges; + status = "disabled"; + + usb_dwc3_1: usb@38200000 { + compatible = "snps,dwc3"; + reg = <0x38200000 0x10000>; + clocks = <&clk IMX8MP_CLK_HSIO_AXI>, + <&clk IMX8MP_CLK_USB_CORE_REF>, + <&clk IMX8MP_CLK_USB_ROOT>; + clock-names = "bus_early", "ref", "suspend"; + assigned-clocks = <&clk IMX8MP_CLK_HSIO_AXI>; + assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_500M>; + assigned-clock-rates = <500000000>; + interrupts = ; + phys = <&usb3_phy1>, <&usb3_phy1>; + phy-names = "usb2-phy", "usb3-phy"; + snps,dis-u2-freeclk-exists-quirk; + }; + }; }; }; From patchwork Wed Jul 7 12:57:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 1501719 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.a=rsa-sha256 header.s=a4 header.b=NZo9fGGe; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GKfcW52mpz9t23 for ; Wed, 7 Jul 2021 22:58:35 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 064BB82E04; Wed, 7 Jul 2021 14:58:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.b="NZo9fGGe"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6A88B82BED; Wed, 7 Jul 2021 14:58:12 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mickerik.phytec.de (mickerik.phytec.de [195.145.39.210]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5033F82DFA for ; Wed, 7 Jul 2021 14:58:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=t.remmet@phytec.de DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a4; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1625662685; x=1628254685; 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=HMfrN/dyhown0kbJKdT94oYeNRTQ/zE/5D0mW70BIQY=; b=NZo9fGGeu7ixqOLgUqUgqPoNu1STlmChxMWnsMGiv06XToz1yWf2sgLYtOxJv/Eh 2LUu4qvSTWqawSZbi+659rkgxTlmd6VIn89Wt+TbThB9hc78FoWK0KD0yuEcWxu7 eO30O92TYB92Xq/1c1buoSeHs0hpcJX7FjKJG1D7cCE=; X-AuditID: c39127d2-1d8f870000001daf-f2-60e5a4dd78a8 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 0B.71.07599.DD4A5E06; Wed, 7 Jul 2021 14:58:05 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070714580488-1108501 ; Wed, 7 Jul 2021 14:58:04 +0200 From: Teresa Remmet To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , "NXP i . MX U-Boot Team" , Peng Fan , Jagan Teki , Heiko Schocher Subject: [PATCH v3 2/9] arm: dts: imx8mp: Add common u-boot dtsi Date: Wed, 7 Jul 2021 12:57:57 +0000 Message-Id: <20210707125804.3010652-3-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210707125804.3010652-1-t.remmet@phytec.de> References: <20210707125804.3010652-1-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 07.07.2021 14:58:05, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 07.07.2021 14:58:05 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrALMWRmVeSWpSXmKPExsWyRoCBS/fukqcJBneX8lo8vOpvsePOfWaL L5smsFn8WPWF1aL9lI/F272d7BZTHq9nd2D3WPvxPqvHvFknWDx2zrrL7nH2zg5Gj43vdjAF sEZx2aSk5mSWpRbp2yVwZexfeoC14IhNxbf9fYwNjDd1uxg5OSQETCRWT73F1MXIxSEksI1R YuL0pVDOBUaJlk2rWUCq2AQ0JJ6uOM0EYosISEj86r/KCFLELHCdUWLy+hNgCWEBB4mZhyey gdgsAioSy5a2gsV5BSwletv6mCHWyUvMvPSdHcTmFLCS2HviHpgtBFRzc/oHVoh6QYmTM5+w gCyQELjCKPHm8lGoZiGJ04vPgtnMAtoSyxa+Zp7AKDALSc8sJKkFjEyrGIVyM5OzU4sys/UK MipLUpP1UlI3MQJD+fBE9Us7GPvmeBxiZOJgPMQowcGsJMLL6PA0QYg3JbGyKrUoP76oNCe1 +BCjNAeLkjjvBt6SMCGB9MSS1OzU1ILUIpgsEwenVANjgGLF/ENliruuz3yizcTzkPH0nZ7V bitzO9nUribf0TvBlfXwQPRdJa3EMmnOyh3sG5uNz5tx3+thuLJq+/UdTW/WPNeedOJWFf+x ua1zhb7/j5r28f11vpDAj3m/zzCeTrxwe0eQ1SeJ+gsxWacdSw90p9cuu+4lU/AsRvsVc573 w96kDbPeKbEUZyQaajEXFScCAKFQgUxTAgAA X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Factor out the common node settings for dm-spl and dm-pre-reloc and move them to imx8mp-u-boot.dtsi Signed-off-by: Teresa Remmet Reviewed-by: Fabio Estevam Reviewed-by: Heiko Schocher --- Changes in v3: - Moved binman nodes to common imx8mp-u-boot.dtsi Changes in v2: - none arch/arm/dts/imx8mp-evk-u-boot.dtsi | 143 +---------------- .../imx8mp-phyboard-pollux-rdk-u-boot.dtsi | 39 +---- arch/arm/dts/imx8mp-u-boot.dtsi | 149 ++++++++++++++++++ 3 files changed, 153 insertions(+), 178 deletions(-) create mode 100644 arch/arm/dts/imx8mp-u-boot.dtsi diff --git a/arch/arm/dts/imx8mp-evk-u-boot.dtsi b/arch/arm/dts/imx8mp-evk-u-boot.dtsi index 4162f41cffb6..2abcf1f03d4f 100644 --- a/arch/arm/dts/imx8mp-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-evk-u-boot.dtsi @@ -3,11 +3,9 @@ * Copyright 2019 NXP */ -/ { - binman: binman { - multiple-images; - }; +#include "imx8mp-u-boot.dtsi" +/ { wdt-reboot { compatible = "wdt-reboot"; wdt = <&wdog1>; @@ -21,43 +19,6 @@ }; }; -&{/soc@0} { - u-boot,dm-pre-reloc; - u-boot,dm-spl; -}; - -&clk { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&osc_32k { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&osc_24m { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&aips1 { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&aips2 { - u-boot,dm-spl; -}; - -&aips3 { - u-boot,dm-spl; -}; - -&iomuxc { - u-boot,dm-spl; -}; - ®_usdhc2_vmmc { u-boot,off-on-delay-us = <20000>; }; @@ -156,104 +117,4 @@ phy-reset-post-delay = <100>; }; -&binman { - u-boot-spl-ddr { - filename = "u-boot-spl-ddr.bin"; - pad-byte = <0xff>; - align-size = <4>; - align = <4>; - u-boot-spl { - align-end = <4>; - }; - - blob_1: blob-ext@1 { - filename = "lpddr4_pmu_train_1d_imem_202006.bin"; - size = <0x8000>; - }; - - blob_2: blob-ext@2 { - filename = "lpddr4_pmu_train_1d_dmem_202006.bin"; - size = <0x4000>; - }; - - blob_3: blob-ext@3 { - filename = "lpddr4_pmu_train_2d_imem_202006.bin"; - size = <0x8000>; - }; - - blob_4: blob-ext@4 { - filename = "lpddr4_pmu_train_2d_dmem_202006.bin"; - size = <0x4000>; - }; - }; - - - flash { - mkimage { - args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x920000"; - - blob { - filename = "u-boot-spl-ddr.bin"; - }; - }; - }; - - itb { - filename = "u-boot.itb"; - - fit { - description = "Configuration to load ATF before U-Boot"; - #address-cells = <1>; - fit,external-offset = ; - - images { - uboot { - description = "U-Boot (64-bit)"; - type = "standalone"; - arch = "arm64"; - compression = "none"; - load = ; - - uboot_blob: blob-ext { - filename = "u-boot-nodtb.bin"; - }; - }; - - atf { - description = "ARM Trusted Firmware"; - type = "firmware"; - arch = "arm64"; - compression = "none"; - load = <0x970000>; - entry = <0x970000>; - - atf_blob: blob-ext { - filename = "bl31.bin"; - }; - }; - - fdt { - description = "NAME"; - type = "flat_dt"; - compression = "none"; - - uboot_fdt_blob: blob-ext { - filename = "u-boot.dtb"; - }; - }; - }; - - configurations { - default = "conf"; - - conf { - description = "NAME"; - firmware = "uboot"; - loadables = "atf"; - fdt = "fdt"; - }; - }; - }; - }; -}; diff --git a/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi b/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi index 20e7f63ff91f..6c1528934a98 100644 --- a/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi @@ -4,6 +4,8 @@ * Author: Teresa Remmet */ +#include "imx8mp-u-boot.dtsi" + / { wdt-reboot { compatible = "wdt-reboot"; @@ -12,43 +14,6 @@ }; }; -&{/soc@0} { - u-boot,dm-pre-reloc; - u-boot,dm-spl; -}; - -&clk { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&osc_32k { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&osc_24m { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&aips1 { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&aips2 { - u-boot,dm-spl; -}; - -&aips3 { - u-boot,dm-spl; -}; - -&iomuxc { - u-boot,dm-spl; -}; - ®_usdhc2_vmmc { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi new file mode 100644 index 000000000000..d61346da3032 --- /dev/null +++ b/arch/arm/dts/imx8mp-u-boot.dtsi @@ -0,0 +1,149 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (C) 2021 PHYTEC Messtechnik GmbH + * Author: Teresa Remmet + */ + +/ { + binman: binman { + multiple-images; + }; +}; + +&{/soc@0} { + u-boot,dm-pre-reloc; + u-boot,dm-spl; +}; + +&clk { + u-boot,dm-spl; + u-boot,dm-pre-reloc; +}; + +&osc_32k { + u-boot,dm-spl; + u-boot,dm-pre-reloc; +}; + +&osc_24m { + u-boot,dm-spl; + u-boot,dm-pre-reloc; +}; + +&aips1 { + u-boot,dm-spl; + u-boot,dm-pre-reloc; +}; + +&aips2 { + u-boot,dm-spl; +}; + +&aips3 { + u-boot,dm-spl; +}; + +&iomuxc { + u-boot,dm-spl; +}; + +&binman { + u-boot-spl-ddr { + filename = "u-boot-spl-ddr.bin"; + pad-byte = <0xff>; + align-size = <4>; + align = <4>; + + u-boot-spl { + align-end = <4>; + }; + + blob_1: blob-ext@1 { + filename = "lpddr4_pmu_train_1d_imem_202006.bin"; + size = <0x8000>; + }; + + blob_2: blob-ext@2 { + filename = "lpddr4_pmu_train_1d_dmem_202006.bin"; + size = <0x4000>; + }; + + blob_3: blob-ext@3 { + filename = "lpddr4_pmu_train_2d_imem_202006.bin"; + size = <0x8000>; + }; + + blob_4: blob-ext@4 { + filename = "lpddr4_pmu_train_2d_dmem_202006.bin"; + size = <0x4000>; + }; + }; + + flash { + mkimage { + args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x920000"; + + blob { + filename = "u-boot-spl-ddr.bin"; + }; + }; + }; + + itb { + filename = "u-boot.itb"; + + fit { + description = "Configuration to load ATF before U-Boot"; + #address-cells = <1>; + fit,external-offset = ; + + images { + uboot { + description = "U-Boot (64-bit)"; + type = "standalone"; + arch = "arm64"; + compression = "none"; + load = ; + + uboot_blob: blob-ext { + filename = "u-boot-nodtb.bin"; + }; + }; + + atf { + description = "ARM Trusted Firmware"; + type = "firmware"; + arch = "arm64"; + compression = "none"; + load = <0x970000>; + entry = <0x970000>; + + atf_blob: blob-ext { + filename = "bl31.bin"; + }; + }; + + fdt { + description = "NAME"; + type = "flat_dt"; + compression = "none"; + + uboot_fdt_blob: blob-ext { + filename = "u-boot.dtb"; + }; + }; + }; + + configurations { + default = "conf"; + + conf { + description = "NAME"; + firmware = "uboot"; + loadables = "atf"; + fdt = "fdt"; + }; + }; + }; + }; +}; From patchwork Wed Jul 7 12:57:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 1501721 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.a=rsa-sha256 header.s=a4 header.b=VqglP+Nk; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GKfcv46vBz9sW8 for ; Wed, 7 Jul 2021 22:58:55 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0EB0482E2B; Wed, 7 Jul 2021 14:58:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.b="VqglP+Nk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CF59E82E1E; Wed, 7 Jul 2021 14:58:17 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mickerik.phytec.de (mickerik.phytec.de [195.145.39.210]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8060782DFF for ; Wed, 7 Jul 2021 14:58:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=t.remmet@phytec.de DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a4; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1625662685; x=1628254685; 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=XW17Cv7Zn4qVzxmcukFDMlsPeyU83tw9ZcWt4iVoqM8=; b=VqglP+NkxTXQ840fx0RfYjx9KYabfTxaq9fyxgtbAerJNQ6fQKCE7+5IKidcUCAw sgzrbU0rfPfSFldYnSvJgD9cV7DGXXZ7/tsx8nA/+Qn30JQdM5Fp4QSFoebolnTt 7qNJ81zgtx7WUrcrIvAVhU5mZUKJpYaqsLDGJ4/xHsg=; X-AuditID: c39127d2-1e4f970000001daf-f3-60e5a4ddaff5 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 8B.71.07599.DD4A5E06; Wed, 7 Jul 2021 14:58:05 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070714580513-1108502 ; Wed, 7 Jul 2021 14:58:05 +0200 From: Teresa Remmet To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , "NXP i . MX U-Boot Team" , Peng Fan , Jagan Teki , Heiko Schocher Subject: [PATCH v3 3/9] arm: dts: imx8mp-phyboard-pollux: Sync dts files with kernel Date: Wed, 7 Jul 2021 12:57:58 +0000 Message-Id: <20210707125804.3010652-4-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210707125804.3010652-1-t.remmet@phytec.de> References: <20210707125804.3010652-1-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 07.07.2021 14:58:05, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 07.07.2021 14:58:05 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrALMWRmVeSWpSXmKPExsWyRoCBS/fukqcJBhtOSlk8vOpvsePOfWaL L5smsFn8WPWF1aL9lI/F272d7BZTHq9nd2D3WPvxPqvHvFknWDx2zrrL7nH2zg5Gj43vdjAF sEZx2aSk5mSWpRbp2yVwZXxd+YS14JNMxeoHvYwNjBcluhg5OSQETCTWXHnN2MXIxSEksI1R 4sKyPewQzgVGiYbGTYwgVWwCGhJPV5xmArFFBCQkfvVfBetgFrjOKDF5/QmwhLBAiMTlq9dY QWwWARWJ0/Pvg8V5BSwlJny6zQ6xTl5i5qXvYDangJXE3hP3wGwhoJqb0z+wQtQLSpyc+YQF ZIGEwBVGiTeXjzJDNAtJnF58FsxmFtCWWLbwNfMERoFZSHpmIUktYGRaxSiUm5mcnVqUma1X kFFZkpqsl5K6iREYyocnql/awdg3x+MQIxMH4yFGCQ5mJRFeRoenCUK8KYmVValF+fFFpTmp xYcYpTlYlMR5N/CWhAkJpCeWpGanphakFsFkmTg4pRoYlVJfzfI7X9jPJjxR5uYjzhlT0vdO P9F9pdQ13tGLPUp4zX/Ty+sYr4byVsskl672iH57rqz2/XGLudvm5+zxYxIxufLw/vLOFqXf bCJe79OT513g/lC3Z9XFUzNzZvim+s9v9fYK9P5ckqEiaXj0ZV/nvPySvhh+G+fnd/K/rlgQ z6tR/lFNiaU4I9FQi7moOBEAjnzFo1MCAAA= X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean This update includes eqos support and some minor changes. Synced with kernel commit 412627f6ffe3 ("arm64: dts: imx8mp-phyboard-pollux-rdk: Add missing pinctrl entry") Signed-off-by: Teresa Remmet Reviewed-by: Fabio Estevam Reviewed-by: Heiko Schocher --- Changes in v3: - Don't sync the debug uart changes here as they are made now in separate patch Changes in v2: - none arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts | 46 ++++++++++++++++++++- arch/arm/dts/imx8mp-phycore-som.dtsi | 2 +- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts b/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts index 0e1a6d953389..2031a9d40bed 100644 --- a/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts +++ b/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts @@ -33,9 +33,33 @@ }; }; +&eqos { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_eqos>; + phy-mode = "rgmii-id"; + phy-handle = <ðphy0>; + status = "okay"; + + mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <1>; + #size-cells = <0>; + + ethphy0: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <0x1>; + ti,rx-internal-delay = ; + ti,tx-internal-delay = ; + ti,fifo-depth = ; + ti,clk-output-sel = ; + enet-phy-lane-no-swap; + }; + }; +}; + &i2c2 { clock-frequency = <400000>; - pinctrl-names = "default"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c2>; pinctrl-1 = <&pinctrl_i2c2_gpio>; sda-gpios = <&gpio5 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; @@ -90,6 +114,26 @@ }; &iomuxc { + pinctrl_eqos: eqosgrp { + fsl,pins = < + MX8MP_IOMUXC_ENET_MDC__ENET_QOS_MDC 0x3 + MX8MP_IOMUXC_ENET_MDIO__ENET_QOS_MDIO 0x3 + MX8MP_IOMUXC_ENET_RD0__ENET_QOS_RGMII_RD0 0x91 + MX8MP_IOMUXC_ENET_RD1__ENET_QOS_RGMII_RD1 0x91 + MX8MP_IOMUXC_ENET_RD2__ENET_QOS_RGMII_RD2 0x91 + MX8MP_IOMUXC_ENET_RD3__ENET_QOS_RGMII_RD3 0x91 + MX8MP_IOMUXC_ENET_RXC__CCM_ENET_QOS_CLOCK_GENERATE_RX_CLK 0x91 + MX8MP_IOMUXC_ENET_RX_CTL__ENET_QOS_RGMII_RX_CTL 0x91 + MX8MP_IOMUXC_ENET_TD0__ENET_QOS_RGMII_TD0 0x1f + MX8MP_IOMUXC_ENET_TD1__ENET_QOS_RGMII_TD1 0x1f + MX8MP_IOMUXC_ENET_TD2__ENET_QOS_RGMII_TD2 0x1f + MX8MP_IOMUXC_ENET_TD3__ENET_QOS_RGMII_TD3 0x1f + MX8MP_IOMUXC_ENET_TX_CTL__ENET_QOS_RGMII_TX_CTL 0x1f + MX8MP_IOMUXC_ENET_TXC__CCM_ENET_QOS_CLOCK_GENERATE_TX_CLK 0x1f + MX8MP_IOMUXC_SAI1_MCLK__GPIO4_IO20 0x10 + >; + }; + pinctrl_i2c2: i2c2grp { fsl,pins = < MX8MP_IOMUXC_I2C2_SCL__I2C2_SCL 0x400001c3 diff --git a/arch/arm/dts/imx8mp-phycore-som.dtsi b/arch/arm/dts/imx8mp-phycore-som.dtsi index 44a8c2337cee..f3965ec5b31d 100644 --- a/arch/arm/dts/imx8mp-phycore-som.dtsi +++ b/arch/arm/dts/imx8mp-phycore-som.dtsi @@ -67,7 +67,7 @@ &i2c1 { clock-frequency = <400000>; - pinctrl-names = "default"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c1>; pinctrl-1 = <&pinctrl_i2c1_gpio>; sda-gpios = <&gpio5 15 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; From patchwork Wed Jul 7 12:57:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 1501722 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.a=rsa-sha256 header.s=a4 header.b=ETNtsHs1; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GKfd62qwzz9sW8 for ; Wed, 7 Jul 2021 22:59:06 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5845182E4A; Wed, 7 Jul 2021 14:58:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.b="ETNtsHs1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2B3BF82E1D; Wed, 7 Jul 2021 14:58:17 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mickerik.phytec.de (mickerik.phytec.de [195.145.39.210]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CA0B782E04 for ; Wed, 7 Jul 2021 14:58:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=t.remmet@phytec.de DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a4; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1625662685; x=1628254685; 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=YSWT98Si2o6B+qDvWvUowrcfSc/84MJJJbhmJwO5dhs=; b=ETNtsHs1emI/2TuqqDLAXuyjXlVhI3lfTTRKScaSAjkvyducxa9818pbOeZWhwNg Jnx0qwpGdNIq87cZKIs7yOaJoZJ668Gmaeyo2kPd1GKj3lBAuqXoyPg+H92UIH4t l6dkHkngxzyMUOk4g0/FYclYM854t6hV6zSt8oxONVc=; X-AuditID: c39127d2-1d8f870000001daf-f4-60e5a4dd13c4 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 1C.71.07599.DD4A5E06; Wed, 7 Jul 2021 14:58:05 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070714580538-1108503 ; Wed, 7 Jul 2021 14:58:05 +0200 From: Teresa Remmet To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , "NXP i . MX U-Boot Team" , Peng Fan , Jagan Teki , Heiko Schocher Subject: [PATCH v3 4/9] board: phytec: phycore_imx8mp: Change debug UART Date: Wed, 7 Jul 2021 12:57:59 +0000 Message-Id: <20210707125804.3010652-5-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210707125804.3010652-1-t.remmet@phytec.de> References: <20210707125804.3010652-1-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 07.07.2021 14:58:05, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 07.07.2021 14:58:05 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPLMWRmVeSWpSXmKPExsWyRoCBS/fukqcJBrsv6Fk8vOpvsePOfWaL L5smsFn8WPWF1aL9lI/F272d7BZTHq9nd2D3WPvxPqvHvFknWDx2zrrL7nH2zg5Gj43vdjAF sEZx2aSk5mSWpRbp2yVwZcw+fJu1oEOx4tzpV8wNjD+kuxg5OSQETCR2LpjPAmILCWxjlHh9 SqGLkQvIvsAoseX2DFaQBJuAhsTTFaeZQGwRAQmJX/1XGUGKmAWuM0pMXn8CLCEs4CFx/dUn sAYWARWJ7nszweK8ApYSP7a9ZYLYJi8x89J3dhCbU8BKYu+Je+wQmy0lbk7/wApRLyhxcuYT FpAFEgJXGCXeXD7KDNEsJHF68Vkwm1lAW2LZwtfMExgFZiHpmYUktYCRaRWjUG5mcnZqUWa2 XkFGZUlqsl5K6iZGYCAfnqh+aQdj3xyPQ4xMHIyHGCU4mJVEeBkdniYI8aYkVlalFuXHF5Xm pBYfYpTmYFES593AWxImJJCeWJKanZpakFoEk2Xi4JRqYOw9eeTn1m0//Wy9TFf/5nZaFqwy TeCI4fGdX0Ika85cVqw9+P/pi9TVv10fqTlmT1n0KF5ImkHLTqQqQfP7PaOeX/FVn52mJDx9 EljdfmqHak7jy8Pme4sX23HbN8Uv+Sw2S/72wVi7kDdzJzw6JftTs2pvvuHMtpfvJ+hvMOjN 6DRyV7EJSVdiKc5INNRiLipOBACg8dZgUgIAAA== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean With the first redesign the debug UART had changed from UART2 to UART1. As the first hardware revision is considered as alpha and will not be supported in future. The old setup will not be preserved. Signed-off-by: Teresa Remmet Reviewed-by: Fabio Estevam Reviewed-by: Heiko Schocher --- Changes v3: - Added imx8mp-phyboard-pollux-rdk.dts debug uart changes to this patch Changes v2: - none arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi | 4 ++-- arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts | 12 ++++++------ board/phytec/phycore_imx8mp/spl.c | 6 +++--- include/configs/phycore_imx8mp.h | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi b/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi index 6c1528934a98..32ed037e3721 100644 --- a/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi @@ -18,7 +18,7 @@ u-boot,dm-spl; }; -&pinctrl_uart2 { +&pinctrl_uart1 { u-boot,dm-spl; }; @@ -54,7 +54,7 @@ u-boot,dm-spl; }; -&uart2 { +&uart1 { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts b/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts index 2031a9d40bed..984a6b9ded8d 100644 --- a/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts +++ b/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts @@ -16,7 +16,7 @@ "phytec,imx8mp-phycore-som", "fsl,imx8mp"; chosen { - stdout-path = &uart2; + stdout-path = &uart1; }; reg_usdhc2_vmmc: regulator-usdhc2 { @@ -95,9 +95,9 @@ }; /* debug console */ -&uart2 { +&uart1 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart2>; + pinctrl-0 = <&pinctrl_uart1>; status = "okay"; }; @@ -154,10 +154,10 @@ >; }; - pinctrl_uart2: uart2grp { + pinctrl_uart1: uart1grp { fsl,pins = < - MX8MP_IOMUXC_UART2_RXD__UART2_DCE_RX 0x49 - MX8MP_IOMUXC_UART2_TXD__UART2_DCE_TX 0x49 + MX8MP_IOMUXC_UART1_RXD__UART1_DCE_RX 0x49 + MX8MP_IOMUXC_UART1_TXD__UART1_DCE_TX 0x49 >; }; diff --git a/board/phytec/phycore_imx8mp/spl.c b/board/phytec/phycore_imx8mp/spl.c index f9fa8d1e1281..0bc4c7693b06 100644 --- a/board/phytec/phycore_imx8mp/spl.c +++ b/board/phytec/phycore_imx8mp/spl.c @@ -80,8 +80,8 @@ int board_fit_config_name_match(const char *name) #define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) static iomux_v3_cfg_t const uart_pads[] = { - MX8MP_PAD_UART2_RXD__UART2_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), - MX8MP_PAD_UART2_TXD__UART2_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), + MX8MP_PAD_UART1_RXD__UART1_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), + MX8MP_PAD_UART1_TXD__UART1_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), }; static iomux_v3_cfg_t const wdog_pads[] = { @@ -107,7 +107,7 @@ void board_init_f(ulong dummy) arch_cpu_init(); - init_uart_clk(1); + init_uart_clk(0); board_early_init_f(); diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h index 04900498507a..e24f223c21d3 100644 --- a/include/configs/phycore_imx8mp.h +++ b/include/configs/phycore_imx8mp.h @@ -39,7 +39,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "image=Image\0" \ - "console=ttymxc1,115200\0" \ + "console=ttymxc0,115200\0" \ "fdt_addr=0x48000000\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ @@ -87,7 +87,7 @@ #define PHYS_SDRAM_SIZE 0x80000000 /* UART */ -#define CONFIG_MXC_UART_BASE UART2_BASE_ADDR +#define CONFIG_MXC_UART_BASE UART1_BASE_ADDR /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE SZ_2K From patchwork Wed Jul 7 12:58:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 1501723 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.a=rsa-sha256 header.s=a4 header.b=jLbt/xGv; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GKfdJ3YVgz9sW8 for ; Wed, 7 Jul 2021 22:59:16 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B727D82E06; Wed, 7 Jul 2021 14:58:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.b="jLbt/xGv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 75A0E82E2B; Wed, 7 Jul 2021 14:58:18 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mickerik.phytec.de (mickerik.phytec.de [195.145.39.210]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 11F9C82E08 for ; Wed, 7 Jul 2021 14:58:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=t.remmet@phytec.de DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a4; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1625662686; x=1628254686; 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=xs+Qzk4vdIjs9z9S20lZIwdZD07wcCBuRgvKxOJgrBc=; b=jLbt/xGvUGCTbrXmwP3MUtGJHmH6brc5Q74gTWbhDWSpZ83FCu5cw+HhR8Idkbri ROMvM5dTGSuMjNOFZZJVA9tmWWAy9ozoEUZHQRe4T1JOk5easZhpepRd+Cq7Wj0O elawebk4hTZNjlDh19qd/kBAeheD/yFJ6Z6OB1BYSys=; X-AuditID: c39127d2-1e4f970000001daf-f5-60e5a4dd46fa Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 9C.71.07599.DD4A5E06; Wed, 7 Jul 2021 14:58:05 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070714580564-1108504 ; Wed, 7 Jul 2021 14:58:05 +0200 From: Teresa Remmet To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , "NXP i . MX U-Boot Team" , Peng Fan , Jagan Teki , Heiko Schocher Subject: [PATCH v3 5/9] board: phytec: phycore_imx8mp: Add fec support Date: Wed, 7 Jul 2021 12:58:00 +0000 Message-Id: <20210707125804.3010652-6-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210707125804.3010652-1-t.remmet@phytec.de> References: <20210707125804.3010652-1-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 07.07.2021 14:58:05, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 07.07.2021 14:58:05 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPLMWRmVeSWpSXmKPExsWyRoCBS/fukqcJBl9O21g8vOpvsePOfWaL L5smsFn8WPWF1aL9lI/F272d7BZTHq9nd2D3WPvxPqvHvFknWDx2zrrL7nH2zg5Gj43vdjAF sEZx2aSk5mSWpRbp2yVwZbR0dTEXnJWpuHnsHFMD4zyJLkZODgkBE4m302cydzFycQgJbGOU 6O7eB+VcYJQ42PySEaSKTUBD4umK00wgtoiAhMSv/quMIEXMAtcZJSavPwGWEBZwk1iz/AdL FyMHB4uAisSMmWYgYV4BS4l7rWfYILbJS8y89J0dxOYUsJLYe+IemC0EVHNz+gdWiHpBiZMz n7CAzJcQuMIo8ebyUWaIZiGJ04vPgtnMAtoSyxa+Zp7AKDALSc8sJKkFjEyrGIVyM5OzU4sy s/UKMipLUpP1UlI3MQID+fBE9Us7GPvmeBxiZOJgPMQowcGsJMLL6PA0QYg3JbGyKrUoP76o NCe1+BCjNAeLkjjvBt6SMCGB9MSS1OzU1ILUIpgsEwenVAPjhLhJs9IqS5f0futebFf7p0BP OmJr7qx+zeU72aZytWVckX0y6ZTazAe/6sLmuRfIzJhudvHIoUtWFbND1yd/O7K7l12wNZNt u9sHk/3rlIUXzqg7sb+HTTMqaELlWXnBWUXrF619zFmZu+We7Yu6U9dn8xZ6eJ6onbrO9uSv E9M8JjU+vdxkocRSnJFoqMVcVJwIAKfhoKhSAgAA X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Enable support for the fec ethernet on phyCORE-i.MX8MP. Signed-off-by: Teresa Remmet Reviewed-by: Fabio Estevam Reviewed-by: Heiko Schocher --- Changes in v3: - none Changes in v2: - removed hardcoded serverip in environment - removed not needed fec eth defines in board config include board/phytec/phycore_imx8mp/phycore-imx8mp.c | 14 ++++++++++++++ configs/phycore-imx8mp_defconfig | 7 +++++++ include/configs/phycore_imx8mp.h | 17 +++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/board/phytec/phycore_imx8mp/phycore-imx8mp.c b/board/phytec/phycore_imx8mp/phycore-imx8mp.c index 67649078c201..a8f082143762 100644 --- a/board/phytec/phycore_imx8mp/phycore-imx8mp.c +++ b/board/phytec/phycore_imx8mp/phycore-imx8mp.c @@ -10,11 +10,25 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; +static int setup_fec(void) +{ + struct iomuxc_gpr_base_regs *gpr = + (struct iomuxc_gpr_base_regs *)IOMUXC_GPR_BASE_ADDR; + + /* Use 125M anatop REF_CLK1 for ENET1, not from external */ + clrsetbits_le32(&gpr->gpr[1], 0x2000, 0); + + return 0; +} + int board_init(void) { + setup_fec(); + return 0; } diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig index 7f21e8888e0e..a22f5e089d97 100644 --- a/configs/phycore-imx8mp_defconfig +++ b/configs/phycore-imx8mp_defconfig @@ -58,6 +58,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_DEV=2 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y CONFIG_CLK_COMPOSITE_CCF=y CONFIG_CLK_IMX8MP=y @@ -79,7 +80,13 @@ CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_FSL_ESDHC_IMX=y +CONFIG_PHYLIB=y +CONFIG_PHY_TI_DP83867=y CONFIG_DM_ETH=y +CONFIG_DM_ETH_PHY=y +CONFIG_FEC_MXC=y +CONFIG_RGMII=y +CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h index e24f223c21d3..75f84e60f5da 100644 --- a/include/configs/phycore_imx8mp.h +++ b/include/configs/phycore_imx8mp.h @@ -42,6 +42,7 @@ "console=ttymxc0,115200\0" \ "fdt_addr=0x48000000\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "ip_dyn=yes\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ "mmcroot=2\0" \ @@ -57,6 +58,22 @@ "else " \ "echo WARN: Cannot load the DT; " \ "fi;\0 " \ + "nfsroot=/nfs\0" \ + "netargs=setenv bootargs console=${console} root=/dev/nfs ip=dhcp " \ + "nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ + "netboot=echo Booting from net ...; " \ + "run netargs; " \ + "if test ${ip_dyn} = yes; then " \ + "setenv get_cmd dhcp; " \ + "else " \ + "setenv get_cmd tftp; " \ + "fi; " \ + "${get_cmd} ${loadaddr} ${image}; " \ + "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ + "booti ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "echo WARN: Cannot load the DT; " \ + "fi;\0" \ #define CONFIG_BOOTCOMMAND \ "mmc dev ${mmcdev}; if mmc rescan; then " \ From patchwork Wed Jul 7 12:58:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 1501720 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.a=rsa-sha256 header.s=a4 header.b=FV3ivlfA; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GKfcj6tpPz9sW8 for ; Wed, 7 Jul 2021 22:58:45 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8037382E00; Wed, 7 Jul 2021 14:58:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.b="FV3ivlfA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6290C82E32; Wed, 7 Jul 2021 14:58:16 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mickerik.phytec.de (mickerik.phytec.de [195.145.39.210]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 44AFD82E0A for ; Wed, 7 Jul 2021 14:58:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=t.remmet@phytec.de DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a4; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1625662686; x=1628254686; 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=kVH3hv3JJAMPDwqgEKTtKvxqSk6X8aHmskevVp8LJ8c=; b=FV3ivlfAjlb+DbklY0N83ojHfrJ7E7Ftd/1BnZXwO4h2cqrxJb7wVm+EAAhZ7Akx KQSGyVGi4S0lWhRggdrbf8tkkDBxL3GWHuEmE1fSbEx8bgZPtoBa5cUVCgjO/6wA iNEl7cZeh3CL332Jd9wbQANSXHj0nggOkXidbg62Jf8=; X-AuditID: c39127d2-1d8f870000001daf-f6-60e5a4de67e3 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 1D.71.07599.ED4A5E06; Wed, 7 Jul 2021 14:58:06 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070714580589-1108505 ; Wed, 7 Jul 2021 14:58:05 +0200 From: Teresa Remmet To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , "NXP i . MX U-Boot Team" , Peng Fan , Jagan Teki , Heiko Schocher Subject: [PATCH v3 6/9] board: phytec: phycore_imx8mp: Set VDD_ARM to 0,95V Date: Wed, 7 Jul 2021 12:58:01 +0000 Message-Id: <20210707125804.3010652-7-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210707125804.3010652-1-t.remmet@phytec.de> References: <20210707125804.3010652-1-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 07.07.2021 14:58:06, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 07.07.2021 14:58:06 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPLMWRmVeSWpSXmKPExsWyRoCBS/fekqcJBnO7eC0eXvW32HHnPrPF l00T2Cx+rPrCatF+ysfi7d5Odospj9ezO7B7rP14n9Vj3qwTLB47Z91l9zh7Zwejx8Z3O5gC WKO4bFJSczLLUov07RK4Mk6/WsBaMFegYs6NP+wNjL18XYycHBICJhI3r55i6WLk4hAS2MYo MWP+bSjnAqPEhzOdbCBVbAIaEk9XnGYCsUUEJCR+9V9lBCliFrjOKDF5/QmwhLCAt8S+iWsZ QWwWARWJQwfWgNm8ApYS7y9sZodYJy8x89J3MJtTwEpi74l7YLYQUM3N6R9YIeoFJU7OfMIC UX+FUeLJFyUIW0ji9OKzzCA2s4C2xLKFr5knMArMQtIyC0lqASPTKkah3Mzk7NSizGy9gozK ktRkvZTUTYzAQD48Uf3SDsa+OR6HGJk4GA8xSnAwK4nwMjo8TRDiTUmsrEotyo8vKs1JLT7E KM3BoiTOu4G3JExIID2xJDU7NbUgtQgmy8TBKdXAqDBBoWzX5aZs30cJ+nxd01omc00O1Lu0 SX/P5jYllS9M//KvZ6k9blvq2Pj49Vwnowkzrr7wf2fnL/hq/++bfNvsliu/v7itOXlmzbH3 x6oTyxtuxt3Jy2a02JrPaOjffWmudvPsFc5PI819Zv1rkOlSLNg9pSIkZPvnQzfVVzKtDLmu ft/ZSImlOCPRUIu5qDgRADCfz/NSAgAA X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Increase VDD_ARM to prevent timing issues as VDD_SOC is used in OD mode. Also increase GIC clock. Signed-off-by: Teresa Remmet Reviewed-by: Fabio Estevam --- No changes in v2 or v3. board/phytec/phycore_imx8mp/spl.c | 11 ++++++++++- configs/phycore-imx8mp_defconfig | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/board/phytec/phycore_imx8mp/spl.c b/board/phytec/phycore_imx8mp/spl.c index 0bc4c7693b06..815ca9badcba 100644 --- a/board/phytec/phycore_imx8mp/spl.c +++ b/board/phytec/phycore_imx8mp/spl.c @@ -62,7 +62,8 @@ int power_init_board(void) /* BUCKxOUT_DVS0/1 control BUCK123 output */ pmic_reg_write(p, PCA9450_BUCK123_DVS, 0x29); - /* increase VDD_SOC to typical value 0.95V */ + /* Increase VDD_SOC and VDD_ARM to OD voltage 0.95V */ + pmic_reg_write(p, PCA9450_BUCK1OUT_DVS0, 0x1C); pmic_reg_write(p, PCA9450_BUCK2OUT_DVS0, 0x1C); /* set WDOG_B_CFG to cold reset */ @@ -71,6 +72,14 @@ int power_init_board(void) return 0; } +void spl_board_init(void) +{ + /* Set GIC clock to 500Mhz for OD VDD_SOC. */ + clock_enable(CCGR_GIC, 0); + clock_set_target_val(GIC_CLK_ROOT, CLK_ROOT_ON | CLK_ROOT_SOURCE_SEL(5)); + clock_enable(CCGR_GIC, 1); +} + int board_fit_config_name_match(const char *name) { return 0; diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig index a22f5e089d97..89c2ac977f47 100644 --- a/configs/phycore-imx8mp_defconfig +++ b/configs/phycore-imx8mp_defconfig @@ -25,6 +25,7 @@ CONFIG_OF_SYSTEM_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg" CONFIG_DEFAULT_FDT_FILE="oftree" CONFIG_BOARD_LATE_INIT=y +CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOOTROM_SUPPORT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SEPARATE_BSS=y From patchwork Wed Jul 7 12:58:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 1501724 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.a=rsa-sha256 header.s=a4 header.b=EAX/Lpt5; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GKfdV6F7Pz9sWc for ; Wed, 7 Jul 2021 22:59:26 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9655082E12; Wed, 7 Jul 2021 14:58:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.b="EAX/Lpt5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2734E82E2B; Wed, 7 Jul 2021 14:58:22 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mickerik.phytec.de (mickerik.phytec.de [195.145.39.210]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9314082E0E for ; Wed, 7 Jul 2021 14:58:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=t.remmet@phytec.de DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a4; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1625662686; x=1628254686; 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=FFg6GX6GHddcI+SfuLopwez8DwrJSbaQa6ZcHUQf0pU=; b=EAX/Lpt5+pHUdkOql2xQ0W5Yug6Pscf3uU6Zx24LAnI6boqFg450YIDMakuVE9OC 0McFj6SaOlKklY338LzmSg+pelNqsX81Yo8vwG5pHITr/mMSdpS+lohRSCO0H83k vVLPRUvP4keEpynPhB00CvoKZ8E7FPffiCJLEf08wKE=; X-AuditID: c39127d2-1d8f870000001daf-f8-60e5a4def536 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id CD.71.07599.ED4A5E06; Wed, 7 Jul 2021 14:58:06 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070714580614-1108506 ; Wed, 7 Jul 2021 14:58:06 +0200 From: Teresa Remmet To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , "NXP i . MX U-Boot Team" , Peng Fan , Jagan Teki , Heiko Schocher Subject: [PATCH v3 7/9] board: phytec: phycore-imx8mp: Enable DVS1 control Date: Wed, 7 Jul 2021 12:58:02 +0000 Message-Id: <20210707125804.3010652-8-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210707125804.3010652-1-t.remmet@phytec.de> References: <20210707125804.3010652-1-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 07.07.2021 14:58:06, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 07.07.2021 14:58:06 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPLMWRmVeSWpSXmKPExsWyRoCBS/fekqcJBq9+yVg8vOpvsePOfWaL L5smsFn8WPWF1aL9lI/F272d7BZTHq9nd2D3WPvxPqvHvFknWDx2zrrL7nH2zg5Gj43vdjAF sEZx2aSk5mSWpRbp2yVwZZy7/JCloIejYt2+X4wNjL/Zuhg5OSQETCS6tkxl7GLk4hAS2MYo sfrZc3YI5wKjRPu/mUwgVWwCGhJPV5wGs0UEJCR+9V8F62AWuM4oMXn9CbCEsICXxITuU2Bj WQRUJPrOPGQFsXkFLCWaJ01gglgnLzHz0nd2EJtTwEpi74l7YLYQUM3N6R+g6gUlTs58wgJR f4VR4skXJQhbSOL04rPMIDazgLbEsoWvmScwCsxC0jILSWoBI9MqRqHczOTs1KLMbL2CjMqS 1GS9lNRNjMBAPjxR/dIOxr45HocYmTgYDzFKcDArifAyOjxNEOJNSaysSi3Kjy8qzUktPsQo zcGiJM67gbckTEggPbEkNTs1tSC1CCbLxMEp1cCY0eClyjj5SeHkC5dcTZ6uaz3fbHq5y3jn 28rTvKc+XG1bk67zR/2E8DvZbpHZX/bzfpXw+D7vU51k9W6Oh7/aN/ROrDn+/eZmwTjZZxpJ Mbeiq2/w23LUrLnz/sfZUw237MR+5Zds0jzFo+Xp8HWf1ovXU39JtFTMrih1kIlziNskLRV9 0nK6EktxRqKhFnNRcSIAPvHz/FICAAA= X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Enable DVS1 control through PMIC_STBY_REQ. Signed-off-by: Teresa Remmet Reviewed-by: Fabio Estevam --- No changes in v2 or v3. board/phytec/phycore_imx8mp/spl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/board/phytec/phycore_imx8mp/spl.c b/board/phytec/phycore_imx8mp/spl.c index 815ca9badcba..19c486e55174 100644 --- a/board/phytec/phycore_imx8mp/spl.c +++ b/board/phytec/phycore_imx8mp/spl.c @@ -66,7 +66,11 @@ int power_init_board(void) pmic_reg_write(p, PCA9450_BUCK1OUT_DVS0, 0x1C); pmic_reg_write(p, PCA9450_BUCK2OUT_DVS0, 0x1C); - /* set WDOG_B_CFG to cold reset */ + /* Set BUCK1 DVS1 to suspend controlled through PMIC_STBY_REQ */ + pmic_reg_write(p, PCA9450_BUCK1OUT_DVS1, 0x14); + pmic_reg_write(p, PCA9450_BUCK1CTRL, 0x59); + + /* Set WDOG_B_CFG to cold reset */ pmic_reg_write(p, PCA9450_RESET_CTRL, 0xA1); return 0; From patchwork Wed Jul 7 12:58:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 1501725 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.a=rsa-sha256 header.s=a4 header.b=pmZbg9Oj; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GKfdh3m1Fz9sW8 for ; Wed, 7 Jul 2021 22:59:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 42D4582E6A; Wed, 7 Jul 2021 14:58:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.b="pmZbg9Oj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 84BD682E11; Wed, 7 Jul 2021 14:58:25 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mickerik.phytec.de (mickerik.phytec.de [195.145.39.210]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B7CF382E11 for ; Wed, 7 Jul 2021 14:58:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=t.remmet@phytec.de DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a4; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1625662686; x=1628254686; 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=tFzZ7q233c+2Bg8zxGq+Ug1Ls10W80dazXCUEJLdk6o=; b=pmZbg9OjJFg/nk9AC1L1gSS/z++0SIkKig2KxHG/WzsteOlL8Zo8gtjL6aiQ4dGp rPEyQ5LsJuq1VdRNrabW9o3dn87dqQyxxvXZpVUpwGMVbOj+t5W8oJsMxe3h9MJr AB32LbFaE4NK7F4+/kSv/ooWyAOUyjjMPTQVdZL53kA=; X-AuditID: c39127d2-1e4f970000001daf-f9-60e5a4def354 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 4E.71.07599.ED4A5E06; Wed, 7 Jul 2021 14:58:06 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070714580639-1108508 ; Wed, 7 Jul 2021 14:58:06 +0200 From: Teresa Remmet To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , "NXP i . MX U-Boot Team" , Peng Fan , Jagan Teki , Heiko Schocher Subject: [PATCH v3 8/9] arm: dts: imx8mp-phyboard-pollux-rdk-u-boot: Add wdog pinctrl entry Date: Wed, 7 Jul 2021 12:58:03 +0000 Message-Id: <20210707125804.3010652-9-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210707125804.3010652-1-t.remmet@phytec.de> References: <20210707125804.3010652-1-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 07.07.2021 14:58:06, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 07.07.2021 14:58:06 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHLMWRmVeSWpSXmKPExsWyRoCBS/fekqcJBus6tCweXvW32HHnPrPF l00T2Cx+rPrCatF+ysfi7d5Odospj9ezO7B7rP14n9Vj3qwTLB47Z91l9zh7Zwejx8Z3O5gC WKO4bFJSczLLUov07RK4MmYdu89esJ21YvLrp0wNjBdYuhg5OSQETCQW/F3M1MXIxSEksI1R 4sTED0wgCSGBC4wS3fcyQGw2AQ2JpytOg8VFBCQkfvVfZQRpYBa4zigxef0JsISwQLTEykV7 wGwWARWJsy0Qg3gFLCWWHZjECLFNXmLmpe/sIDangJXE3hP32CGWWUrcnP6BFaJeUOLkzCdQ 111hlHjyRQnCFpI4vfgsM4jNLKAtsWzha+YJjAKzkLTMQpJawMi0ilEoNzM5O7UoM1uvIKOy JDVZLyV1EyMwjA9PVL+0g7FvjschRiYOxkOMEhzMSiK8jA5PE4R4UxIrq1KL8uOLSnNSiw8x SnOwKInzbuAtCRMSSE8sSc1OTS1ILYLJMnFwSjUwru+O4Nus8e0mC2vhTpXs5WWfj7t/bM9z nGTQ8fd1ie2T9KpjnpUf8jyNd7yIqVvNeqvC27DDSK5wn7jirk/RfbzZXxenfEhgadbOP5vx /mu/eVep++tUAeEXH2o6Pj9Of2mT+u2jUSxrjCfPG/NLE5yXHWLczHBgv4DvijlNl7oa5r6x efJEiaU4I9FQi7moOBEA8I9qTVECAAA= X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Add missing pinctrl entry in spl. Signed-off-by: Teresa Remmet Reviewed-by: Fabio Estevam --- No changes in v2 or v3. arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi b/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi index 32ed037e3721..dbc48dfb4841 100644 --- a/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi @@ -34,6 +34,10 @@ u-boot,dm-spl; }; +&pinctrl_wdog { + u-boot,dm-spl; +}; + &gpio1 { u-boot,dm-spl; }; From patchwork Wed Jul 7 12:58:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 1501726 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.a=rsa-sha256 header.s=a4 header.b=VDFzaZVN; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GKfdt3rTDz9sWc for ; Wed, 7 Jul 2021 22:59:45 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2740F82E23; Wed, 7 Jul 2021 14:58:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.b="VDFzaZVN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5A5BD82E07; Wed, 7 Jul 2021 14:58:26 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mickerik.phytec.de (mickerik.phytec.de [195.145.39.210]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 11DB682E15 for ; Wed, 7 Jul 2021 14:58:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=t.remmet@phytec.de DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a4; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1625662687; x=1628254687; 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=Fom5y43GdvD60RXwpB0UVdGpuG9BQHmCSHmeIaQBeto=; b=VDFzaZVNfzWGpq8om8Z9b9Qq6K6gxNwNdGmGBfs/zUJ6PmE71h56HaV5kUaP05j0 3EIYPlFS0RWG1n7xu9o0ykiZf5+aPfN60s24kGY8Jrp3LQzHjbi2+SnCESku6WC+ itY3PetV3pMgzjFXiii7sg20sAcZCbYe89fS+JXSjKY=; X-AuditID: c39127d2-1d8f870000001daf-fa-60e5a4de00a1 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id CE.71.07599.ED4A5E06; Wed, 7 Jul 2021 14:58:06 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070714580664-1108509 ; Wed, 7 Jul 2021 14:58:06 +0200 From: Teresa Remmet To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , "NXP i . MX U-Boot Team" , Peng Fan , Jagan Teki , Heiko Schocher Subject: [PATCH v3 9/9] board: phytec: imx8mp-phycore: Switch to binman Date: Wed, 7 Jul 2021 12:58:04 +0000 Message-Id: <20210707125804.3010652-10-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210707125804.3010652-1-t.remmet@phytec.de> References: <20210707125804.3010652-1-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 07.07.2021 14:58:06, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 07.07.2021 14:58:06 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHLMWRmVeSWpSXmKPExsWyRoCBS/fekqcJBms/2lg8vOpvsePOfWaL L5smsFn8WPWF1aL9lI/F272d7BZTHq9nd2D3WPvxPqvHvFknWDx2zrrL7nH2zg5Gj43vdjAF sEZx2aSk5mSWpRbp2yVwZRxY95C94JBQRc/uC2wNjN0CXYycHBICJhJfjhxj6mLk4hAS2MYo 0fjhEyOEc4FR4uHaf8wgVWwCGhJPV5xmArFFBCQkfvVfBStiFrjOKDF5/QmgBAeHsIC7xL01 niA1LAIqEqvf7mUEsXkFrCTeHOpjh9gmLzHz0ncwmxMovvfEPTBbSMBS4ub0D6wQ9YISJ2c+ YYGov8Io8eSLEoQtJHF68Vmwe5gFtCWWLXzNPIFRYBaSlllIUgsYmVYxCuVmJmenFmVm6xVk VJakJuulpG5iBIbx4Ynql3Yw9s3xOMTIxMF4iFGCg1lJhJfR4WmCEG9KYmVValF+fFFpTmrx IUZpDhYlcd4NvCVhQgLpiSWp2ampBalFMFkmDk6pBkbeCXyfS5+kp9gXaD3SuXO6+82xIw3r V3h3tLIr3n2v1se51zEmdtvjhmUNQsF9iupWv0oYTk4R7HC6mfzr3LPfH8XMf67n/7ypat/+ 4DTu+V8ey10r4HnkyR/isWNlrnLaUpMr3kYm+9wOnk49t0Tox6JAoSNJf5iiPM1btCKEWlas DtW4q63EUpyRaKjFXFScCADYkSbWUQIAAA== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Use now binman for image creation. Signed-off-by: Teresa Remmet Reviewed-by: Fabio Estevam Reviewed-by: Heiko Schocher --- Changes in v3: - binman nodes have been moved to common dtsi so removed from this patch Changes in v2: - none arch/arm/mach-imx/imx8m/Kconfig | 1 + board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg | 10 ++++++++++ configs/phycore-imx8mp_defconfig | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig index 0669363c0f51..ccaf106be5d8 100644 --- a/arch/arm/mach-imx/imx8m/Kconfig +++ b/arch/arm/mach-imx/imx8m/Kconfig @@ -127,6 +127,7 @@ config TARGET_PHYCORE_IMX8MM config TARGET_PHYCORE_IMX8MP bool "PHYTEC PHYCORE i.MX8MP" + select BINMAN select IMX8MP select SUPPORT_SPL select IMX8M_LPDDR4 diff --git a/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg b/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg new file mode 100644 index 000000000000..b2920b4908ed --- /dev/null +++ b/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2021 NXP + */ + +#define __ASSEMBLY__ + +ROM_VERSION v2 +BOOT_FROM sd +LOADER mkimage.flash.mkimage 0x920000 diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig index 89c2ac977f47..32d538c8bbbb 100644 --- a/configs/phycore-imx8mp_defconfig +++ b/configs/phycore-imx8mp_defconfig @@ -20,9 +20,9 @@ CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" +# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_OF_SYSTEM_SETUP=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg" CONFIG_DEFAULT_FDT_FILE="oftree" CONFIG_BOARD_LATE_INIT=y CONFIG_SPL_BOARD_INIT=y