| Message ID | 20210804044033.3047296-1-hsinyi@chromium.org |
|---|---|
| State | Accepted |
| Commit | 3acd5d8b7cf614d8724986b0dbfee52b0944d027 |
| Headers | show |
| Series | [v4,1/3] arm: dts: mt8135: Move pinfunc to include/dt-bindings/pinctrl | expand |
Hi Linus, On 04/08/2021 06:40, Hsin-Yi Wang wrote: > Move mt8135-pinfunc.h into include/dt-bindings/pinctrl so that we can > include it in yaml examples. > > Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org> > --- > arch/arm/boot/dts/mt8135.dtsi | 2 +- > .../boot/dts => include/dt-bindings/pinctrl}/mt8135-pinfunc.h | 0 > 2 files changed, 1 insertion(+), 1 deletion(-) > rename {arch/arm/boot/dts => include/dt-bindings/pinctrl}/mt8135-pinfunc.h (100%) > If that's fine with you, I'll take patch 1+2 through my tree. IMHO the best for patch 3 would be to go through your tree. Sounds good? Regards, Matthias > diff --git a/arch/arm/boot/dts/mt8135.dtsi b/arch/arm/boot/dts/mt8135.dtsi > index 0e4e835026db0..a031b36363187 100644 > --- a/arch/arm/boot/dts/mt8135.dtsi > +++ b/arch/arm/boot/dts/mt8135.dtsi > @@ -9,7 +9,7 @@ > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/interrupt-controller/arm-gic.h> > #include <dt-bindings/reset/mt8135-resets.h> > -#include "mt8135-pinfunc.h" > +#include <dt-bindings/pinctrl/mt8135-pinfunc.h> > > / { > #address-cells = <2>; > diff --git a/arch/arm/boot/dts/mt8135-pinfunc.h b/include/dt-bindings/pinctrl/mt8135-pinfunc.h > similarity index 100% > rename from arch/arm/boot/dts/mt8135-pinfunc.h > rename to include/dt-bindings/pinctrl/mt8135-pinfunc.h >
On Thu, Aug 5, 2021 at 11:02 AM Matthias Brugger <matthias.bgg@gmail.com> wrote: > Hi Linus, > > On 04/08/2021 06:40, Hsin-Yi Wang wrote: > > Move mt8135-pinfunc.h into include/dt-bindings/pinctrl so that we can > > include it in yaml examples. > > > > Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org> > > --- > > arch/arm/boot/dts/mt8135.dtsi | 2 +- > > .../boot/dts => include/dt-bindings/pinctrl}/mt8135-pinfunc.h | 0 > > 2 files changed, 1 insertion(+), 1 deletion(-) > > rename {arch/arm/boot/dts => include/dt-bindings/pinctrl}/mt8135-pinfunc.h (100%) > > > > If that's fine with you, I'll take patch 1+2 through my tree. IMHO the best for > patch 3 would be to go through your tree. > > Sounds good? It can't be done that way. Patch 3 depends on patch 1+2 to get the include file into the right place for patch 3/3 to compile. (YAML check.) I will apply all three and then provide an immutable branch that you can pull in to your tree as well. This is usually what we do with cross-tree dependencies. Yours, Linus Walleij
Hi Hsin-Yi, Matthias, I have applied all three patches on this immutable branch: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/log/?h=ib-mt8135 Then I merged this branch into the pinctrl "devel" branch for v5.15. Matthias can pull the same branch into his MT SoC tree so that the hashes will match up in the merge window. No rebasing. The same patches will then come in to Torvalds in two ways with the same hashes and match perfectly. Yours, Linus Walleij
diff --git a/arch/arm/boot/dts/mt8135.dtsi b/arch/arm/boot/dts/mt8135.dtsi index 0e4e835026db0..a031b36363187 100644 --- a/arch/arm/boot/dts/mt8135.dtsi +++ b/arch/arm/boot/dts/mt8135.dtsi @@ -9,7 +9,7 @@ #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/reset/mt8135-resets.h> -#include "mt8135-pinfunc.h" +#include <dt-bindings/pinctrl/mt8135-pinfunc.h> / { #address-cells = <2>; diff --git a/arch/arm/boot/dts/mt8135-pinfunc.h b/include/dt-bindings/pinctrl/mt8135-pinfunc.h similarity index 100% rename from arch/arm/boot/dts/mt8135-pinfunc.h rename to include/dt-bindings/pinctrl/mt8135-pinfunc.h
Move mt8135-pinfunc.h into include/dt-bindings/pinctrl so that we can include it in yaml examples. Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org> --- arch/arm/boot/dts/mt8135.dtsi | 2 +- .../boot/dts => include/dt-bindings/pinctrl}/mt8135-pinfunc.h | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {arch/arm/boot/dts => include/dt-bindings/pinctrl}/mt8135-pinfunc.h (100%)