Skip to contentSkip to conversation

at91: dt for 4.4 #2

GIT PULL Alexandre Belloni 2 participants 3 messages Oct 19, 2015 – Oct 21, 2015

lore
Share & tools
lore
#0 lore raw

Arnd, Olof, Kevin,

A few more DT changes for AT91.
Small fixes and huge addition to the sama5d2 and its evaluation board. There may be a simple add/add conflict with Linus Walleij pinctrl tree that should be an issue.

Thanks, best regards,

The following changes since commit a9b672a636a599cc052afcb6837e3177dc53c143:

ARM: at91/dt: sama5d2 Xplained: add device pin muxing (2015-09-23 16:26:47 +0200)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git tags/at91-ab-dt2

for you to fetch changes up to 0bddbefb9e731a6090350508f139b9ac3590303c:

ARM: at91/dt: sama5d2 Xplained: add several devices (2015-10-19 21:22:32 +0200)

----------------------------------------------------------------
Second batch of DT changes for 4.4:
- some DT fixes: pullups, disabled property
- the PMC is now a syscon
- great improvement of sama5d2 support

----------------------------------------------------------------
Alexandre Belloni (1):
ARM: at91/dt: use syscon for PMC

Gregory CLEMENT (1):
ARM: at91/dt: sama5d4: add the macb1 node

Ludovic Desroches (2):
ARM: at91/dt: sama5d2: add missing devices
ARM: at91/dt: sama5d2 Xplained: add several devices

Michael Opdenacker (1):

      ARM: at91/dt: fix "disabled" property on at91rm9200

Sylvain Rochet (1):
ARM: at91/dt: add pullup on mmc2 data signals

Wenyou Yang (1):
ARM: at91/dt: sama5d2_xplained: add regulator nodes

 arch/arm/boot/dts/at91-sama5d2_xplained.dts | 163 ++++++++++++++++++++++++++++
 arch/arm/boot/dts/at91rm9200.dtsi           |   8 +-
 arch/arm/boot/dts/at91sam9260.dtsi          |   2 +-
 arch/arm/boot/dts/at91sam9261.dtsi          |   2 +-
 arch/arm/boot/dts/at91sam9263.dtsi          |   2 +-
 arch/arm/boot/dts/at91sam9g45.dtsi          |   2 +-
 arch/arm/boot/dts/at91sam9n12.dtsi          |   2 +-
 arch/arm/boot/dts/at91sam9rl.dtsi           |   2 +-
 arch/arm/boot/dts/at91sam9x5.dtsi           |   2 +-
 arch/arm/boot/dts/sama5d2.dtsi              | 154 +++++++++++++++++++++++++-
 arch/arm/boot/dts/sama5d3.dtsi              |   2 +-
 arch/arm/boot/dts/sama5d3_mci2.dtsi         |   6 +-
 arch/arm/boot/dts/sama5d4.dtsi              |  32 +++++-
 13 files changed, 360 insertions(+), 19 deletions(-)
Signature · 3 lines
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#1 lore raw

Hi,

Actually, this built on my machine because one of the headers was left unversionned in my tree. The last patch depends on the MFD tree, I'm not sure how you want to handle that. I can as well drop the last patch and resend a PR.

Quoted 66 lines · Alexandre Belloni

Arnd, Olof, Kevin,

A few more DT changes for AT91.
Small fixes and huge addition to the sama5d2 and its evaluation board. There may be a simple add/add conflict with Linus Walleij pinctrl tree that should be an issue.

Thanks, best regards,

The following changes since commit a9b672a636a599cc052afcb6837e3177dc53c143:

ARM: at91/dt: sama5d2 Xplained: add device pin muxing (2015-09-23 16:26:47 +0200)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git tags/at91-ab-dt2

for you to fetch changes up to 0bddbefb9e731a6090350508f139b9ac3590303c:

ARM: at91/dt: sama5d2 Xplained: add several devices (2015-10-19 21:22:32 +0200)

----------------------------------------------------------------
Second batch of DT changes for 4.4:
- some DT fixes: pullups, disabled property
- the PMC is now a syscon
- great improvement of sama5d2 support

----------------------------------------------------------------
Alexandre Belloni (1):
ARM: at91/dt: use syscon for PMC

Gregory CLEMENT (1):
ARM: at91/dt: sama5d4: add the macb1 node

Ludovic Desroches (2):
ARM: at91/dt: sama5d2: add missing devices
ARM: at91/dt: sama5d2 Xplained: add several devices

Michael Opdenacker (1):

      ARM: at91/dt: fix "disabled" property on at91rm9200

Sylvain Rochet (1):
ARM: at91/dt: add pullup on mmc2 data signals

Wenyou Yang (1):
ARM: at91/dt: sama5d2_xplained: add regulator nodes

 arch/arm/boot/dts/at91-sama5d2_xplained.dts | 163 ++++++++++++++++++++++++++++
 arch/arm/boot/dts/at91rm9200.dtsi           |   8 +-
 arch/arm/boot/dts/at91sam9260.dtsi          |   2 +-
 arch/arm/boot/dts/at91sam9261.dtsi          |   2 +-
 arch/arm/boot/dts/at91sam9263.dtsi          |   2 +-
 arch/arm/boot/dts/at91sam9g45.dtsi          |   2 +-
 arch/arm/boot/dts/at91sam9n12.dtsi          |   2 +-
 arch/arm/boot/dts/at91sam9rl.dtsi           |   2 +-
 arch/arm/boot/dts/at91sam9x5.dtsi           |   2 +-
 arch/arm/boot/dts/sama5d2.dtsi              | 154 +++++++++++++++++++++++++-
 arch/arm/boot/dts/sama5d3.dtsi              |   2 +-
 arch/arm/boot/dts/sama5d3_mci2.dtsi         |   6 +-
 arch/arm/boot/dts/sama5d4.dtsi              |  32 +++++-
 13 files changed, 360 insertions(+), 19 deletions(-)
Signature · 3 lines
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Signature · 3 lines
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw
Quoted 7 lines · On Wednesday 21 October 2015 10:50:09 Alexandre Belloni wrote:

Hi,

Actually, this built on my machine because one of the headers was left unversionned in my tree. The last patch depends on the MFD tree, I'm not sure how you want to handle that. I can as well drop the last patch and resend a PR.

Yes, that would be better.

In general, when you have dependencies like this, they should be discussed with all maintainers in advance so we can come up with a plan.

Often that means having two branches that both start with the same patch that contains the dependency, but it's probably too late for that now, as the other patch has already been merged to the MFD tree.

If that last patch has no dependencies or conflicts with the rest of the changes, you can also get an Ack from us to merge it through the MFD tree, but we normally try to avoid that.

Arnd