From patchwork Mon Sep 19 19:35:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1679641 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=BKscX/q5; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=wgf9csIK; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MWZfs4YHMz1ypH for ; Tue, 20 Sep 2022 05:36:19 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4985684A59; Mon, 19 Sep 2022 21:36:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1663616168; bh=dwLOnkaMdOfndaFd2OGhvU/huGPjbfLNNd2XL+pP8bc=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=BKscX/q5pOu/5g+o10/lqt91lUtUym465pvKZpszwtxJQpctmRasx5DVs8VA2ft32 K2fG2GYSf6y7hHqMlzOZpDfp7Y9No0JLwXB47ZhQEQ6r9MrEVzKkrcKOrddlh2ORmN nJT64bV5J3axiLulvxXnlFaVDDfzVALHccYvLZaDxfTB7aUKhOZXzzEBCF0ebcPCLa IjdxqQD8qP8PAxXe6/3VleXYSrKaHSuC4p4lH0gUNglptGuP1kNelV5TG18dIFABHF urAIAFLykVQDnTU0TChxU9zyz+JZ3LsAK53FSts6VMBNlcD1TOMNMfkPr+lGlcaHFQ qlF3pDECssj8Q== Received: from tr.lan (ip-86-49-12-201.bb.vodafone.cz [86.49.12.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id D520884A59; Mon, 19 Sep 2022 21:36:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1663616167; bh=dwLOnkaMdOfndaFd2OGhvU/huGPjbfLNNd2XL+pP8bc=; h=From:To:Cc:Subject:Date:From; b=wgf9csIKFBDoge0433QAgjBIPkUOhDZT7j7a7jDCLYbOaIdmRiM+VIECdBo5x+4N5 uYuHc2j//Gs03DScfAW47ixsljxp515asPIIfSQFgOk/WJZNlzduWtj0gDyPAPeL9A 83G2I2iTQxqs0zz89p+b9riyfOGbeGvT/CihXfEwXxvBimgE8JXNOAIqIohYNXEGE9 SjoADOubCSob0+1FBg4V0Xqy/6Q5YufzFSlroBGXrt87UfwPrgDk7T2HuJSHxe0Vd9 kM1bDz4aMucvTvPRYvsRYz5B4IXy7PRAUDm8TL0SSoiYFHaYQZf91YI1E881sGr2pI MNYLEDE007kdw== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Fabio Estevam , Marcel Ziswiler , Max Krummenacher , Peng Fan , Stefano Babic Subject: [PATCH] ARM: dts: imx8mm: Swap i.MX8M Mini Menlo board UARTs back Date: Mon, 19 Sep 2022 21:35:56 +0200 Message-Id: <20220919193556.97383-1-marex@denx.de> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.6 at phobos.denx.de X-Virus-Status: Clean The first production revision of the MX8M Mini Menlo board implements a hardware change which swaps console UART and another UART connector. Implement the swap, which maps the console UART back to the way Verdin console is mapped. Signed-off-by: Marek Vasut --- Cc: Fabio Estevam Cc: Marcel Ziswiler Cc: Max Krummenacher Cc: Peng Fan Cc: Stefano Babic --- arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi | 18 +----------------- board/menlo/mx8menlo/mx8menlo.c | 2 +- include/configs/imx8mm-mx8menlo.h | 2 +- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi b/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi index 66cc97842c0..484d493e33c 100644 --- a/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi @@ -6,7 +6,7 @@ / { chosen { - stdout-path = &uart2; + stdout-path = &uart1; }; aliases { @@ -20,19 +20,3 @@ &i2c4 { /delete-node/ codec@1a; }; - -&pinctrl_uart1 { - /delete-property/ u-boot,dm-spl; -}; - -&pinctrl_uart2 { - u-boot,dm-spl; -}; - -&uart1 { - /delete-property/ u-boot,dm-spl; -}; - -&uart2 { - u-boot,dm-spl; -}; diff --git a/board/menlo/mx8menlo/mx8menlo.c b/board/menlo/mx8menlo/mx8menlo.c index 61fc4ec85f0..18f5fd5c5ee 100644 --- a/board/menlo/mx8menlo/mx8menlo.c +++ b/board/menlo/mx8menlo/mx8menlo.c @@ -14,5 +14,5 @@ void board_early_init(void) { - init_uart_clk(1); + init_uart_clk(0); } diff --git a/include/configs/imx8mm-mx8menlo.h b/include/configs/imx8mm-mx8menlo.h index 530ecd1d460..938c5406b82 100644 --- a/include/configs/imx8mm-mx8menlo.h +++ b/include/configs/imx8mm-mx8menlo.h @@ -25,7 +25,7 @@ "fi ; " \ "boot\0" \ "boot_file=fitImage\0" \ - "console=ttymxc1\0" \ + "console=ttymxc0\0" \ "fdt_addr=0x43000000\0" \ "initrd_addr=0x43800000\0" \ "kernel_image=fitImage\0"