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