So I am confused. It looks like you created a branch in the repository
and put all of you code there, bypassing patches and PRs. This seems a
bit of an abuse of your privileges. I though we agreed that all people,
including PPMC members and committers would have to follow the same work
flow.
True, we don't have a work flow in place yet, but all versions require
that changes be submitted as patches on d...@apache.org or as PRs.
I am not sure what do do with this now. I am not going to touch it.
You may as well merge it to master too.
Greg
On 12/21/2019 4:56 AM, davi...@apache.org wrote:
This is an automated email from the ASF dual-hosted git repository.
davids5 pushed a commit to branch master_imxrt
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 9b7afcdfe51bff99c35780d8cd1389ace8fc9318
Author: David Sidrane <david.sidr...@nscdg.com>
AuthorDate: Fri Dec 13 14:06:49 2019 -0800
imxrt106x:pinout add ALT 8 GPIO_GPT2_COMPARE3 & fix GPIO_GPT1_CAPTURE[1|2]
---
arch/arm/src/imxrt/hardware/rt106x/imxrt106x_pinmux.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_pinmux.h
b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_pinmux.h
index 2e00ddb..add5479 100644
--- a/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_pinmux.h
+++ b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_pinmux.h
@@ -521,9 +521,9 @@
/* General Purpose Timer (GPT) */
#define GPIO_GPT1_CAPTURE1_1 (GPIO_PERIPH | GPIO_ALT4 | GPIO_PADMUX(IMXRT_PADMUX_GPIO_EMC_24_INDEX))
-#define GPIO_GPT1_CAPTURE1_2 (GPIO_PERIPH | GPIO_ALT8 |
GPIO_PADMUX(IMXRT_PADMUX_GPIO_B0_05_INDEX))
+#define GPIO_GPT1_CAPTURE1_2 (GPIO_PERIPH | GPIO_ALT8 |
GPIO_PADMUX(IMXRT_PADMUX_GPIO_B1_05_INDEX))
#define GPIO_GPT1_CAPTURE2_1 (GPIO_PERIPH | GPIO_ALT4 |
GPIO_PADMUX(IMXRT_PADMUX_GPIO_EMC_23_INDEX))
-#define GPIO_GPT1_CAPTURE2_2 (GPIO_PERIPH | GPIO_ALT8 |
GPIO_PADMUX(IMXRT_PADMUX_GPIO_B0_06_INDEX))
+#define GPIO_GPT1_CAPTURE2_2 (GPIO_PERIPH | GPIO_ALT8 |
GPIO_PADMUX(IMXRT_PADMUX_GPIO_B1_06_INDEX))
#define GPIO_GPT1_CLK_1 (GPIO_PERIPH | GPIO_ALT1 |
GPIO_PADMUX(IMXRT_PADMUX_GPIO_AD_B0_13_INDEX))
#define GPIO_GPT1_COMPARE1_1 (GPIO_PERIPH | GPIO_ALT2 |
GPIO_PADMUX(IMXRT_PADMUX_GPIO_EMC_35_INDEX))
#define GPIO_GPT1_COMPARE2_1 (GPIO_PERIPH | GPIO_ALT2 |
GPIO_PADMUX(IMXRT_PADMUX_GPIO_EMC_36_INDEX))
@@ -534,6 +534,7 @@
#define GPIO_GPT2_CLK_1 (GPIO_PERIPH | GPIO_ALT7 |
GPIO_PADMUX(IMXRT_PADMUX_GPIO_AD_B0_09_INDEX))
#define GPIO_GPT2_COMPARE2_1 (GPIO_PERIPH | GPIO_ALT1 |
GPIO_PADMUX(IMXRT_PADMUX_GPIO_AD_B0_07_INDEX))
#define GPIO_GPT2_COMPARE3_1 (GPIO_PERIPH | GPIO_ALT1 |
GPIO_PADMUX(IMXRT_PADMUX_GPIO_AD_B0_08_INDEX))
+#define GPIO_GPT2_COMPARE3_2 (GPIO_PERIPH | GPIO_ALT8 |
GPIO_PADMUX(IMXRT_PADMUX_GPIO_AD_B1_07_INDEX))
/* JTAG */
