You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by da...@apache.org on 2019/12/21 10:56:13 UTC
[incubator-nuttx] 05/05: imxrt106x:pinout add ALT 8
GPIO_GPT2_COMPARE3 & fix GPIO_GPT1_CAPTURE[1|2]
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 <Da...@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 */
Re: [incubator-nuttx] 05/05: imxrt106x:pinout add ALT 8
GPIO_GPT2_COMPARE3 & fix GPIO_GPT1_CAPTURE[1|2]
Posted by Gregory Nutt <sp...@gmail.com>.
> This is David's suggested workflow, but it still in the discussing or
> voting process?
> Before we get the approvement from community, we can't apply this
> process now because its' unfailr to other upcomming potential
> suggestion.
> So my suggestion is still to keep the old process: Greg review and
> commit the patch to master of ASF until we approve the new workflow.
I will not work with the Apache repositories.
Re: [incubator-nuttx] 05/05: imxrt106x:pinout add ALT 8
GPIO_GPT2_COMPARE3 & fix GPIO_GPT1_CAPTURE[1|2]
Posted by Gregory Nutt <sp...@gmail.com>.
> For opening a PR, usually you can just fork the repo and create a branch in
> the forked repo, and then open a PR. It is not necessary to create a branch
> in the original repo only for a PR.
>
> You can open a branch for a big feature, which usually needs a lot of
> commits and also a very long time before merge it back to master.
At one point, the PPMC agreed (without a vote) that all committers must
follow the same processes as all other contributors, that they must not
abuse their write privileges by circumventing the process that every
other contributor must follow. The typical contributor cannot create a
branch in the repository for the person contributions and neither should
committers.
Greg
Re: [incubator-nuttx] 05/05: imxrt106x:pinout add ALT 8
GPIO_GPT2_COMPARE3 & fix GPIO_GPT1_CAPTURE[1|2]
Posted by "张铎 (Duo Zhang)" <pa...@gmail.com>.
For opening a PR, usually you can just fork the repo and create a branch in
the forked repo, and then open a PR. It is not necessary to create a branch
in the original repo only for a PR.
You can open a branch for a big feature, which usually needs a lot of
commits and also a very long time before merge it back to master.
Thanks.
David Sidrane <Da...@nscdg.com> 于2019年12月21日周六 下午9:18写道：
> Fine with me Greg has the patches (we all do - it is in the email)
>
> Xiang did you look a the PR? There is important content in it that done not
> get conveyed in a patch.
>
> -----Original Message-----
> From: Xiang Xiao [mailto:xiaoxiang781216@gmail.com]
> Sent: Saturday, December 21, 2019 5:14 AM
> To: dev@nuttx.apache.org
> Subject: Re: [incubator-nuttx] 05/05: imxrt106x:pinout add ALT 8
> GPIO_GPT2_COMPARE3 & fix GPIO_GPT1_CAPTURE[1|2]
>
> This is David's suggested workflow, but it still in the discussing or
> voting process?
> Before we get the approvement from community, we can't apply this
> process now because its' unfailr to other upcomming potential
> suggestion.
> So my suggestion is still to keep the old process: Greg review and
> commit the patch to master of ASF until we approve the new workflow.
>
> On Sat, Dec 21, 2019 at 9:04 PM David Sidrane <Da...@nscdg.com>
> wrote:
> >
> > Ok. But that feels wrong. Aren't we going to have more than one set of
> > eyes
> > on things? I do make a lot of mistakes.
> >
> > I will let it sit a day and give a PMC member a chance to review it.
> >
> > -----Original Message-----
> > From: Gregory Nutt [mailto:spudaneco@gmail.com]
> > Sent: Saturday, December 21, 2019 4:56 AM
> > To: dev@nuttx.apache.org
> > Subject: Re: [incubator-nuttx] 05/05: imxrt106x:pinout add ALT 8
> > GPIO_GPT2_COMPARE3 & fix GPIO_GPT1_CAPTURE[1|2]
> >
> >
> > > Ut-oh It was not intended to be an abuse: This is how PR's or done all
> > > the
> > > GH projects I am on as a commiter.
> > > It is a branch in the repo so like you have always done with patches,
> > > you
> > > or
> > > any of the PMC)can make change to it if need be.
> > > It is PR to master in the same repo.
> > >
> > > The process is simple: review it (fix it if need be), merge it and
> > > delete
> > > the branch.
> > >
> > Then you should do that. I won't
>
RE: [incubator-nuttx] 05/05: imxrt106x:pinout add ALT 8
GPIO_GPT2_COMPARE3 & fix GPIO_GPT1_CAPTURE[1|2]
Posted by David Sidrane <Da...@nscdg.com>.
Fine with me Greg has the patches (we all do - it is in the email)
Xiang did you look a the PR? There is important content in it that done not
get conveyed in a patch.
-----Original Message-----
From: Xiang Xiao [mailto:xiaoxiang781216@gmail.com]
Sent: Saturday, December 21, 2019 5:14 AM
To: dev@nuttx.apache.org
Subject: Re: [incubator-nuttx] 05/05: imxrt106x:pinout add ALT 8
GPIO_GPT2_COMPARE3 & fix GPIO_GPT1_CAPTURE[1|2]
This is David's suggested workflow, but it still in the discussing or
voting process?
Before we get the approvement from community, we can't apply this
process now because its' unfailr to other upcomming potential
suggestion.
So my suggestion is still to keep the old process: Greg review and
commit the patch to master of ASF until we approve the new workflow.
On Sat, Dec 21, 2019 at 9:04 PM David Sidrane <Da...@nscdg.com>
wrote:
>
> Ok. But that feels wrong. Aren't we going to have more than one set of
> eyes
> on things? I do make a lot of mistakes.
>
> I will let it sit a day and give a PMC member a chance to review it.
>
> -----Original Message-----
> From: Gregory Nutt [mailto:spudaneco@gmail.com]
> Sent: Saturday, December 21, 2019 4:56 AM
> To: dev@nuttx.apache.org
> Subject: Re: [incubator-nuttx] 05/05: imxrt106x:pinout add ALT 8
> GPIO_GPT2_COMPARE3 & fix GPIO_GPT1_CAPTURE[1|2]
>
>
> > Ut-oh It was not intended to be an abuse: This is how PR's or done all
> > the
> > GH projects I am on as a commiter.
> > It is a branch in the repo so like you have always done with patches,
> > you
> > or
> > any of the PMC)can make change to it if need be.
> > It is PR to master in the same repo.
> >
> > The process is simple: review it (fix it if need be), merge it and
> > delete
> > the branch.
> >
> Then you should do that. I won't
Re: [incubator-nuttx] 05/05: imxrt106x:pinout add ALT 8
GPIO_GPT2_COMPARE3 & fix GPIO_GPT1_CAPTURE[1|2]
Posted by Xiang Xiao <xi...@gmail.com>.
This is David's suggested workflow, but it still in the discussing or
voting process?
Before we get the approvement from community, we can't apply this
process now because its' unfailr to other upcomming potential
suggestion.
So my suggestion is still to keep the old process: Greg review and
commit the patch to master of ASF until we approve the new workflow.
On Sat, Dec 21, 2019 at 9:04 PM David Sidrane <Da...@nscdg.com> wrote:
>
> Ok. But that feels wrong. Aren't we going to have more than one set of eyes
> on things? I do make a lot of mistakes.
>
> I will let it sit a day and give a PMC member a chance to review it.
>
> -----Original Message-----
> From: Gregory Nutt [mailto:spudaneco@gmail.com]
> Sent: Saturday, December 21, 2019 4:56 AM
> To: dev@nuttx.apache.org
> Subject: Re: [incubator-nuttx] 05/05: imxrt106x:pinout add ALT 8
> GPIO_GPT2_COMPARE3 & fix GPIO_GPT1_CAPTURE[1|2]
>
>
> > Ut-oh It was not intended to be an abuse: This is how PR's or done all the
> > GH projects I am on as a commiter.
> > It is a branch in the repo so like you have always done with patches, you
> > or
> > any of the PMC)can make change to it if need be.
> > It is PR to master in the same repo.
> >
> > The process is simple: review it (fix it if need be), merge it and delete
> > the branch.
> >
> Then you should do that. I won't
RE: [incubator-nuttx] 05/05: imxrt106x:pinout add ALT 8
GPIO_GPT2_COMPARE3 & fix GPIO_GPT1_CAPTURE[1|2]
Posted by David Sidrane <Da...@nscdg.com>.
Ok. But that feels wrong. Aren't we going to have more than one set of eyes
on things? I do make a lot of mistakes.
I will let it sit a day and give a PMC member a chance to review it.
-----Original Message-----
From: Gregory Nutt [mailto:spudaneco@gmail.com]
Sent: Saturday, December 21, 2019 4:56 AM
To: dev@nuttx.apache.org
Subject: Re: [incubator-nuttx] 05/05: imxrt106x:pinout add ALT 8
GPIO_GPT2_COMPARE3 & fix GPIO_GPT1_CAPTURE[1|2]
> Ut-oh It was not intended to be an abuse: This is how PR's or done all the
> GH projects I am on as a commiter.
> It is a branch in the repo so like you have always done with patches, you
> or
> any of the PMC)can make change to it if need be.
> It is PR to master in the same repo.
>
> The process is simple: review it (fix it if need be), merge it and delete
> the branch.
>
Then you should do that. I won't
Re: [incubator-nuttx] 05/05: imxrt106x:pinout add ALT 8
GPIO_GPT2_COMPARE3 & fix GPIO_GPT1_CAPTURE[1|2]
Posted by Gregory Nutt <sp...@gmail.com>.
> Ut-oh It was not intended to be an abuse: This is how PR's or done all the
> GH projects I am on as a commiter.
> It is a branch in the repo so like you have always done with patches, you or
> any of the PMC)can make change to it if need be.
> It is PR to master in the same repo.
>
> The process is simple: review it (fix it if need be), merge it and delete
> the branch.
>
Then you should do that. I won't
RE: [incubator-nuttx] 05/05: imxrt106x:pinout add ALT 8
GPIO_GPT2_COMPARE3 & fix GPIO_GPT1_CAPTURE[1|2]
Posted by David Sidrane <Da...@nscdg.com>.
Ut-oh It was not intended to be an abuse: This is how PR's or done all the
GH projects I am on as a commiter.
It is a branch in the repo so like you have always done with patches, you or
any of the PMC)can make change to it if need be.
It is PR to master in the same repo.
The process is simple: review it (fix it if need be), merge it and delete
the branch.
-----Original Message-----
From: Gregory Nutt [mailto:spudaneco@gmail.com]
Sent: Saturday, December 21, 2019 4:41 AM
To: dev@nuttx.apache.org
Subject: Re: [incubator-nuttx] 05/05: imxrt106x:pinout add ALT 8
GPIO_GPT2_COMPARE3 & fix GPIO_GPT1_CAPTURE[1|2]
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 dev@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, davids5@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 <Da...@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 */
>
>
Re: [incubator-nuttx] 05/05: imxrt106x:pinout add ALT 8
GPIO_GPT2_COMPARE3 & fix GPIO_GPT1_CAPTURE[1|2]
Posted by Gregory Nutt <sp...@gmail.com>.
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 dev@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, davids5@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 <Da...@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 */
>
>