101-sun6i-support-console-on-UART2.patch 1.5 KB

123456789101112131415161718192021222324252627282930
  1. From c058dfb69136d62f88ae8b121104bdb7ce2df03f Mon Sep 17 00:00:00 2001
  2. From: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
  3. Date: Tue, 16 Jun 2015 10:53:11 +0200
  4. Subject: ARM: sun6i: Support console on UART2 (GPG6/GPG7)
  5. --- a/arch/arm/cpu/armv7/sunxi/board.c
  6. +++ b/arch/arm/cpu/armv7/sunxi/board.c
  7. @@ -88,6 +88,10 @@ static int gpio_init(void)
  8. sunxi_gpio_set_cfgpin(SUNXI_GPG(3), SUN5I_GPG_UART1);
  9. sunxi_gpio_set_cfgpin(SUNXI_GPG(4), SUN5I_GPG_UART1);
  10. sunxi_gpio_set_pull(SUNXI_GPG(4), SUNXI_GPIO_PULL_UP);
  11. +#elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN6I)
  12. + sunxi_gpio_set_cfgpin(SUNXI_GPG(6), SUN6I_GPG_UART2);
  13. + sunxi_gpio_set_cfgpin(SUNXI_GPG(7), SUN6I_GPG_UART2);
  14. + sunxi_gpio_set_pull(SUNXI_GPG(7), SUNXI_GPIO_PULL_UP);
  15. #elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN8I)
  16. sunxi_gpio_set_cfgpin(SUNXI_GPB(0), SUN8I_GPB_UART2);
  17. sunxi_gpio_set_cfgpin(SUNXI_GPB(1), SUN8I_GPB_UART2);
  18. --- a/include/configs/sunxi-common.h
  19. +++ b/include/configs/sunxi-common.h
  20. @@ -260,6 +260,8 @@ extern int soft_i2c_gpio_scl;
  21. #endif
  22. #elif CONFIG_CONS_INDEX == 2 && defined(CONFIG_MACH_SUN5I)
  23. #define OF_STDOUT_PATH "/soc@01c00000/serial@01c28400:115200"
  24. +#elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN6I)
  25. +#define OF_STDOUT_PATH "/soc@01c00000/serial@01c28800:115200"
  26. #elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN8I)
  27. #define OF_STDOUT_PATH "/soc@01c00000/serial@01c28800:115200"
  28. #elif CONFIG_CONS_INDEX == 5 && defined(CONFIG_MACH_SUN8I)