| From c058dfb69136d62f88ae8b121104bdb7ce2df03f Mon Sep 17 00:00:00 2001 |
| From: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> |
| Date: Tue, 16 Jun 2015 10:53:11 +0200 |
| Subject: ARM: sun6i: Support console on UART2 (GPG6/GPG7) |
| |
| |
| --- a/arch/arm/mach-sunxi/board.c |
| +++ b/arch/arm/mach-sunxi/board.c |
| @@ -129,6 +129,10 @@ static int gpio_init(void) |
| sunxi_gpio_set_cfgpin(SUNXI_GPG(3), SUN5I_GPG_UART1); |
| sunxi_gpio_set_cfgpin(SUNXI_GPG(4), SUN5I_GPG_UART1); |
| sunxi_gpio_set_pull(SUNXI_GPG(4), SUNXI_GPIO_PULL_UP); |
| +#elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN6I) |
| + sunxi_gpio_set_cfgpin(SUNXI_GPG(6), SUN6I_GPG_UART2); |
| + sunxi_gpio_set_cfgpin(SUNXI_GPG(7), SUN6I_GPG_UART2); |
| + sunxi_gpio_set_pull(SUNXI_GPG(7), SUNXI_GPIO_PULL_UP); |
| #elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN8I) |
| sunxi_gpio_set_cfgpin(SUNXI_GPB(0), SUN8I_GPB_UART2); |
| sunxi_gpio_set_cfgpin(SUNXI_GPB(1), SUN8I_GPB_UART2); |
| --- a/include/configs/sunxi-common.h |
| +++ b/include/configs/sunxi-common.h |
| @@ -244,6 +244,8 @@ extern int soft_i2c_gpio_scl; |
| #endif |
| #elif CONFIG_CONS_INDEX == 2 && defined(CONFIG_MACH_SUN5I) |
| #define OF_STDOUT_PATH "/soc@01c00000/serial@01c28400:115200" |
| +#elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN6I) |
| +#define OF_STDOUT_PATH "/soc@01c00000/serial@01c28800:115200" |
| #elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN8I) |
| #define OF_STDOUT_PATH "/soc@01c00000/serial@01c28800:115200" |
| #elif CONFIG_CONS_INDEX == 5 && defined(CONFIG_MACH_SUN8I) |