From patchwork Wed Mar 13 05:33:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: lhdjply@126.com X-Patchwork-Id: 1911662 X-Patchwork-Delegate: andre.przywara@arm.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=126.com header.i=@126.com header.a=rsa-sha256 header.s=s110527 header.b=FR/uv5P8; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TvnW30L5bz1ydl for ; Wed, 13 Mar 2024 21:56:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CFA9387E75; Wed, 13 Mar 2024 11:56:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=126.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=126.com header.i=@126.com header.b="FR/uv5P8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1F59A87DCC; Wed, 13 Mar 2024 06:34:01 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from m16.mail.126.com (m16.mail.126.com [220.197.31.6]) by phobos.denx.de (Postfix) with ESMTP id 049E38780E for ; Wed, 13 Mar 2024 06:33:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=126.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=lhdjply@126.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=iCqBE ZouHL0XohFhFF6XKCGp4lqpmToK/lZhEY7F8u8=; b=FR/uv5P8e8ebvI9FmlXhQ H26fQ19EOmQzkofm5qTawg5zQ1j/X/008zeRIZhje3NFs+xnTkMdvbcUEsq3wm6B lXYxKzpsDWp9K7PTIhLgk0wuoVkvLqGOXzFbpuS5BeeGoygIWNtmXaChspg/Y7MS yVjmRN4ibI9EFWjPBo9T8I= Received: from localhost.localdomain (unknown [115.221.220.140]) by gzga-smtp-mta-g0-4 (Coremail) with SMTP id _____wD33yCzOvFlPGTgAA--.17848S2; Wed, 13 Mar 2024 13:33:40 +0800 (CST) From: lhdjply@126.com To: jagan@amarulasolutions.com, andre.przywara@arm.com, trini@konsulko.com Cc: u-boot@lists.denx.de, lhdjply Subject: [PATCH] arm:suniv:complete the serial port configuration of Suniv Date: Wed, 13 Mar 2024 13:33:23 +0800 Message-Id: <20240313053323.282856-1-lhdjply@126.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CM-TRANSID: _____wD33yCzOvFlPGTgAA--.17848S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxJrWfKr1fWw1fAF45XFy5Arb_yoW8CrW7p3 W7Za4agr15WF4a9FWxAw4Ivr45Ja1UJwnrKwnrJayjv3WDGw48Jr1rKrn8Cw1FvrZ3Zw4f WF1kWa15X34DZ3JanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UzxRgUUUUU= X-Originating-IP: [115.221.220.140] X-CM-SenderInfo: hokgy1lo16ij2wof0z/1tbiYBeg2mV20IGn7gAAsG X-Mailman-Approved-At: Wed, 13 Mar 2024 11:56:10 +0100 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.8 at phobos.denx.de X-Virus-Status: Clean From: lhdjply 111 Signed-off-by: lhdjply --- arch/arm/mach-sunxi/board.c | 4 ++-- include/sunxi_gpio.h | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index f4dbb2a740..b91c9629e4 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -151,8 +151,8 @@ static int gpio_init(void) sunxi_gpio_set_cfgpin(SUNXI_GPE(3), 6); sunxi_gpio_set_pull(SUNXI_GPE(3), SUNXI_GPIO_PULL_UP); #elif CONFIG_CONS_INDEX == 2 && defined(CONFIG_MACH_SUNIV) - sunxi_gpio_set_cfgpin(SUNXI_GPA(2), SUNIV_GPE_UART0); - sunxi_gpio_set_cfgpin(SUNXI_GPA(3), SUNIV_GPE_UART0); + sunxi_gpio_set_cfgpin(SUNXI_GPA(2), SUNIV_GPA_UART1); + sunxi_gpio_set_cfgpin(SUNXI_GPA(3), SUNIV_GPA_UART1); sunxi_gpio_set_pull(SUNXI_GPA(3), SUNXI_GPIO_PULL_UP); #elif CONFIG_CONS_INDEX == 2 && defined(CONFIG_MACH_SUN5I) sunxi_gpio_set_cfgpin(SUNXI_GPG(3), SUN5I_GPG_UART1); diff --git a/include/sunxi_gpio.h b/include/sunxi_gpio.h index db3742c039..51258e3dd9 100644 --- a/include/sunxi_gpio.h +++ b/include/sunxi_gpio.h @@ -108,6 +108,8 @@ enum sunxi_gpio_number { #define SUN8I_H3_GPA_UART0 2 #define SUN8I_H3_GPA_UART2 2 +#define SUNIV_GPA_UART1 5 + #define SUN4I_GPB_PWM 2 #define SUN4I_GPB_TWI0 2 #define SUN4I_GPB_TWI1 2 @@ -130,12 +132,16 @@ enum sunxi_gpio_number { #define SUNXI_GPD_LCD0 2 #define SUNXI_GPD_LVDS0 3 +#define SUNIV_GPD_UART1 3 +#define SUNIV_GPD_UART2 3 #define SUNIV_GPE_UART0 5 +#define SUNIV_GPE_UART2 3 #define SUNXI_GPF_SDC0 2 #define SUNXI_GPF_UART0 4 #define SUN8I_GPF_UART0 3 +#define SUNIV_GPF_UART0 3 #define SUN4I_GPG_SDC1 4 #define SUN5I_GPG_SDC1 2