mbox

[GIT,PULL] arm64: dts: vexpress/juno: Updates for v4.6(part 2)

Message ID 56DF0274.1060007@arm.com
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git

Message

Sudeep Holla March 8, 2016, 4:48 p.m. UTC
Hi ARM-SoC team,

Sorry for the late pull request.

There's one update for adding support for SBSA Watchdog to foundation
model that caused conflict as it was merged via watchdog tree. I am
pulling that now to avoid conflicts and I also have a patch to fix DT
warnings that new checks in DTS introduced since last Friday. Please
consider pulling this for v4.6

Regards,
Sudeep


The following changes since commit 9fd9288ed0899f9e318a97d73e777d6d3357265e:

   arm64: dts: Add HDLCD support on Juno platforms (2016-02-10 10:58:33 
+0000)

are available in the git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git 
tags/vexpress-for-v4.6/dt-updates-2

for you to fetch changes up to 6d6acd140ab3d46348ec3a9dbfd386d9ca42b825:

   arm64: dts: juno/vexpress: fix node name unit-address presence 
warnings (2016-03-08 13:54:27 +0000)

----------------------------------------------------------------
Additional updates for ARM VExpress/Juno platforms

1. Add support for SBSA Generic Watchdog on foundation models

2. Fix node name unit-address presence/absence mismatch warnings in
    all the device trees

----------------------------------------------------------------
Fu Wei (1):
       arm64: dts: foundation-v8: add SBSA Generic Watchdog device node

Sudeep Holla (1):
       arm64: dts: juno/vexpress: fix node name unit-address presence 
warnings

  arch/arm64/boot/dts/arm/foundation-v8.dtsi         | 10 +++++++-
  arch/arm64/boot/dts/arm/juno-base.dtsi             | 14 +++++-----
  arch/arm64/boot/dts/arm/juno-motherboard.dtsi      | 30 
+++++++++++-----------
  arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts         |  2 +-
  arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi   | 14 +++++-----
  .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts      | 10 ++++----
  6 files changed, 44 insertions(+), 36 deletions(-)

Comments

Olof Johansson March 13, 2016, 1:20 a.m. UTC | #1
On Tue, Mar 08, 2016 at 04:48:52PM +0000, Sudeep Holla wrote:
> Hi ARM-SoC team,
> 
> Sorry for the late pull request.
> 
> There's one update for adding support for SBSA Watchdog to foundation
> model that caused conflict as it was merged via watchdog tree. I am
> pulling that now to avoid conflicts and I also have a patch to fix DT
> warnings that new checks in DTS introduced since last Friday. Please
> consider pulling this for v4.6
> 
> Regards,
> Sudeep
> 
> 
> The following changes since commit 9fd9288ed0899f9e318a97d73e777d6d3357265e:
> 
>   arm64: dts: Add HDLCD support on Juno platforms (2016-02-10 10:58:33
> +0000)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git
> tags/vexpress-for-v4.6/dt-updates-2
> 
> for you to fetch changes up to 6d6acd140ab3d46348ec3a9dbfd386d9ca42b825:
> 
>   arm64: dts: juno/vexpress: fix node name unit-address presence warnings
> (2016-03-08 13:54:27 +0000)
> 
> ----------------------------------------------------------------
> Additional updates for ARM VExpress/Juno platforms
> 
> 1. Add support for SBSA Generic Watchdog on foundation models
> 
> 2. Fix node name unit-address presence/absence mismatch warnings in
>    all the device trees
> 
> ----------------------------------------------------------------
> Fu Wei (1):
>       arm64: dts: foundation-v8: add SBSA Generic Watchdog device node
> 
> Sudeep Holla (1):
>       arm64: dts: juno/vexpress: fix node name unit-address presence
> warnings

Merged, thanks.


-Olof
Olof Johansson March 13, 2016, 1:26 a.m. UTC | #2
On Tue, Mar 08, 2016 at 04:48:52PM +0000, Sudeep Holla wrote:
> Hi ARM-SoC team,
> 
> Sorry for the late pull request.
> 
> There's one update for adding support for SBSA Watchdog to foundation
> model that caused conflict as it was merged via watchdog tree. I am
> pulling that now to avoid conflicts and I also have a patch to fix DT
> warnings that new checks in DTS introduced since last Friday. Please
> consider pulling this for v4.6
> 
> Regards,
> Sudeep
> 
> 
> The following changes since commit 9fd9288ed0899f9e318a97d73e777d6d3357265e:
> 
>   arm64: dts: Add HDLCD support on Juno platforms (2016-02-10 10:58:33
> +0000)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git
> tags/vexpress-for-v4.6/dt-updates-2
> 
> for you to fetch changes up to 6d6acd140ab3d46348ec3a9dbfd386d9ca42b825:
> 
>   arm64: dts: juno/vexpress: fix node name unit-address presence warnings
> (2016-03-08 13:54:27 +0000)
> 
> ----------------------------------------------------------------
> Additional updates for ARM VExpress/Juno platforms
> 
> 1. Add support for SBSA Generic Watchdog on foundation models
> 
> 2. Fix node name unit-address presence/absence mismatch warnings in
>    all the device trees

Argh. I just noticed that I had mismerged your previos patch into next/dt
instead of next/dt64. So, I've merged this on top of it there as well.


-Olof