mbox

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

Message ID cover.1479388193.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.10

Message

Simon Horman Nov. 17, 2016, 2:04 p.m. UTC
Hi Olof, Hi Kevin, Hi Arnd,

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

This pull request is based on a merge of:

* The previous round of such requests, tagged as renesas-arm64-dt-for-v4.10,
  which I have already sent a pull-request for.
* The "Second Round of Renesas ARM Based SoC Drivers Updates for v4.10",
  tagged as renesas-drivers2-for-v4.10, which I have also sent a pull
  request for. This is included to provide dependencies for adding device
  nodes for PRR.


The following changes since commit a59f630b3386cc30c28154f3d5707ee74d4bfe63:

  Merge branch 'heads/drivers-for-v4.10' into HEAD (2016-11-15 14:13:37 +0100)

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.10

for you to fetch changes up to 1e7b5e4ee3f1b2c9cb607801a3f0adfa05a0818a:

  arm64: dts: r8a7796: Add device node for PRR (2016-11-15 14:15:58 +0100)

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

Enhancements:
* Add device nodes for PRR
* Add m3ulcb board
* Enable I2C on r8a7796/salvator-x board
* Enable SDHI0 on h3ulcb board

Clean-up:
* Rename SDHI0 pins of h3ulcb board

----------------------------------------------------------------
Geert Uytterhoeven (2):
      arm64: dts: r8a7795: Add device node for PRR
      arm64: dts: r8a7796: Add device node for PRR

Ulrich Hecht (3):
      arm64: dts: r8a7796: add I2C support
      arm64: dts: r8a7796: Enable I2C DMA
      arm64: dts: r8a7796: salvator-x: enable I2C

Vladimir Barinov (13):
      arm64: dts: h3ulcb: update documentation with official board name
      arm64: dts: h3ulcb: update header
      arm64: dts: m3ulcb: add M3ULCB board DT bindings
      arm64: dts: m3ulcb: initial device tree
      arm64: dts: m3ulcb: enable SCIF clk and pins
      arm64: dts: m3ulcb: enable GPIO leds
      arm64: dts: m3ulcb: enable GPIO keys
      arm64: dts: m3ulcb: enable EXTALR clk
      arm64: dts: m3ulcb: enable WDT
      arm64: dts: m3ulcb: enable SDHI0
      arm64: dts: m3ulcb: enable SDHI2
      arm64: dts: h3ulcb: enable SDHI2
      arm64: dts: h3ulcb: rename SDHI0 pins

 Documentation/devicetree/bindings/arm/shmobile.txt |   4 +-
 arch/arm64/boot/dts/renesas/Makefile               |   2 +-
 arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts     |  53 +++++-
 arch/arm64/boot/dts/renesas/r8a7795.dtsi           |   5 +
 arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts     | 189 +++++++++++++++++++++
 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts |  12 ++
 arch/arm64/boot/dts/renesas/r8a7796.dtsi           | 116 +++++++++++++
 7 files changed, 374 insertions(+), 7 deletions(-)
 create mode 100644 arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts

Comments

Olof Johansson Nov. 19, 2016, 1:41 a.m. UTC | #1
On Thu, Nov 17, 2016 at 03:04:55PM +0100, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
> 
> Please consider these second round of Renesas ARM64 based SoC DT updates
> for v4.10.
> 
> This pull request is based on a merge of:
> 
> * The previous round of such requests, tagged as renesas-arm64-dt-for-v4.10,
>   which I have already sent a pull-request for.
> * The "Second Round of Renesas ARM Based SoC Drivers Updates for v4.10",
>   tagged as renesas-drivers2-for-v4.10, which I have also sent a pull
>   request for. This is included to provide dependencies for adding device
>   nodes for PRR.

Please avoid entangling these pull requests, since now I can't merge DT since
I'm rejecting your drivers pull request.

I also don't understand why you need a driver branch as base. The PRR
nodes are literally just a compatible field and a reg entry. It should
depend on nothing.

So, I'm a little confused here. Please disentangle this and send a separate
pull request, I'll be happy to merge that.


-Olof
Simon Horman Nov. 21, 2016, 10:55 a.m. UTC | #2
On Fri, Nov 18, 2016 at 05:41:50PM -0800, Olof Johansson wrote:
> On Thu, Nov 17, 2016 at 03:04:55PM +0100, Simon Horman wrote:
> > Hi Olof, Hi Kevin, Hi Arnd,
> > 
> > Please consider these second round of Renesas ARM64 based SoC DT updates
> > for v4.10.
> > 
> > This pull request is based on a merge of:
> > 
> > * The previous round of such requests, tagged as renesas-arm64-dt-for-v4.10,
> >   which I have already sent a pull-request for.
> > * The "Second Round of Renesas ARM Based SoC Drivers Updates for v4.10",
> >   tagged as renesas-drivers2-for-v4.10, which I have also sent a pull
> >   request for. This is included to provide dependencies for adding device
> >   nodes for PRR.
> 
> Please avoid entangling these pull requests, since now I can't merge DT since
> I'm rejecting your drivers pull request.
> 
> I also don't understand why you need a driver branch as base. The PRR
> nodes are literally just a compatible field and a reg entry. It should
> depend on nothing.
> 
> So, I'm a little confused here. Please disentangle this and send a separate
> pull request, I'll be happy to merge that.

Sorry about this.

As you correctly point out the PRR patches do not depend on anything and
the merge described above is unnecessary.

I will prepare a fresh pull request based (only) on
renesas-arm64-dt-for-v4.10.