From 6b0338df6742b0c4a98e15da6dedaa62fc4896c5 Mon Sep 17 00:00:00 2001 From: Piotr Dymacz Date: Mon, 27 Nov 2017 11:51:57 +0100 Subject: [PATCH] Include GPIO29 in GPIO JTAG mask for AR933x GPIO29 in AR933x is shared with JTAG TCK signal (pin A53). --- u-boot/cpu/mips/ar7240/qca_gpio_init.S | 2 +- u-boot/include/soc/qca_soc_common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/u-boot/cpu/mips/ar7240/qca_gpio_init.S b/u-boot/cpu/mips/ar7240/qca_gpio_init.S index 70c5c5c..2684870 100644 --- a/u-boot/cpu/mips/ar7240/qca_gpio_init.S +++ b/u-boot/cpu/mips/ar7240/qca_gpio_init.S @@ -571,7 +571,7 @@ lowlevel_gpio_init: */ #if (SOC_TYPE & QCA_AR933X_SOC) - /* Sanity check for JTAG pins (GPIO 6~8) */ + /* Sanity check for JTAG pins (GPIO 6~8, 29) */ #if defined(CONFIG_SKIP_LOWLEVEL_INIT) ||\ defined(CONFIG_QCA_KEEP_JTAG_ENABLED) #if defined(_GPIO_MASK_IN) diff --git a/u-boot/include/soc/qca_soc_common.h b/u-boot/include/soc/qca_soc_common.h index b5ed075..cb78265 100644 --- a/u-boot/include/soc/qca_soc_common.h +++ b/u-boot/include/soc/qca_soc_common.h @@ -564,7 +564,7 @@ /* JTAG GPIO pin mask */ #if (SOC_TYPE & QCA_AR933X_SOC) - #define QCA_GPIO_JTAG_MASK 0x001C0 /* GPIO6~8 */ + #define QCA_GPIO_JTAG_MASK 0x200001C0 /* GPIO6~8, GPIO29 */ #elif (SOC_TYPE & QCA_QCA956X_SOC) #define QCA_GPIO_JTAG_MASK 0x3C000 /* GPIO14~17 */ #else -- 2.25.1