From patchwork Thu Jul 1 09:47:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 1499479 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=gjE7BABZ; 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 4GFtgB2lxFz9sVb for ; Thu, 1 Jul 2021 19:47:50 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7E2498327E; Thu, 1 Jul 2021 11:47:36 +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="gjE7BABZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E7EE08323B; Thu, 1 Jul 2021 11:47:29 +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=unavailable 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 0BD23831F3 for ; Thu, 1 Jul 2021 11:47:22 +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=1625132841; x=1627724841; 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=5N8Tf8ugI9Z2jH2IGLpsJU+J64vXrNglReh6ArOZ32U=; b=gjE7BABZ4uW3fphB69TUn9GThzsKVwPeoYeounO2pks2824GTWWLfmLaBPocRpDC EDSlRAsEc5Owh3CLENpaTOoyX1GrI516cEKJRAGOpjEoOr6kbzxp0+kR07CelNeB 097+zUaLalv6tQTa1HhHNtCOj8Eu2PJR8NbB6wKisdI=; X-AuditID: c39127d2-a77bc70000001c5e-90-60dd8f2969b0 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 50.69.07262.92F8DD06; Thu, 1 Jul 2021 11:47:21 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070111472158-1075050 ; Thu, 1 Jul 2021 11:47:21 +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 1/9] arm: dts: imx8mp: Resync imx8mp device tree include Date: Thu, 1 Jul 2021 09:47:13 +0000 Message-Id: <20210701094721.3240071-2-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210701094721.3240071-1-t.remmet@phytec.de> References: <20210701094721.3240071-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 01.07.2021 11:47:21, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 01.07.2021 11:47:21 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHLMWRmVeSWpSXmKPExsWyRoCBS1ez/26CQeM6E4uHV/0tdty5z2zx ZdMENosfq76wWrSf8rF4u7eT3WLK4/XsDuweaz/eZ/WYN+sEi8fOWXfZPc7e2cHosfHdDqYA 1igum5TUnMyy1CJ9uwSujL71DWwFa60qZh54wd7A+FW3i5GTQ0LARGLFn042EFtIYBujROdR 4y5GLiD7AqPEpcWX2EESbAIaEk9XnGYCsUUEJCR+9V9lBCliFrjOKDF5/QmwhLCAh8TkHZvA JrEIqEhce32AFcTmFbCUWPbrLgvENnmJmZe+gw3lFLCSmHriKnMXIwfQNkuJmzsUIMoFJU7O fMICMl9C4AqjxNpNv1gheoUkTi8+ywxiMwtoSyxb+Jp5AqPALCQ9s5CkFjAyrWIUys1Mzk4t yszWK8ioLElN1ktJ3cQIDOPDE9Uv7WDsm+NxiJGJg/EQowQHs5IIb9TO2wlCvCmJlVWpRfnx RaU5qcWHGKU5WJTEeTfwloQJCaQnlqRmp6YWpBbBZJk4OKUaGKM2h6UazdwfsEhgbmd8mUN4 03qx1QKrnq+/E8a+euP+BbmOvGVicoKKrwqk26dwXF/KuG1+kFfs3LW9OwT9dZeJF2nlFlRv 8uacw2StoHawLVtzzgcLlwpfI+euJ93P7ap6e660b/m8NX6ngrJz01bRxyFn1ssKtJTHHjyX dZ3Hb412ytG5SizFGYmGWsxFxYkA8ceGV1ECAAA= 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 --- 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 Thu Jul 1 09:47:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 1499478 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=C1TBj5L1; 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 4GFtg40fVQz9sWk for ; Thu, 1 Jul 2021 19:47:44 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C186583253; Thu, 1 Jul 2021 11:47:32 +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="C1TBj5L1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4B45C832B7; Thu, 1 Jul 2021 11:47:28 +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 2D48583253 for ; Thu, 1 Jul 2021 11:47:22 +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=1625132842; x=1627724842; 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=GCfQQExa/X+N1a++xdunEWKuvpctcgbwULFRrJzKBrM=; b=C1TBj5L19WIc50+FrvwBspAM/Yy3I8G+hu3I1bglDXjccbsWACPoYXQl7/OU349r ox60Vn5FFQKAC7kDFqPp3dPvL4X/z8FrKZ9dQgBxiuRWFmqaz5TEnQa8/fJJduqU LTc8UKQozcjuOlFJYXxIKU/ODNjvnBVCV3NR6QsyNhI=; X-AuditID: c39127d2-a9fbd70000001c5e-91-60dd8f2a7047 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id D0.69.07262.A2F8DD06; Thu, 1 Jul 2021 11:47:22 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070111472182-1075051 ; Thu, 1 Jul 2021 11:47:21 +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 2/9] arm: dts: imx8mp: Add common u-boot dtsi Date: Thu, 1 Jul 2021 09:47:14 +0000 Message-Id: <20210701094721.3240071-3-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210701094721.3240071-1-t.remmet@phytec.de> References: <20210701094721.3240071-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 01.07.2021 11:47:22, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 01.07.2021 11:47:22 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPLMWRmVeSWpSXmKPExsWyRoCBS1er/26CwcvNrBYPr/pb7Lhzn9ni y6YJbBY/Vn1htWg/5WPxdm8nu8WUx+vZHdg91n68z+oxb9YJFo+ds+6ye5y9s4PRY+O7HUwB rFFcNimpOZllqUX6dglcGbsezGEr2CNRceTqcuYGxlfCXYycHBICJhJ/2jcxdTFycQgJbGOU eLxmMSuEc4FRYvWGnywgVWwCGhJPV5xmArFFBCQkfvVfZQQpYha4zigxef0JsISwgK3EqttL 2UFsFgEViaur+8DivAKWEr92NLNBrJOXmHnpO1gNp4CVxNQTV5m7GDmAtllK3NyhAFEuKHFy 5hMWkPkSAlcYJbra/zFB9ApJnF58lhnEZhbQlli28DXzBEaBWUh6ZiFJLWBkWsUolJuZnJ1a lJmtV5BRWZKarJeSuokRGMiHJ6pf2sHYN8fjECMTB+MhRgkOZiUR3qidtxOEeFMSK6tSi/Lj i0pzUosPMUpzsCiJ827gLQkTEkhPLEnNTk0tSC2CyTJxcEo1ME5cmnl73oFpe2ak/n4rK6qf dYKpvu2grAiDx+8Gi0s/65SeZT59H3jg8dapUwsf/NVJ2GVlZlRxzmqJ6dR5kydu3lY2ReyV W8X3cvXQqKPSBz762R9Z7XTw+8xL6w0ev62Z3My/r9wsNG524aGN5xlSVT4sMMuKsbjd/rvo hDzje/W55Vt+VUgrsRRnJBpqMRcVJwIAv1VSb1ICAAA= 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 --- arch/arm/dts/imx8mp-evk-u-boot.dtsi | 39 +---------------- .../imx8mp-phyboard-pollux-rdk-u-boot.dtsi | 39 +---------------- arch/arm/dts/imx8mp-u-boot.dtsi | 42 +++++++++++++++++++ 3 files changed, 46 insertions(+), 74 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..cf10194fe4ab 100644 --- a/arch/arm/dts/imx8mp-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-evk-u-boot.dtsi @@ -3,6 +3,8 @@ * Copyright 2019 NXP */ +#include "imx8mp-u-boot.dtsi" + / { binman: binman { multiple-images; @@ -21,43 +23,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>; }; 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..92f586f6dfed --- /dev/null +++ b/arch/arm/dts/imx8mp-u-boot.dtsi @@ -0,0 +1,42 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (C) 2021 PHYTEC Messtechnik GmbH + * Author: Teresa Remmet + */ + +&{/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; +}; From patchwork Thu Jul 1 09:47:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 1499480 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=lPk5Si8g; 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 4GFtgQ600Sz9sVb for ; Thu, 1 Jul 2021 19:48:02 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7E6F18328F; Thu, 1 Jul 2021 11:47:39 +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="lPk5Si8g"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 651DD831F3; Thu, 1 Jul 2021 11:47:32 +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 6C36E8327E for ; Thu, 1 Jul 2021 11:47:22 +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=1625132842; x=1627724842; 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=pfKffnEqn0tMYePIScFGyG36s9mW9XNWTpYDTpLXOS0=; b=lPk5Si8g0klIbtFJBj4phYq/x1VTSkIv+AZ377uFqmraEs/YhYDtlM07M5pc8h+X PK5ad55JSkzWmewBqVp24XVGsGdvw5vPzfOdknyEj8MZh8DE+ndnQmdO5igu1Rf1 ENX6F7npt7AM6uXdvgeA8ypoYQ7Qt4LwEgAN4sSN5AE=; X-AuditID: c39127d2-a77bc70000001c5e-92-60dd8f2a081c Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 51.69.07262.A2F8DD06; Thu, 1 Jul 2021 11:47:22 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070111472208-1075052 ; Thu, 1 Jul 2021 11:47:22 +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 3/9] arm: dts: imx8mp-phyboard-pollux: Sync dts files with kernel Date: Thu, 1 Jul 2021 09:47:15 +0000 Message-Id: <20210701094721.3240071-4-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210701094721.3240071-1-t.remmet@phytec.de> References: <20210701094721.3240071-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 01.07.2021 11:47:22, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 01.07.2021 11:47:22 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPLMWRmVeSWpSXmKPExsWyRoCBS1er/26Cwe5NohYPr/pb7Lhzn9ni y6YJbBY/Vn1htWg/5WPxdm8nu8WUx+vZHdg91n68z+oxb9YJFo+ds+6ye5y9s4PRY+O7HUwB rFFcNimpOZllqUX6dglcGQf6G1kKlitWLPq1hrWBcYJMFyMnh4SAicT2a69Zuhi5OIQEtjFK 7Dy1lhHCucAocereLjaQKjYBDYmnK04zgdgiAhISv/qvghUxC1xnlJi8/gRYQlggUKJrxldG EJtFQEXi7f9OdhCbV8BSYvmOicwQ6+QlZl76DhbnFLCSmHriKlCcA2ibpcTNHQoQ5YISJ2c+ AbtIQuAKo0RX+z8miF4hidOLz4LNYRbQlli28DXzBEaBWUh6ZiFJLWBkWsUolJuZnJ1alJmt V5BRWZKarJeSuokRGMiHJ6pf2sHYN8fjECMTB+MhRgkOZiUR3qidtxOEeFMSK6tSi/Lji0pz UosPMUpzsCiJ827gLQkTEkhPLEnNTk0tSC2CyTJxcEo1MCb9WSkdv8WGiUUwaUvpvKLZm6dG V0xb6HjA8vXx6llGLJ+bJvxc5HH9qkBvRhu34pT+7T0TIk7mpnRGPbFpuffpkffCjuXKSawd z/jWFD9dfkO0X035TsxS0cedK23XB2Q8rwl8H/GltX3GYr6+D0vlart2CJxeOWvmbKl7G08m 1OrLcj7SyVBiKc5INNRiLipOBAChEoQsUgIAAA== 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 debug uart changes. Synced with kernel commit 846f752866bd ("arm64: dts: imx8mp-phyboard-pollux-rdk: Change debug UART") Signed-off-by: Teresa Remmet --- arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts | 58 ++++++++++++++++++--- arch/arm/dts/imx8mp-phycore-som.dtsi | 2 +- 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts b/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts index 0e1a6d953389..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 { @@ -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)>; @@ -71,9 +95,9 @@ }; /* debug console */ -&uart2 { +&uart1 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart2>; + pinctrl-0 = <&pinctrl_uart1>; status = "okay"; }; @@ -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 @@ -110,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/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 Thu Jul 1 09:47:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 1499481 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=iUlkmm2V; 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 4GFtgd2Ydzz9sVb for ; Thu, 1 Jul 2021 19:48:13 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 863738329B; Thu, 1 Jul 2021 11:47:42 +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="iUlkmm2V"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 02E3C832B2; Thu, 1 Jul 2021 11:47:35 +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 B9A7F83283 for ; Thu, 1 Jul 2021 11:47:22 +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=1625132842; x=1627724842; 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=lFhwSxrpzCUSbge0K+39lrCNqsEQFoD0INJj5uRBfeU=; b=iUlkmm2V2dzgcJT2Rtp3tLbvDs1d+J+cIeMexuugupaub2/g6qil7bJ/CuNPhVLW VLl/iClnQmvLygw/7mrG6UxnzVceYJzp9fCHhVS/ETFC/VYwujL6PsK/my8HhuQ3 KVAfIkODf3uGitu6BlbRYzi1NnMwCy45UZmzVWlxO6U=; X-AuditID: c39127d2-a9fbd70000001c5e-93-60dd8f2abd7b Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id D1.69.07262.A2F8DD06; Thu, 1 Jul 2021 11:47:22 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070111472232-1075053 ; Thu, 1 Jul 2021 11:47:22 +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 4/9] board: phytec: phycore_imx8mp: Change debug UART Date: Thu, 1 Jul 2021 09:47:16 +0000 Message-Id: <20210701094721.3240071-5-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210701094721.3240071-1-t.remmet@phytec.de> References: <20210701094721.3240071-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 01.07.2021 11:47:22, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 01.07.2021 11:47:22 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLLMWRmVeSWpSXmKPExsWyRoCBS1er/26CwafHqhYPr/pb7Lhzn9ni y6YJbBY/Vn1htWg/5WPxdm8nu8WUx+vZHdg91n68z+oxb9YJFo+ds+6ye5y9s4PRY+O7HUwB rFFcNimpOZllqUX6dglcGfc3trIU3BWreLVBoIFxq3AXIyeHhICJxJNzz9hAbCGBbYwSbUuc uhi5gOwLjBJLN9xlB0mwCWhIPF1xmgnEFhGQkPjVf5URpIhZ4DqjxOT1J8ASwgKuEtdbPzOD 2CwCKhI3bvSwgti8ApYSa85NZIbYJi8x89J3sKGcAlYSU09cBYpzAG2zlLi5QwGiXFDi5Mwn LCDzJQSuMEp0tf9jgugVkji9+CzYHGYBbYllC18zT2AUmIWkZxaS1AJGplWMQrmZydmpRZnZ egUZlSWpyXopqZsYgUF8eKL6pR2MfXM8DjEycTAeYpTgYFYS4Y3aeTtBiDclsbIqtSg/vqg0 J7X4EKM0B4uSOO8G3pIwIYH0xJLU7NTUgtQimCwTB6dUA2Pc5517LDbru9+yl6h5dF7A3uiu zpwW1pLz/xjY/du2fdzyIuDH0+1zb5kw7Qz60rlS6argt1Oq9WzzF/74J5In33A1Z+70hRbM Gycs4Zy85siWuSn7ti+ft76oOHyj+ZUKlmZue85DclZOz27s082VcmfQODXjWnLOrQ0BQnMe Tc5yb/tutGCrEktxRqKhFnNRcSIAM9Ty8FACAAA= 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 --- arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi | 4 ++-- board/phytec/phycore_imx8mp/spl.c | 6 +++--- include/configs/phycore_imx8mp.h | 4 ++-- 3 files changed, 7 insertions(+), 7 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/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 Thu Jul 1 09:47:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 1499482 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=EimB6krP; 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 4GFtgr4Hvfz9sWk for ; Thu, 1 Jul 2021 19:48:24 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 22C68832C2; Thu, 1 Jul 2021 11:47:46 +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="EimB6krP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B45998327E; Thu, 1 Jul 2021 11:47:35 +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 E31EB8328F for ; Thu, 1 Jul 2021 11:47:22 +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=1625132842; x=1627724842; 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=5gitCfcDXTmmFY7zF3Tj+wo6K7t3qb2AjdAbWIM25eQ=; b=EimB6krPD/19gBvWjXd7kWJ7NW5mIjYh2jAYrdjqNRhqu1LyVnC4O7v+n6pTnRwj iIqOUYQq5T9/h+KWTZAIvx5L/FsnBu0AJ0ukFYuu5SoxHWq+CkNdulzz18cJNtmE 86LlXIvBVmn9Jp2FeuhPUz3zBVp9xrOgie/NcVrSSo4=; X-AuditID: c39127d2-a77bc70000001c5e-94-60dd8f2a7b46 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 52.69.07262.A2F8DD06; Thu, 1 Jul 2021 11:47:22 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070111472257-1075054 ; Thu, 1 Jul 2021 11:47:22 +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 5/9] board: phytec: phycore_imx8mp: Add fec support Date: Thu, 1 Jul 2021 09:47:17 +0000 Message-Id: <20210701094721.3240071-6-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210701094721.3240071-1-t.remmet@phytec.de> References: <20210701094721.3240071-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 01.07.2021 11:47:22, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 01.07.2021 11:47:22 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHLMWRmVeSWpSXmKPExsWyRoCBS1er/26CwaZPxhYPr/pb7Lhzn9ni y6YJbBY/Vn1htWg/5WPxdm8nu8WUx+vZHdg91n68z+oxb9YJFo+ds+6ye5y9s4PRY+O7HUwB rFFcNimpOZllqUX6dglcGSsen2IuaJCrWLfXsoFxgmQXIyeHhICJxP6569i6GLk4hAS2MUrc /j6ZFcK5wCixd951RpAqNgENiacrTjOB2CICEhK/+q8yghQxC1xnlJi8/gRYQljAWWLJwn1g DSwCKhKfGyazgNi8ApYSp28dZ4JYJy8x89J3dhCbU8BKYuqJq8xdjBxA2ywlbu5QgCgXlDg5 8wkLyHwJgSuMEl3t/6B6hSROLz7LDGIzC2hLLFv4mnkCo8AsJD2zkKQWMDKtYhTKzUzOTi3K zNYryKgsSU3WS0ndxAgM48MT1S/tYOyb43GIkYmD8RCjBAezkghv1M7bCUK8KYmVValF+fFF pTmpxYcYpTlYlMR5N/CWhAkJpCeWpGanphakFsFkmTg4pRoY6w+0Xm2xnMFc2mVVvvTbySdb 9vmwfxDvEpCcEXBC+mLy1HALxoDHAfE/N93mWl4mecp3WpO61vwynhs/Gb5e0Q39vVQiI+zT 4wW5jO/l7n53KxFK3xl8u+NwUODzP3f/Jh2fdzDhQlLLgwVNBy9kWMmXqT8/6jQh6+ppvqJX RVM+7nhcXsHVosRSnJFoqMVcVJwIAKxtvEdRAgAA 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 --- board/phytec/phycore_imx8mp/phycore-imx8mp.c | 14 +++++++++++ configs/phycore-imx8mp_defconfig | 7 ++++++ include/configs/phycore_imx8mp.h | 25 ++++++++++++++++++++ 3 files changed, 46 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..9de89c58289b 100644 --- a/include/configs/phycore_imx8mp.h +++ b/include/configs/phycore_imx8mp.h @@ -42,6 +42,8 @@ "console=ttymxc0,115200\0" \ "fdt_addr=0x48000000\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "ip_dyn=yes\0" \ + "serverip=192.168.3.10\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ "mmcroot=2\0" \ @@ -57,6 +59,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 " \ @@ -103,4 +121,11 @@ /* I2C */ #define CONFIG_SYS_I2C_SPEED 100000 +/* ENET1 */ +#define CONFIG_ETHPRIME "FEC" +#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_MXC_PHYADDR 0 +#define FEC_QUIRK_ENET_MAC +#define IMX_FEC_BASE 0x30BE0000 + #endif /* __PHYCORE_IMX8MP_H */ From patchwork Thu Jul 1 09:47:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 1499484 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=nEMLMNxm; 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 4GFthH0XLTz9sWk for ; Thu, 1 Jul 2021 19:48:46 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7273B8328A; Thu, 1 Jul 2021 11:47:54 +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="nEMLMNxm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6A9D88326F; Thu, 1 Jul 2021 11:47:37 +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 4144983299 for ; Thu, 1 Jul 2021 11:47:23 +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=1625132843; x=1627724843; 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=3ZiGNxQTiGYAF1Go8GfD2kNFrVhw4wrBHzp4n4VWxug=; b=nEMLMNxmzzVR0WgM2ly28vgzAo3u/Kxvswq2ZV5lYiBy5CYyZu66fsD/RG7h3R4t dNxSyZ5u0/CAX3M0u4NE2+3823LMxgSqM11gMG8BD+3yKpxSWteuPZih30walAZr KJjAdNMo+GyFgivxVTgCA5pSy3QfYDMEVXGxxR/LkJ4=; X-AuditID: c39127d2-a9fbd70000001c5e-95-60dd8f2b6020 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id D2.69.07262.B2F8DD06; Thu, 1 Jul 2021 11:47:23 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070111472282-1075055 ; Thu, 1 Jul 2021 11:47:22 +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 6/9] board: phytec: phycore_imx8mp: Set VDD_ARM to 0,95V Date: Thu, 1 Jul 2021 09:47:18 +0000 Message-Id: <20210701094721.3240071-7-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210701094721.3240071-1-t.remmet@phytec.de> References: <20210701094721.3240071-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 01.07.2021 11:47:23, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 01.07.2021 11:47:23 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHLMWRmVeSWpSXmKPExsWyRoCBS1e7/26Cwfu57BYPr/pb7Lhzn9ni y6YJbBY/Vn1htWg/5WPxdm8nu8WUx+vZHdg91n68z+oxb9YJFo+ds+6ye5y9s4PRY+O7HUwB rFFcNimpOZllqUX6dglcGYv37mYsuMhfceXFGtYGxvO8XYwcHBICJhK7G+u6GLk4hAS2MUq8 +LmKCcK5wCgx/+M2IIeTg01AQ+LpitNgtoiAhMSv/quMIEXMAtcZJSavPwGWEBbwkNi4aBUr iM0ioCLROmkKmM0rYCkxcW4vmC0hIC8x89J3dhCbU8BKYuqJq8wgVwgB1dzcoQBRLihxcuYT FpD5EgJXGCUu3p3JBNErJHF68VlmEJtZQFti2cLXzBMYBWYh6ZmFJLWAkWkVo1BuZnJ2alFm tl5BRmVJarJeSuomRmAYH56ofmkHY98cj0OMTByMhxglOJiVRHijdt5OEOJNSaysSi3Kjy8q zUktPsQozcGiJM67gbckTEggPbEkNTs1tSC1CCbLxMEp1cCYYRAs0PVB7/e2B9mXt2dMfxQx 7ePhZcFH1lVtOLC++pz1qmRn7i2bErPC+6Qyp1RUPTH5fNEvrE6gYsEa260lFlv6TpqezlhR 9LFnYce9wyKc1xOnqlT7nXH9LfuYXd97i8p6dlOT7f9LO5Oet4i0+RhN3tEze3Hr522f1K4+ dxa+NUHrRMMSJZbijERDLeai4kQAQo5UhFECAAA= 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 --- 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 Thu Jul 1 09:47:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 1499486 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=UzI0T3IK; 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 4GFthZ3WdMz9sVb for ; Thu, 1 Jul 2021 19:49:02 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 32C2C832CD; Thu, 1 Jul 2021 11:47:59 +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="UzI0T3IK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C63B383265; Thu, 1 Jul 2021 11:47:38 +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 63C358329B for ; Thu, 1 Jul 2021 11:47:23 +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=1625132843; x=1627724843; 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=HTxotWQUxq0A3JRjVG48KpwjUxYL+7a8CbPdsHY5pqU=; b=UzI0T3IK3p7fa7/iYa6CteNnrVZVmUAeKuXWffY/4ffV0DlxteEc0Nz+Rdl8PkuF TL3Dw4WqPRH3KqGIwdxju9jPkItmGbE/ULKBa0NUny+Th5LmSjVxR+TBNAiGZ76J 8vuyioWYEEFjQMSemhO+bqx6JmUUbAf040fRpqY3Hc0=; X-AuditID: c39127d2-a77bc70000001c5e-96-60dd8f2bb858 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 53.69.07262.B2F8DD06; Thu, 1 Jul 2021 11:47:23 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070111472308-1075056 ; Thu, 1 Jul 2021 11:47:23 +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 7/9] board: phytec: phycore-imx8mp: Enable DVS1 control Date: Thu, 1 Jul 2021 09:47:19 +0000 Message-Id: <20210701094721.3240071-8-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210701094721.3240071-1-t.remmet@phytec.de> References: <20210701094721.3240071-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 01.07.2021 11:47:23, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 01.07.2021 11:47:23 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPLMWRmVeSWpSXmKPExsWyRoCBS1e7/26CwYddIhYPr/pb7Lhzn9ni y6YJbBY/Vn1htWg/5WPxdm8nu8WUx+vZHdg91n68z+oxb9YJFo+ds+6ye5y9s4PRY+O7HUwB rFFcNimpOZllqUX6dglcGQdm9TAXHGCvOP5qE0sD4162LkZODgkBE4nVe+cA2VwcQgLbGCV6 3xxggnAuMEocPzmFHaSKTUBD4umK00wgtoiAhMSv/quMIEXMAtcZJSavPwGWEBZwlzjz/BXY WBYBFYm3j1eygti8ApYSE488hFonLzHz0newoZwCVhJTT1xl7mLkANpmKXFzhwJEuaDEyZlP WEDmSwhcYZS4eHcmE0SvkMTpxWeZQWxmAW2JZQtfM09gFJiFpGcWktQCRqZVjEK5mcnZqUWZ 2XoFGZUlqcl6KambGIGBfHii+qUdjH1zPA4xMnEwHmKU4GBWEuGN2nk7QYg3JbGyKrUoP76o NCe1+BCjNAeLkjjvBt6SMCGB9MSS1OzU1ILUIpgsEwenVAPjTjkb82vR+/jiNm6c3b9kWvac 3Snxt2MYNx1o3mX8nDmIx3hLbuJr07cHvttnvNsnvVRz4odmtX7miq9adqZnbmx7wVx6P3Lp 3qkf3CRmZb3YN8P7m7fvxZPG/Ef31fT+nBM8y3l/73nPq9z7emV5zObm9EW0bDl8u4UtwnXu tOrTs7QEY+zKlFiKMxINtZiLihMBBczDl1ICAAA= 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 --- 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 Thu Jul 1 09:47:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 1499485 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=RqhYjdE3; 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 4GFthN5jMMz9sWk for ; Thu, 1 Jul 2021 19:48:52 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E5515832B1; Thu, 1 Jul 2021 11:47:56 +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="RqhYjdE3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 21D62832B2; Thu, 1 Jul 2021 11:47:40 +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 A43CF832A1 for ; Thu, 1 Jul 2021 11:47:23 +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=1625132843; x=1627724843; 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=raLE1HL1RBZH3S9IyDqD5Juy4rA+4rkZV4DESq8r7n0=; b=RqhYjdE3hKo2liDhWiUKhITradxo+H7rSqea26qOxsdyIf53jNb5TBlfsxA2ns9a Z1blMUQ1gRPS+8abOfFHOlVmTjyb/Z8Uhd32Ucayfqs1dWDQa7oixZKvintbdtV1 UJQsGV8tm7dEydUqA2c2Hwx+5lVQFOF7Ca4BqXghX+Y=; X-AuditID: c39127d2-a9fbd70000001c5e-97-60dd8f2b20d3 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id D3.69.07262.B2F8DD06; Thu, 1 Jul 2021 11:47:23 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070111472332-1075057 ; Thu, 1 Jul 2021 11:47:23 +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 8/9] arm: dts: imx8mp-phyboard-pollux-rdk-u-boot: Add wdog pinctrl entry Date: Thu, 1 Jul 2021 09:47:20 +0000 Message-Id: <20210701094721.3240071-9-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210701094721.3240071-1-t.remmet@phytec.de> References: <20210701094721.3240071-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 01.07.2021 11:47:23, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 01.07.2021 11:47:23 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLLMWRmVeSWpSXmKPExsWyRoCBS1e7/26CwaOnKhYPr/pb7Lhzn9ni y6YJbBY/Vn1htWg/5WPxdm8nu8WUx+vZHdg91n68z+oxb9YJFo+ds+6ye5y9s4PRY+O7HUwB rFFcNimpOZllqUX6dglcGZeu+Ba8ZqmY8juxgXESSxcjJ4eEgInEjutTmboYuTiEBLYxSvxr /Q3lXGCUaN4/FayKTUBD4umK00wgtoiAhMSv/quMIEXMAtcZJSavPwGWEBaIkDgy8SYziM0i oCKxeecyNhCbV8BSYv3LM8wQ6+QlZl76zg5icwpYSUw9cRUozgG0zVLi5g4FiHJBiZMzn7CA zJcQuMIocfHuTCaIXiGJ04vPgs1hFtCWWLbwNfMERoFZSHpmIUktYGRaxSiUm5mcnVqUma1X kFFZkpqsl5K6iREYxIcnql/awdg3x+MQIxMH4yFGCQ5mJRHeqJ23E4R4UxIrq1KL8uOLSnNS iw8xSnOwKInzbuAtCRMSSE8sSc1OTS1ILYLJMnFwSjUwLrXT8Hu67VFXhGeu2R9Fy00BTw/X cjPxNK65c73371adFb0mDDFaV183eU6WYNySYJ1Vti+67ZMnx474mdOWTnoRlzjl2+lGY8Fu 4TUTzupabP5393bgq6f/zoWpCa1JvvHoU2m0v8eDRX7Hbgj3b/2RIi6t9EbM6KyH157QpOVC N35PmC1crsRSnJFoqMVcVJwIANvMst9QAgAA 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 --- 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 Thu Jul 1 09:47:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Remmet X-Patchwork-Id: 1499487 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=DWacHHCz; 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 4GFthm2GKBz9sVb for ; Thu, 1 Jul 2021 19:49:12 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0F534832D3; Thu, 1 Jul 2021 11:48:02 +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="DWacHHCz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9255B832C5; Thu, 1 Jul 2021 11:47:45 +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 E9AB8832A5 for ; Thu, 1 Jul 2021 11:47:23 +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=1625132843; x=1627724843; 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=ICV1QtxrldRJ92ZyGTS/+UYRH740HntUzfu6nO6EHrY=; b=DWacHHCzimYuXbi6Y/l8qO9/GfXYqJ3j/f5FyfVPaSxK01aDZz+wjsARlOSn+Jrc 2V4ddwaUTZY7NonwhjDfzWEkVLKAjLfdes/+6oQEkeYwXM2XKHXQ/tDyCXruyxzl iwfKNrUwcdFDBjolBQp+tvfLtoJnyjOA+R8tHXJhFSg=; X-AuditID: c39127d2-a9fbd70000001c5e-99-60dd8f2bdc0f Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 54.69.07262.B2F8DD06; Thu, 1 Jul 2021 11:47:23 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070111472357-1075058 ; Thu, 1 Jul 2021 11:47:23 +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 9/9] board: phytec: imx8mp-phycore: Switch to binman Date: Thu, 1 Jul 2021 09:47:21 +0000 Message-Id: <20210701094721.3240071-10-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210701094721.3240071-1-t.remmet@phytec.de> References: <20210701094721.3240071-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 01.07.2021 11:47:23, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 01.07.2021 11:47:23 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDLMWRmVeSWpSXmKPExsWyRoCBS1e7/26CwYJ3phYPr/pb7Lhzn9ni y6YJbBY/Vn1htWg/5WPxdm8nu8WUx+vZHdg91n68z+oxb9YJFo+ds+6ye5y9s4PRY+O7HUwB rFFcNimpOZllqUX6dglcGfu2OxR8Vq1Y92QjYwPjGrkuRk4OCQETiddL/jB2MXJxCAlsY5R4 9PcKK4RzgVHi1dcjLCBVbAIaEk9XnGYCsUUEJCR+9V8F62AWuM4oMXn9CaAEB4ewgItE245S kBoWARWJV1vamUHCvAJWEkc36kEsk5eYeek7O4jNCRSeeuIqWImQgKXEzR0KIGFeAUGJkzOf sIBMlxC4wihx8e5MJoheIYnTi88yg9jMAtoSyxa+Zp7AKDALSc8sJKkFjEyrGIVyM5OzU4sy s/UKMipLUpP1UlI3MQJD+PBE9Us7GPvmeBxiZOJgPMQowcGsJMIbtfN2ghBvSmJlVWpRfnxR aU5q8SFGaQ4WJXHeDbwlYUIC6YklqdmpqQWpRTBZJg5OqQbGDbbTE+PXLNaumB484cj1v4t2 bvkj/lzy5WWOjBMrXTKnWdWJOJ3KX856unsDb9SDYx3eqcVugtE2MX/1HnKvinVy2Ny8MNv6 cWHwN6+pFg/l9nR15GXnHpuc0NotstTn7Ov9Epsf/5r8ZdbOt83Tjn9dzxtu+Kryiol/+48+ RxuxsN5ZP6MblFiKMxINtZiLihMBHv/PR08CAAA= 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 --- .../imx8mp-phyboard-pollux-rdk-u-boot.dtsi | 105 ++++++++++++++++++ arch/arm/mach-imx/imx8m/Kconfig | 1 + .../phytec/phycore_imx8mp/imximage-8mp-sd.cfg | 10 ++ configs/phycore-imx8mp_defconfig | 4 +- 4 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg 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 dbc48dfb4841..2b8e77cb27c5 100644 --- a/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi @@ -7,6 +7,10 @@ #include "imx8mp-u-boot.dtsi" / { + binman: binman { + multiple-images; + }; + wdt-reboot { compatible = "wdt-reboot"; wdt = <&wdog1>; @@ -81,3 +85,104 @@ &wdog1 { 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"; + }; + }; + }; + }; +}; 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