mbox

[GIT,PULL,v2] Second Round of Renesas ARM64 Based SoC DT Updates for v4.8

Message ID cover.1467900241.git.horms+renesas@verge.net.au
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-arm64-dt2-for-v4.8

Message

Simon Horman July 7, 2016, 2:39 p.m. UTC
Hi Olof, Hi Kevin, Hi Arnd,

Please consider these second round of Renesas ARM64 based SoC DT updates for v4.8.

This pull request is based on a merge of:

* The previous round of such requests, tagged as renesas-arm64-dt2-for-v4.8,
  which you have already pulled.

* The clk-renesas-for-v4.8-tag2 tag of Geert Uytterhoeven's
  renesas-driver's tree which has been accepted into clk-next.

  This tag provides clock definitions needed by the r8a7796 DT files.

This is v2 of this pull request. v1 did not include the
clk-renesas-for-v4.8-tag2 tag and instead provided a duplicate clk patch.

The following changes since commit fffae950cf00a60ff584618ecc939c6a931e4bbb:

  Merge tag 'clk-renesas-for-v4.8-tag2' into HEAD (2016-07-07 10:21:07 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-arm64-dt2-for-v4.8

for you to fetch changes up to c805f1a7013a76ae63c002e52cc667d7c37228ea:

  arm64: dts: r8a7796/salvator-x: Enable watchdog timer (2016-07-07 10:21:28 +0200)

----------------------------------------------------------------
Second Round of Renesas ARM64 Based SoC DT Updates for v4.8

* Add support for  r8a7796/salvator-x (R-Car Gen 3 M3-W)
* Add CAN support to r8a7795 (R-Car Gen 3 H3)

----------------------------------------------------------------
Geert Uytterhoeven (5):
      arm64: dts: r8a7795: Add missing blank lines between cpu nodes
      arm64: dts: r8a7796: Add SYSC PM Domains
      arm64: dts: r8a7796: Use SYSC "always-on" PM Domain
      arm64: dts: r8a7796: Add RWDT node
      arm64: dts: r8a7796/salvator-x: Enable watchdog timer

Ramesh Shanmugasundaram (1):
      arm64: dts: r8a7795: Add CAN FD support

Simon Horman (1):
      arm64: dts: r8a7796: Add Renesas R8A7796 SoC support

Takeshi Kihara (1):
      arm64: dts: salvator-x: add Salvator-X board on R8A7796 SoC

 Documentation/devicetree/bindings/arm/shmobile.txt |   4 +
 arch/arm64/Kconfig.platforms                       |   6 +
 arch/arm64/boot/dts/renesas/Makefile               |   1 +
 arch/arm64/boot/dts/renesas/r8a7795.dtsi           |  26 ++++
 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts |  50 ++++++++
 arch/arm64/boot/dts/renesas/r8a7796.dtsi           | 138 +++++++++++++++++++++
 6 files changed, 225 insertions(+)
 create mode 100644 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
 create mode 100644 arch/arm64/boot/dts/renesas/r8a7796.dtsi

Comments

Arnd Bergmann July 14, 2016, 2:03 p.m. UTC | #1
On Thursday, July 7, 2016 4:39:45 PM CEST Simon Horman wrote:
> Second Round of Renesas ARM64 Based SoC DT Updates for v4.8
> 
> * Add support for  r8a7796/salvator-x (R-Car Gen 3 M3-W)
> * Add CAN support to r8a7795 (R-Car Gen 3 H3)
> 

Merged into next/late to better deal with the dependency, thanks!

	Arnd
Arnd Bergmann July 14, 2016, 3:54 p.m. UTC | #2
On Thursday, July 7, 2016 4:39:45 PM CEST Simon Horman wrote:
>       arm64: dts: r8a7796: Add SYSC PM Domains
> 

While doing some sanity checks on our branch contents, I noticed
that this commit breaks running "make dtbs" on top of our next/dt64
branch, and I'd like to avoid that.

I found a couple more problems (tegra and meson), and I ended up
fixing them all up (by merging the dependencies into next/dt64),
so everything is sorted for 4.8, but it would be good to do a
'make dtbs' run on a branch that has dt changes before you send it,
and I'll try to do the same when pulling it to avoid the problem in
the future.

	Arnd
Geert Uytterhoeven July 15, 2016, 3:10 a.m. UTC | #3
Hi Arnd,

On Thu, Jul 14, 2016 at 5:54 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Thursday, July 7, 2016 4:39:45 PM CEST Simon Horman wrote:
>>       arm64: dts: r8a7796: Add SYSC PM Domains
>
> While doing some sanity checks on our branch contents, I noticed
> that this commit breaks running "make dtbs" on top of our next/dt64
> branch, and I'd like to avoid that.
>
> I found a couple more problems (tegra and meson), and I ended up
> fixing them all up (by merging the dependencies into next/dt64),
> so everything is sorted for 4.8, but it would be good to do a
> 'make dtbs' run on a branch that has dt changes before you send it,
> and I'll try to do the same when pulling it to avoid the problem in
> the future.

Oh right, it can't find <dt-bindings/power/r8a7796-sysc.h>.
I guess this didn't  show up for us, as arm64 defconfig in
renesas-arm64-dt2-for-v4.8 doesn't enable CONFIG_ARCH_R8A7796 yet.

Sorry for that.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
Simon Horman July 15, 2016, 4:29 a.m. UTC | #4
On Thu, Jul 14, 2016 at 05:54:25PM +0200, Arnd Bergmann wrote:
> On Thursday, July 7, 2016 4:39:45 PM CEST Simon Horman wrote:
> >       arm64: dts: r8a7796: Add SYSC PM Domains
> > 
> 
> While doing some sanity checks on our branch contents, I noticed
> that this commit breaks running "make dtbs" on top of our next/dt64
> branch, and I'd like to avoid that.
> 
> I found a couple more problems (tegra and meson), and I ended up
> fixing them all up (by merging the dependencies into next/dt64),
> so everything is sorted for 4.8, but it would be good to do a
> 'make dtbs' run on a branch that has dt changes before you send it,
> and I'll try to do the same when pulling it to avoid the problem in
> the future.

Thanks, I apologise for letting this slip through.