[GIT,PULL] ARM: mvebu: dt64 for v5.4 (#2)
mbox series

Message ID 87h85two0r.fsf@FE-laptop
State New
Headers show
Series
  • [GIT,PULL] ARM: mvebu: dt64 for v5.4 (#2)
Related show

Pull-request

git://git.infradead.org/linux-mvebu.git tags/mvebu-dt64-5.4-2

Message

Gregory CLEMENT Sept. 3, 2019, 12:41 p.m. UTC
Hi,

Here is the second pull request for dt64 for mvebu for v5.4.

For the Turris Mox board there was dependencies with moxtet header which
was already merged in your arm/drivers branch. That the reason why I
merged this branch in my mvebu/dt64 branch.

Let me know if it is a problem and if you want that I do it in a
different way.

Gregory

The following changes since commit 4e48ff438fca98a70d8e813d18e336f25da73ed8:

  Merge remote-tracking branch 'arm-soc/arm/drivers' into HEAD (2019-08-31 09:24:13 +0200)

are available in the Git repository at:

  git://git.infradead.org/linux-mvebu.git tags/mvebu-dt64-5.4-2

for you to fetch changes up to 7109d817db2e020379d0f245300b8ffe651c5c04:

  arm64: dts: marvell: add DTS for Turris Mox (2019-08-31 09:24:31 +0200)

----------------------------------------------------------------
mvebu dt64 for 5.4 (part 2)

Add support for Turris Mox board (Armada 3720 SoC based)

----------------------------------------------------------------
Marek Behún (3):
      arm64: dts: marvell: armada-37xx: add SPI CS1 pinctrl
      dt-bindings: marvell: document Turris Mox compatible
      arm64: dts: marvell: add DTS for Turris Mox

 .../bindings/arm/marvell/armada-37xx.txt           |   8 +
 arch/arm64/boot/dts/marvell/Makefile               |   1 +
 .../boot/dts/marvell/armada-3720-turris-mox.dts    | 840 +++++++++++++++++++++
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi       |   5 +
 4 files changed, 854 insertions(+)
 create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts

Comments

Arnd Bergmann Sept. 3, 2019, 9:05 p.m. UTC | #1
On Tue, Sep 3, 2019 at 2:41 PM Gregory CLEMENT
<gregory.clement@bootlin.com> wrote:
> Here is the second pull request for dt64 for mvebu for v5.4.
>
> For the Turris Mox board there was dependencies with moxtet header which
> was already merged in your arm/drivers branch. That the reason why I
> merged this branch in my mvebu/dt64 branch.
>
> Let me know if it is a problem and if you want that I do it in a
> different way.

I don't really like this, but it's too late to do it right now. The problem is
that I should have not picked up the patches from the list in the first
place if there are these dependencies.

This could have been communicated better in the patch series, but
it really my own fault.

> ----------------------------------------------------------------
> mvebu dt64 for 5.4 (part 2)
>
> Add support for Turris Mox board (Armada 3720 SoC based)
>
> ----------------------------------------------------------------
> Marek Behún (3):
>       arm64: dts: marvell: armada-37xx: add SPI CS1 pinctrl
>       dt-bindings: marvell: document Turris Mox compatible
>       arm64: dts: marvell: add DTS for Turris Mox

I think the best way forward would be for me to apply the
remaining patches on top of the arm/drivers branch, to avoid
also pulling in your other DT changes into arm/drivers, or pulling
in all of arm/drivers into arm/dt.

Would that work for you?

       Arnd
Marek Behun Sept. 3, 2019, 10:50 p.m. UTC | #2
On Tue, 3 Sep 2019 23:05:47 +0200
Arnd Bergmann <arnd@arndb.de> wrote:

> On Tue, Sep 3, 2019 at 2:41 PM Gregory CLEMENT
> <gregory.clement@bootlin.com> wrote:
> > Here is the second pull request for dt64 for mvebu for v5.4.
> >
> > For the Turris Mox board there was dependencies with moxtet header which
> > was already merged in your arm/drivers branch. That the reason why I
> > merged this branch in my mvebu/dt64 branch.
> >
> > Let me know if it is a problem and if you want that I do it in a
> > different way.  
> 
> I don't really like this, but it's too late to do it right now. The problem is
> that I should have not picked up the patches from the list in the first
> place if there are these dependencies.
> 
> This could have been communicated better in the patch series, but
> it really my own fault.
> 
> > ----------------------------------------------------------------
> > mvebu dt64 for 5.4 (part 2)
> >
> > Add support for Turris Mox board (Armada 3720 SoC based)
> >
> > ----------------------------------------------------------------
> > Marek Behún (3):
> >       arm64: dts: marvell: armada-37xx: add SPI CS1 pinctrl
> >       dt-bindings: marvell: document Turris Mox compatible
> >       arm64: dts: marvell: add DTS for Turris Mox  
> 
> I think the best way forward would be for me to apply the
> remaining patches on top of the arm/drivers branch, to avoid
> also pulling in your other DT changes into arm/drivers, or pulling
> in all of arm/drivers into arm/dt.
> 
> Would that work for you?
> 
>        Arnd

Hi Arnd,

I also sent you a series for fixing some gcc warnings for the moxtet
driver, with subject
  [PATCH armsoc/drivers 0/2] Turris Mox moxtet warnings fixes
and a new driver for Turris Mox secure firmware:
  [PATCH arm/drivers 0/3] Turris Mox rWTM firmware support

I probably should have been sending these with mvebu tag to be applied
by Gregory from the beginning. I am sorry.

Will you apply these or should I send them again, this time to Gregory?

Thank you.

Marek
Arnd Bergmann Sept. 4, 2019, 3:38 p.m. UTC | #3
On Tue, Sep 3, 2019 at 11:05 PM Arnd Bergmann <arnd@arndb.de> wrote:
>
> On Tue, Sep 3, 2019 at 2:41 PM Gregory CLEMENT
> <gregory.clement@bootlin.com> wrote:
> > Here is the second pull request for dt64 for mvebu for v5.4.
> >
> > For the Turris Mox board there was dependencies with moxtet header which
> > was already merged in your arm/drivers branch. That the reason why I
> > merged this branch in my mvebu/dt64 branch.
> >
> > Let me know if it is a problem and if you want that I do it in a
> > different way.
>
> I don't really like this, but it's too late to do it right now. The problem is
> that I should have not picked up the patches from the list in the first
> place if there are these dependencies.
>
> This could have been communicated better in the patch series, but
> it really my own fault.
>
> > ----------------------------------------------------------------
> > mvebu dt64 for 5.4 (part 2)
> >
> > Add support for Turris Mox board (Armada 3720 SoC based)
> >
> > ----------------------------------------------------------------
> > Marek Behún (3):
> >       arm64: dts: marvell: armada-37xx: add SPI CS1 pinctrl
> >       dt-bindings: marvell: document Turris Mox compatible
> >       arm64: dts: marvell: add DTS for Turris Mox
>
> I think the best way forward would be for me to apply the
> remaining patches on top of the arm/drivers branch, to avoid
> also pulling in your other DT changes into arm/drivers, or pulling
> in all of arm/drivers into arm/dt.
>
> Would that work for you?

I ended up creating an arm/late branch for other reasons, put
this branch in there as well.

      Arnd
Gregory CLEMENT Sept. 4, 2019, 3:47 p.m. UTC | #4
Hi Arnd,

> On Tue, Sep 3, 2019 at 11:05 PM Arnd Bergmann <arnd@arndb.de> wrote:
>>
>> On Tue, Sep 3, 2019 at 2:41 PM Gregory CLEMENT
>> <gregory.clement@bootlin.com> wrote:
>> > Here is the second pull request for dt64 for mvebu for v5.4.
>> >
>> > For the Turris Mox board there was dependencies with moxtet header which
>> > was already merged in your arm/drivers branch. That the reason why I
>> > merged this branch in my mvebu/dt64 branch.
>> >
>> > Let me know if it is a problem and if you want that I do it in a
>> > different way.
>>
>> I don't really like this, but it's too late to do it right now. The problem is
>> that I should have not picked up the patches from the list in the first
>> place if there are these dependencies.
>>
>> This could have been communicated better in the patch series, but
>> it really my own fault.
>>
>> > ----------------------------------------------------------------
>> > mvebu dt64 for 5.4 (part 2)
>> >
>> > Add support for Turris Mox board (Armada 3720 SoC based)
>> >
>> > ----------------------------------------------------------------
>> > Marek Behún (3):
>> >       arm64: dts: marvell: armada-37xx: add SPI CS1 pinctrl
>> >       dt-bindings: marvell: document Turris Mox compatible
>> >       arm64: dts: marvell: add DTS for Turris Mox
>>
>> I think the best way forward would be for me to apply the
>> remaining patches on top of the arm/drivers branch, to avoid
>> also pulling in your other DT changes into arm/drivers, or pulling
>> in all of arm/drivers into arm/dt.
>>
>> Would that work for you?
>
> I ended up creating an arm/late branch for other reasons, put
> this branch in there as well.

OK thanks!

Gregory

>
>       Arnd