Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F37F1C07E95 for ; Wed, 7 Jul 2021 12:59:03 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 598D460725 for ; Wed, 7 Jul 2021 12:59:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 598D460725 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de 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) 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 Content-Transfer-Encoding: quoted-printable 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=5Fimx8mp/spl.c | 6 +++--- include/configs/phycore=5Fimx8mp.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; }; =20 -&pinctrl=5Fuart2 { +&pinctrl=5Fuart1 { u-boot,dm-spl; }; =20 @@ -54,7 +54,7 @@ u-boot,dm-spl; }; =20 -&uart2 { +&uart1 { u-boot,dm-spl; }; =20 diff --git a/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts b/arch/arm/dts/imx= 8mp-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"; =20 chosen { - stdout-path =3D &uart2; + stdout-path =3D &uart1; }; =20 reg=5Fusdhc2=5Fvmmc: regulator-usdhc2 { @@ -95,9 +95,9 @@ }; =20 /* debug console */ -&uart2 { +&uart1 { pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl=5Fuart2>; + pinctrl-0 =3D <&pinctrl=5Fuart1>; status =3D "okay"; }; =20 @@ -154,10 +154,10 @@ >; }; =20 - pinctrl=5Fuart2: uart2grp { + pinctrl=5Fuart1: uart1grp { fsl,pins =3D < - MX8MP=5FIOMUXC=5FUART2=5FRXD=5F=5FUART2=5FDCE=5FRX 0x49 - MX8MP=5FIOMUXC=5FUART2=5FTXD=5F=5FUART2=5FDCE=5FTX 0x49 + MX8MP=5FIOMUXC=5FUART1=5FRXD=5F=5FUART1=5FDCE=5FRX 0x49 + MX8MP=5FIOMUXC=5FUART1=5FTXD=5F=5FUART1=5FDCE=5FTX 0x49 >; }; =20 diff --git a/board/phytec/phycore=5Fimx8mp/spl.c b/board/phytec/phycore=5Fi= mx8mp/spl.c index f9fa8d1e1281..0bc4c7693b06 100644 --- a/board/phytec/phycore=5Fimx8mp/spl.c +++ b/board/phytec/phycore=5Fimx8mp/spl.c @@ -80,8 +80,8 @@ int board=5Ffit=5Fconfig=5Fname=5Fmatch(const char *name) #define WDOG=5FPAD=5FCTRL (PAD=5FCTL=5FDSE6 | PAD=5FCTL=5FODE | PAD=5FCT= L=5FPUE | PAD=5FCTL=5FPE) =20 static iomux=5Fv3=5Fcfg=5Ft const uart=5Fpads[] =3D { - MX8MP=5FPAD=5FUART2=5FRXD=5F=5FUART2=5FDCE=5FRX | MUX=5FPAD=5FCTRL(UART= =5FPAD=5FCTRL), - MX8MP=5FPAD=5FUART2=5FTXD=5F=5FUART2=5FDCE=5FTX | MUX=5FPAD=5FCTRL(UART= =5FPAD=5FCTRL), + MX8MP=5FPAD=5FUART1=5FRXD=5F=5FUART1=5FDCE=5FRX | MUX=5FPAD=5FCTRL(UART= =5FPAD=5FCTRL), + MX8MP=5FPAD=5FUART1=5FTXD=5F=5FUART1=5FDCE=5FTX | MUX=5FPAD=5FCTRL(UART= =5FPAD=5FCTRL), }; =20 static iomux=5Fv3=5Fcfg=5Ft const wdog=5Fpads[] =3D { @@ -107,7 +107,7 @@ void board=5Finit=5Ff(ulong dummy) =20 arch=5Fcpu=5Finit(); =20 - init=5Fuart=5Fclk(1); + init=5Fuart=5Fclk(0); =20 board=5Fearly=5Finit=5Ff(); =20 diff --git a/include/configs/phycore=5Fimx8mp.h b/include/configs/phycore= =5Fimx8mp.h index 04900498507a..e24f223c21d3 100644 --- a/include/configs/phycore=5Fimx8mp.h +++ b/include/configs/phycore=5Fimx8mp.h @@ -39,7 +39,7 @@ =20 #define CONFIG=5FEXTRA=5FENV=5FSETTINGS \ "image=3DImage\0" \ - "console=3Dttymxc1,115200\0" \ + "console=3Dttymxc0,115200\0" \ "fdt=5Faddr=3D0x48000000\0" \ "fdt=5Ffile=3D" CONFIG=5FDEFAULT=5FFDT=5FFILE "\0" \ "mmcdev=3D" =5F=5Fstringify(CONFIG=5FSYS=5FMMC=5FENV=5FDEV) "\0" \ @@ -87,7 +87,7 @@ #define PHYS=5FSDRAM=5FSIZE 0x80000000 =20 /* UART */ -#define CONFIG=5FMXC=5FUART=5FBASE UART2=5FBASE=5FADDR +#define CONFIG=5FMXC=5FUART=5FBASE UART1=5FBASE=5FADDR =20 /* Monitor Command Prompt */ #define CONFIG=5FSYS=5FCBSIZE SZ=5F2K --=20 2.25.1