* [PATCH 1/3] dts: ARM: aspeed: Migrate away from aspeed,g[45].* compatibles
2019-07-24 8:13 [PATCH 0/3] ARM: dts: aspeed: Deprecate g[45]-style compatibles Andrew Jeffery
@ 2019-07-24 8:13 ` Andrew Jeffery
2019-07-24 8:13 ` [PATCH 2/3] pinctrl: aspeed: Document existence of deprecated compatibles Andrew Jeffery
` (2 subsequent siblings)
3 siblings, 0 replies; 15+ messages in thread
From: Andrew Jeffery @ 2019-07-24 8:13 UTC (permalink / raw)
To: linux-aspeed
Cc: Andrew Jeffery, lee.jones, robh+dt, mark.rutland, joel,
linus.walleij, devicetree, linux-arm-kernel, linux-kernel,
linux-gpio
Use the SoC-specific compatible strings instead.
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
arch/arm/boot/dts/aspeed-g4.dtsi | 2 +-
arch/arm/boot/dts/aspeed-g5.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index dd4b0b15afcf..7f06dc21dc19 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -162,7 +162,7 @@
#reset-cells = <1>;
pinctrl: pinctrl {
- compatible = "aspeed,g4-pinctrl";
+ compatible = "aspeed,ast2400-pinctrl";
};
p2a: p2a-control {
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 5b1ca265c2ce..04c97138e18b 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -215,7 +215,7 @@
#reset-cells = <1>;
pinctrl: pinctrl {
- compatible = "aspeed,g5-pinctrl";
+ compatible = "aspeed,ast2500-pinctrl";
aspeed,external-nodes = <&gfx &lhc>;
};
--
2.20.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/3] pinctrl: aspeed: Document existence of deprecated compatibles
2019-07-24 8:13 [PATCH 0/3] ARM: dts: aspeed: Deprecate g[45]-style compatibles Andrew Jeffery
2019-07-24 8:13 ` [PATCH 1/3] dts: ARM: aspeed: Migrate away from aspeed,g[45].* compatibles Andrew Jeffery
@ 2019-07-24 8:13 ` Andrew Jeffery
2019-08-05 10:47 ` Linus Walleij
2019-07-24 8:13 ` [PATCH 3/3] dt-bindings: aspeed: Remove mention " Andrew Jeffery
2019-07-29 21:53 ` [PATCH 0/3] ARM: dts: aspeed: Deprecate g[45]-style compatibles Linus Walleij
3 siblings, 1 reply; 15+ messages in thread
From: Andrew Jeffery @ 2019-07-24 8:13 UTC (permalink / raw)
To: linux-aspeed
Cc: Andrew Jeffery, lee.jones, robh+dt, mark.rutland, joel,
linus.walleij, devicetree, linux-arm-kernel, linux-kernel,
linux-gpio
Otherwise they look odd in the face of not being listed in the bindings
documents.
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 4 ++++
drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
index 384396cbb22d..0e087fe759d2 100644
--- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
@@ -2531,6 +2531,10 @@ static int aspeed_g4_pinctrl_probe(struct platform_device *pdev)
static const struct of_device_id aspeed_g4_pinctrl_of_match[] = {
{ .compatible = "aspeed,ast2400-pinctrl", },
+ /*
+ * The aspeed,g4-pinctrl compatible has been removed the from the
+ * bindings, but keep the match in case of old devicetrees.
+ */
{ .compatible = "aspeed,g4-pinctrl", },
{ },
};
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
index 053101f795a2..49255802735b 100644
--- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
@@ -2676,6 +2676,10 @@ static int aspeed_g5_pinctrl_probe(struct platform_device *pdev)
static const struct of_device_id aspeed_g5_pinctrl_of_match[] = {
{ .compatible = "aspeed,ast2500-pinctrl", },
+ /*
+ * The aspeed,g5-pinctrl compatible has been removed the from the
+ * bindings, but keep the match in case of old devicetrees.
+ */
{ .compatible = "aspeed,g5-pinctrl", },
{ },
};
--
2.20.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 2/3] pinctrl: aspeed: Document existence of deprecated compatibles
2019-07-24 8:13 ` [PATCH 2/3] pinctrl: aspeed: Document existence of deprecated compatibles Andrew Jeffery
@ 2019-08-05 10:47 ` Linus Walleij
0 siblings, 0 replies; 15+ messages in thread
From: Linus Walleij @ 2019-08-05 10:47 UTC (permalink / raw)
To: Andrew Jeffery
Cc: linux-aspeed, Lee Jones, Rob Herring, Mark Rutland, Joel Stanley,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Linux ARM, linux-kernel, open list:GPIO SUBSYSTEM
On Wed, Jul 24, 2019 at 10:13 AM Andrew Jeffery <andrew@aj.id.au> wrote:
> Otherwise they look odd in the face of not being listed in the bindings
> documents.
>
> Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Patch applied to the pinctrl tree.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 3/3] dt-bindings: aspeed: Remove mention of deprecated compatibles
2019-07-24 8:13 [PATCH 0/3] ARM: dts: aspeed: Deprecate g[45]-style compatibles Andrew Jeffery
2019-07-24 8:13 ` [PATCH 1/3] dts: ARM: aspeed: Migrate away from aspeed,g[45].* compatibles Andrew Jeffery
2019-07-24 8:13 ` [PATCH 2/3] pinctrl: aspeed: Document existence of deprecated compatibles Andrew Jeffery
@ 2019-07-24 8:13 ` Andrew Jeffery
2019-07-24 13:40 ` Rob Herring
2019-08-05 10:48 ` Linus Walleij
2019-07-29 21:53 ` [PATCH 0/3] ARM: dts: aspeed: Deprecate g[45]-style compatibles Linus Walleij
3 siblings, 2 replies; 15+ messages in thread
From: Andrew Jeffery @ 2019-07-24 8:13 UTC (permalink / raw)
To: linux-aspeed
Cc: Andrew Jeffery, lee.jones, robh+dt, mark.rutland, joel,
linus.walleij, devicetree, linux-arm-kernel, linux-kernel,
linux-gpio
Guide readers away from using the aspeed,g[45].* compatible patterns.
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
Documentation/devicetree/bindings/mfd/aspeed-scu.txt | 2 --
Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt | 2 --
.../devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 5 +----
.../devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 4 +---
4 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/Documentation/devicetree/bindings/mfd/aspeed-scu.txt b/Documentation/devicetree/bindings/mfd/aspeed-scu.txt
index ce8cf0ec6279..4d92c0bb6687 100644
--- a/Documentation/devicetree/bindings/mfd/aspeed-scu.txt
+++ b/Documentation/devicetree/bindings/mfd/aspeed-scu.txt
@@ -4,9 +4,7 @@ configuring elements such as clocks, pinmux, and reset.
Required properties:
- compatible: One of:
"aspeed,ast2400-scu", "syscon", "simple-mfd"
- "aspeed,g4-scu", "syscon", "simple-mfd"
"aspeed,ast2500-scu", "syscon", "simple-mfd"
- "aspeed,g5-scu", "syscon", "simple-mfd"
- reg: contains the offset and length of the SCU memory region
- #clock-cells: should be set to <1> - the system controller is also a
diff --git a/Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt b/Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt
index 854bd67ffec6..0e1fa5bc6a30 100644
--- a/Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt
+++ b/Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt
@@ -26,9 +26,7 @@ property:
- compatible : Should be one of the following:
"aspeed,ast2400-scu", "syscon", "simple-mfd"
- "aspeed,g4-scu", "syscon", "simple-mfd"
"aspeed,ast2500-scu", "syscon", "simple-mfd"
- "aspeed,g5-scu", "syscon", "simple-mfd"
Example
===================
diff --git a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml
index 125599a2dc5e..9368e4b6d4d0 100644
--- a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml
+++ b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml
@@ -15,16 +15,13 @@ description: |+
- compatible: Should be one of the following:
"aspeed,ast2400-scu", "syscon", "simple-mfd"
- "aspeed,g4-scu", "syscon", "simple-mfd"
Refer to the the bindings described in
Documentation/devicetree/bindings/mfd/syscon.txt
properties:
compatible:
- enum:
- - aspeed,ast2400-pinctrl
- - aspeed,g4-pinctrl
+ const: aspeed,ast2400-pinctrl
patternProperties:
'^.*$':
diff --git a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml
index 3e6d85318577..939fb755a6db 100644
--- a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml
+++ b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml
@@ -22,9 +22,7 @@ description: |+
properties:
compatible:
- enum:
- - aspeed,ast2500-pinctrl
- - aspeed,g5-pinctrl
+ const: aspeed,ast2500-pinctrl
aspeed,external-nodes:
minItems: 2
maxItems: 2
--
2.20.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 3/3] dt-bindings: aspeed: Remove mention of deprecated compatibles
2019-07-24 8:13 ` [PATCH 3/3] dt-bindings: aspeed: Remove mention " Andrew Jeffery
@ 2019-07-24 13:40 ` Rob Herring
2019-08-05 10:48 ` Linus Walleij
1 sibling, 0 replies; 15+ messages in thread
From: Rob Herring @ 2019-07-24 13:40 UTC (permalink / raw)
To: Andrew Jeffery
Cc: linux-aspeed, Lee Jones, Mark Rutland, Joel Stanley,
Linus Walleij, devicetree,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
linux-kernel, open list:GPIO SUBSYSTEM
On Wed, Jul 24, 2019 at 2:13 AM Andrew Jeffery <andrew@aj.id.au> wrote:
>
> Guide readers away from using the aspeed,g[45].* compatible patterns.
>
> Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
> ---
> Documentation/devicetree/bindings/mfd/aspeed-scu.txt | 2 --
> Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt | 2 --
> .../devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 5 +----
> .../devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 4 +---
> 4 files changed, 2 insertions(+), 11 deletions(-)
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/3] dt-bindings: aspeed: Remove mention of deprecated compatibles
2019-07-24 8:13 ` [PATCH 3/3] dt-bindings: aspeed: Remove mention " Andrew Jeffery
2019-07-24 13:40 ` Rob Herring
@ 2019-08-05 10:48 ` Linus Walleij
2019-08-12 10:15 ` Lee Jones
1 sibling, 1 reply; 15+ messages in thread
From: Linus Walleij @ 2019-08-05 10:48 UTC (permalink / raw)
To: Andrew Jeffery
Cc: linux-aspeed, Lee Jones, Rob Herring, Mark Rutland, Joel Stanley,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Linux ARM, linux-kernel, open list:GPIO SUBSYSTEM
On Wed, Jul 24, 2019 at 10:13 AM Andrew Jeffery <andrew@aj.id.au> wrote:
> Guide readers away from using the aspeed,g[45].* compatible patterns.
>
> Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Patch applied to the pinctrl tree.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/3] dt-bindings: aspeed: Remove mention of deprecated compatibles
2019-08-05 10:48 ` Linus Walleij
@ 2019-08-12 10:15 ` Lee Jones
2019-08-14 8:41 ` Linus Walleij
0 siblings, 1 reply; 15+ messages in thread
From: Lee Jones @ 2019-08-12 10:15 UTC (permalink / raw)
To: Linus Walleij
Cc: Andrew Jeffery, linux-aspeed, Rob Herring, Mark Rutland,
Joel Stanley,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Linux ARM, linux-kernel, open list:GPIO SUBSYSTEM
On Mon, 05 Aug 2019, Linus Walleij wrote:
> On Wed, Jul 24, 2019 at 10:13 AM Andrew Jeffery <andrew@aj.id.au> wrote:
>
> > Guide readers away from using the aspeed,g[45].* compatible patterns.
> >
> > Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
>
> Patch applied to the pinctrl tree.
With my Ack?
--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/3] dt-bindings: aspeed: Remove mention of deprecated compatibles
2019-08-12 10:15 ` Lee Jones
@ 2019-08-14 8:41 ` Linus Walleij
2019-08-14 10:54 ` Lee Jones
0 siblings, 1 reply; 15+ messages in thread
From: Linus Walleij @ 2019-08-14 8:41 UTC (permalink / raw)
To: Lee Jones
Cc: Andrew Jeffery, linux-aspeed, Rob Herring, Mark Rutland,
Joel Stanley,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Linux ARM, linux-kernel, open list:GPIO SUBSYSTEM
On Mon, Aug 12, 2019 at 12:15 PM Lee Jones <lee.jones@linaro.org> wrote:
> On Mon, 05 Aug 2019, Linus Walleij wrote:
>
> > On Wed, Jul 24, 2019 at 10:13 AM Andrew Jeffery <andrew@aj.id.au> wrote:
> >
> > > Guide readers away from using the aspeed,g[45].* compatible patterns.
> > >
> > > Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
> >
> > Patch applied to the pinctrl tree.
>
> With my Ack?
Sorry no. :( Was I too trigger-happy?
Usually I take Rob's ACK as authoritative for anything under
Documentation/devicetree but if you have concerns about the
patch from an MFD point of view I will revert it pending further
discussion.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/3] dt-bindings: aspeed: Remove mention of deprecated compatibles
2019-08-14 8:41 ` Linus Walleij
@ 2019-08-14 10:54 ` Lee Jones
0 siblings, 0 replies; 15+ messages in thread
From: Lee Jones @ 2019-08-14 10:54 UTC (permalink / raw)
To: Linus Walleij
Cc: Andrew Jeffery, linux-aspeed, Rob Herring, Mark Rutland,
Joel Stanley,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Linux ARM, linux-kernel, open list:GPIO SUBSYSTEM
On Wed, 14 Aug 2019, Linus Walleij wrote:
> On Mon, Aug 12, 2019 at 12:15 PM Lee Jones <lee.jones@linaro.org> wrote:
> > On Mon, 05 Aug 2019, Linus Walleij wrote:
> >
> > > On Wed, Jul 24, 2019 at 10:13 AM Andrew Jeffery <andrew@aj.id.au> wrote:
> > >
> > > > Guide readers away from using the aspeed,g[45].* compatible patterns.
> > > >
> > > > Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
> > >
> > > Patch applied to the pinctrl tree.
> >
> > With my Ack?
>
> Sorry no. :( Was I too trigger-happy?
>
> Usually I take Rob's ACK as authoritative for anything under
> Documentation/devicetree but if you have concerns about the
> patch from an MFD point of view I will revert it pending further
> discussion.
No need. I would have Acked it.
--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 0/3] ARM: dts: aspeed: Deprecate g[45]-style compatibles
2019-07-24 8:13 [PATCH 0/3] ARM: dts: aspeed: Deprecate g[45]-style compatibles Andrew Jeffery
` (2 preceding siblings ...)
2019-07-24 8:13 ` [PATCH 3/3] dt-bindings: aspeed: Remove mention " Andrew Jeffery
@ 2019-07-29 21:53 ` Linus Walleij
2019-07-30 0:57 ` Andrew Jeffery
3 siblings, 1 reply; 15+ messages in thread
From: Linus Walleij @ 2019-07-29 21:53 UTC (permalink / raw)
To: Andrew Jeffery
Cc: linux-aspeed, Lee Jones, Rob Herring, Mark Rutland, Joel Stanley,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Linux ARM, linux-kernel, open list:GPIO SUBSYSTEM
On Wed, Jul 24, 2019 at 10:13 AM Andrew Jeffery <andrew@aj.id.au> wrote:
> It's probably best if we push the three patches all through one tree rather
> than fragmenting. Is everyone happy if Joel applies them to the aspeed tree?
If you are sure it will not collide with parallell work in the
pinctrl tree, yes.
Acked-by: Linus Walleij <linus.walleij@linaro.org>
(If it does collide I'd prefer to take the pinctrl patches and fix the
conflicts in my tree.)
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 0/3] ARM: dts: aspeed: Deprecate g[45]-style compatibles
2019-07-29 21:53 ` [PATCH 0/3] ARM: dts: aspeed: Deprecate g[45]-style compatibles Linus Walleij
@ 2019-07-30 0:57 ` Andrew Jeffery
2019-08-01 5:45 ` Andrew Jeffery
0 siblings, 1 reply; 15+ messages in thread
From: Andrew Jeffery @ 2019-07-30 0:57 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-aspeed, Lee Jones, Rob Herring, Mark Rutland, Joel Stanley,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Linux ARM, linux-kernel, open list:GPIO SUBSYSTEM
On Tue, 30 Jul 2019, at 07:23, Linus Walleij wrote:
> On Wed, Jul 24, 2019 at 10:13 AM Andrew Jeffery <andrew@aj.id.au> wrote:
>
> > It's probably best if we push the three patches all through one tree rather
> > than fragmenting. Is everyone happy if Joel applies them to the aspeed tree?
>
> If you are sure it will not collide with parallell work in the
> pinctrl tree, yes.
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>
> (If it does collide I'd prefer to take the pinctrl patches and fix the
> conflicts in my tree.)
Fair enough, I don't know the answer so I'll poke around. I don't really mind
where the series goes in, I just want to avoid landing only part of it if I split it up.
Andrew
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 0/3] ARM: dts: aspeed: Deprecate g[45]-style compatibles
2019-07-30 0:57 ` Andrew Jeffery
@ 2019-08-01 5:45 ` Andrew Jeffery
2019-08-02 6:15 ` Joel Stanley
0 siblings, 1 reply; 15+ messages in thread
From: Andrew Jeffery @ 2019-08-01 5:45 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-aspeed, Lee Jones, Rob Herring, Mark Rutland, Joel Stanley,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Linux ARM, linux-kernel, open list:GPIO SUBSYSTEM
On Tue, 30 Jul 2019, at 10:27, Andrew Jeffery wrote:
>
>
> On Tue, 30 Jul 2019, at 07:23, Linus Walleij wrote:
> > On Wed, Jul 24, 2019 at 10:13 AM Andrew Jeffery <andrew@aj.id.au> wrote:
> >
> > > It's probably best if we push the three patches all through one tree rather
> > > than fragmenting. Is everyone happy if Joel applies them to the aspeed tree?
> >
> > If you are sure it will not collide with parallell work in the
> > pinctrl tree, yes.
> > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> >
> > (If it does collide I'd prefer to take the pinctrl patches and fix the
> > conflicts in my tree.)
>
> Fair enough, I don't know the answer so I'll poke around. I don't
> really mind
> where the series goes in, I just want to avoid landing only part of it
> if I split it up.
Okay, it currently conflicts with my cleanup-devicetree-warnings series.
Joel, do you mind if Linus takes this series through the pinctrl tree, given
the fix to the devicetrees is patch 1/3?
Andrew
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 0/3] ARM: dts: aspeed: Deprecate g[45]-style compatibles
2019-08-01 5:45 ` Andrew Jeffery
@ 2019-08-02 6:15 ` Joel Stanley
2019-08-05 10:45 ` Linus Walleij
0 siblings, 1 reply; 15+ messages in thread
From: Joel Stanley @ 2019-08-02 6:15 UTC (permalink / raw)
To: Andrew Jeffery
Cc: Linus Walleij, linux-aspeed, Lee Jones, Rob Herring,
Mark Rutland,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Linux ARM, linux-kernel, open list:GPIO SUBSYSTEM
On Thu, 1 Aug 2019 at 05:45, Andrew Jeffery <andrew@aj.id.au> wrote:
>
>
>
> On Tue, 30 Jul 2019, at 10:27, Andrew Jeffery wrote:
> >
> >
> > On Tue, 30 Jul 2019, at 07:23, Linus Walleij wrote:
> > > On Wed, Jul 24, 2019 at 10:13 AM Andrew Jeffery <andrew@aj.id.au> wrote:
> > >
> > > > It's probably best if we push the three patches all through one tree rather
> > > > than fragmenting. Is everyone happy if Joel applies them to the aspeed tree?
> > >
> > > If you are sure it will not collide with parallell work in the
> > > pinctrl tree, yes.
> > > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > >
> > > (If it does collide I'd prefer to take the pinctrl patches and fix the
> > > conflicts in my tree.)
> >
> > Fair enough, I don't know the answer so I'll poke around. I don't
> > really mind
> > where the series goes in, I just want to avoid landing only part of it
> > if I split it up.
>
> Okay, it currently conflicts with my cleanup-devicetree-warnings series.
>
> Joel, do you mind if Linus takes this series through the pinctrl tree, given
> the fix to the devicetrees is patch 1/3?
It depends if you plan more changes to that part of the device tree
this merge window :)
Linus, perhaps the safer option is for me to take 1/3 through my tree
and you can take the rest through yours?
Cheers,
Joel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 0/3] ARM: dts: aspeed: Deprecate g[45]-style compatibles
2019-08-02 6:15 ` Joel Stanley
@ 2019-08-05 10:45 ` Linus Walleij
0 siblings, 0 replies; 15+ messages in thread
From: Linus Walleij @ 2019-08-05 10:45 UTC (permalink / raw)
To: Joel Stanley
Cc: Andrew Jeffery, linux-aspeed, Lee Jones, Rob Herring,
Mark Rutland,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Linux ARM, linux-kernel, open list:GPIO SUBSYSTEM
On Fri, Aug 2, 2019 at 8:15 AM Joel Stanley <joel@jms.id.au> wrote:
> > Joel, do you mind if Linus takes this series through the pinctrl tree, given
> > the fix to the devicetrees is patch 1/3?
>
> It depends if you plan more changes to that part of the device tree
> this merge window :)
>
> Linus, perhaps the safer option is for me to take 1/3 through my tree
> and you can take the rest through yours?
OK let's proceed like that.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 15+ messages in thread