[22/27] sunxi: suniv: allow serial connection on uart1

Message ID	20210725231636.879913-23-me@yifangu.com
State	Deferred
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Yifan Gu <me@yifangu.com> To: u-boot@lists.denx.de Cc: Yifan Gu <me@yifangu.com>, Jagan Teki <jagan@amarulasolutions.com>, Andre Przywara <andre.przywara@arm.com>, Icenowy Zheng <icenowy@aosc.io>, George Hilliard <thirtythreeforty@gmail.com> Subject: [PATCH 22/27] sunxi: suniv: allow serial connection on uart1 Date: Sun, 25 Jul 2021 19:16:31 -0400 Message-Id: <20210725231636.879913-23-me@yifangu.com> In-Reply-To: <20210725231636.879913-1-me@yifangu.com> References: <20210725231636.879913-1-me@yifangu.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	Add F1C100s based PocketGo handheld support \| expand [00/27] Add F1C100s based PocketGo handheld support [01/27] arm: arm926ejs: start.S: port save_boot_params support from armv7 code [02/27] arm: arm926ej-s: add sunxi code [03/27] sunxi: add support for suniv architecture [04/27] sunxi: suniv: add support for Lichee Pi Nano [05/27] sunxi: suniv: add boot sequence for SPL to try [06/27] sunxi: spi-spl: add support for SUNIV [07/27] sunxi: add SPI0 node for suniv [08/27] sunxi: enable SPI NOR on Lichee Pi Nano [09/27] sunxi: add defconfig for Lichee Pi Nano with SPI Flash support [10/27] sunxi: add support for UART at PF for suniv [11/27] sunxi: do not set PF MMC0 pinmux when PF uart is used [12/27] sunxi: allow to enable MMC driver when using PF UART0 [13/27] sunxi: Don't provide enable_cache() on suniv [14/27] sunxi: implement clock driver for suniv f1c100s [15/27] sunxi: gpio: Add support for suniv-f1c100s [16/27] sunxi: spi: restore bus speed and mode after reset [17/27] sunxi: spi: Add suniv pin controller support [18/27] sunxi: suniv: add device tree nodes for f1c100s MMC controllers [19/27] arm: dts: sunxi: do not renumber if mmc2 does not exist [20/27] board: licheepi_nano: set CONFIG_MMC_SUNXI_SLOT_EXTRA [21/27] sunxi: suniv: add missing header include for udelay [22/27] sunxi: suniv: allow serial connection on uart1 [23/27] sunxi: suniv: do not detect boot sector on suniv [24/27] sunxi: suniv: set SYS_TEXT_BASE default [25/27] sunxi: suniv: disable mmc optimization for suniv [26/27] arm: dts: suniv: define uart1 pins [27/27] arm: dts: add pocketgo handheld support

Message ID

20210725231636.879913-23-me@yifangu.com

State

Deferred

Delegated to:

Tom Rini

Headers

From: Yifan Gu <me@yifangu.com>
To: u-boot@lists.denx.de
Cc: Yifan Gu <me@yifangu.com>, Jagan Teki <jagan@amarulasolutions.com>,
 Andre Przywara <andre.przywara@arm.com>, Icenowy Zheng <icenowy@aosc.io>,
 George Hilliard <thirtythreeforty@gmail.com>
Subject: [PATCH 22/27] sunxi: suniv: allow serial connection on uart1
Date: Sun, 25 Jul 2021 19:16:31 -0400
Message-Id: <20210725231636.879913-23-me@yifangu.com>
In-Reply-To: <20210725231636.879913-1-me@yifangu.com>
References: <20210725231636.879913-1-me@yifangu.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

Add F1C100s based PocketGo handheld support | expand

Commit Message

Yifan Gu July 25, 2021, 11:16 p.m. UTC

Signed-off-by: Yifan Gu <me@yifangu.com>
---
 arch/arm/include/asm/arch-sunxi/gpio.h | 1 +
 arch/arm/mach-sunxi/board.c            | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h
index 26c900fb11..2b03325adf 100644
--- a/arch/arm/include/asm/arch-sunxi/gpio.h
+++ b/arch/arm/include/asm/arch-sunxi/gpio.h
@@ -180,6 +180,7 @@  enum sunxi_gpio_number {
 #define SUNXI_GPD_PWM		2
 
 #define SUNIV_GPE_UART0		5
+#define SUNIV_GPA_UART1		5
 #define SUN5I_GPE_SDC2		3
 #define SUN8I_GPE_TWI2		3
 #define SUN50I_GPE_TWI2		3
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
index 6dd2c6a4d8..7fa44b6f3a 100644
--- a/arch/arm/mach-sunxi/board.c
+++ b/arch/arm/mach-sunxi/board.c
@@ -100,6 +100,10 @@  static int gpio_init(void)
 	sunxi_gpio_set_cfgpin(SUNXI_GPE(0), SUNIV_GPE_UART0);
 	sunxi_gpio_set_cfgpin(SUNXI_GPE(1), SUNIV_GPE_UART0);
 	sunxi_gpio_set_pull(SUNXI_GPE(1), SUNXI_GPIO_PULL_UP);
+#elif CONFIG_CONS_INDEX == 2 && defined(CONFIG_MACH_SUNIV)
+	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(2), SUNXI_GPIO_PULL_UP);
 #elif CONFIG_CONS_INDEX == 1 && (defined(CONFIG_MACH_SUN4I) || \
 				 defined(CONFIG_MACH_SUN7I) || \
 				 defined(CONFIG_MACH_SUN8I_R40))

[22/27] sunxi: suniv: allow serial connection on uart1

Commit Message

Patch