Include GPIO29 in GPIO JTAG mask for AR933x

GPIO29 in AR933x is shared with JTAG TCK signal (pin A53).

diff --git a/u-boot/cpu/mips/ar7240/qca_gpio_init.S b/u-boot/cpu/mips/ar7240/qca_gpio_init.S
index 70c5c5c69a5543385282299c0c544d2f4b71892a..26848704629f34daea57d5806c1cae46e1b414e1 100644 (file)
--- 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 b5ed0757ae868582b82572120e79a2cfae4098e2..cb782659eabc733c1efa78a360b58f4fcf33c1e7 100644 (file)
--- 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