devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Simon Horman <horms@verge.net.au>
To: Chris Brandt <chris.brandt@renesas.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
	Magnus Damm <magnus.damm@gmail.com>,
	Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH v2 0/2] ARM: dts: r7s72100: add sdhi DT
Date: Fri, 7 Oct 2016 13:41:51 +0900	[thread overview]
Message-ID: <20161007044147.GA5855@verge.net.au> (raw)
In-Reply-To: <20160926204032.12260-1-chris.brandt@renesas.com>

On Mon, Sep 26, 2016 at 04:40:30PM -0400, Chris Brandt wrote:
> SUMMARY:
> This series adds sdhi to the r7s72100 (RZ/A1) Device Tree.
> 
> DEPENDECIES:
> This series is dependent on the tmio/sh_sdhi patches being
> applied to add r7s72100 support.
>   mmc: sh_mobile_sdhi: add ocr_mask option
>   mmc: tmio-mmc: add support for 32bit data port
>   mmc: sh_mobile_sdhi: Add r7s72100 support
> 
> MERGE CONFLICTS:
> There are also patches being reviewed for adding mmc so depending on how
> they get applied, there might be a line conflict.
> To resolve the merge conflict, simply put the MMC nodes before
> the SDHI nodes (just because that seems to be the order in other
> Renesas SoCs DTs)

Thanks for the notes above.

I have decided to queue this up (for v4.10). Please let me know
if that was not desired. Or if subsequently it becomes undesirable
(i.e. if I should drop these patches).

> CHANGES:
> V1->V2
> * Removed patch "[PATCH 1/3] ARM: dts: r7s72100: add sdhi clock to device tree"
>   because it has already been queued up
> * moved bus-with property from dtsi to dts
> 
> 
> Chris Brandt (2):
>   ARM: dts: r7s72100: add sdhi to device tree
>   ARM: dts: rskrza1: add sdhi1 DT support
> 
>  arch/arm/boot/dts/r7s72100-rskrza1.dts |  5 +++++
>  arch/arm/boot/dts/r7s72100.dtsi        | 26 ++++++++++++++++++++++++++
>  2 files changed, 31 insertions(+)
> 
> -- 
> 2.9.2
> 
> 

      parent reply	other threads:[~2016-10-07  4:41 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-26 20:40 [PATCH v2 0/2] ARM: dts: r7s72100: add sdhi DT Chris Brandt
     [not found] ` <20160926204032.12260-1-chris.brandt-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2016-09-26 20:40   ` [PATCH v2 1/2] ARM: dts: r7s72100: add sdhi to device tree Chris Brandt
2016-09-26 20:40 ` [PATCH v2 2/2] ARM: dts: rskrza1: add sdhi1 DT support Chris Brandt
     [not found]   ` <20160926204032.12260-3-chris.brandt-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2016-09-27  7:25     ` Geert Uytterhoeven
2016-10-07  4:41 ` Simon Horman [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161007044147.GA5855@verge.net.au \
    --to=horms@verge.net.au \
    --cc=chris.brandt@renesas.com \
    --cc=devicetree@vger.kernel.org \
    --cc=geert@linux-m68k.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=magnus.damm@gmail.com \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).