On Thu, Feb 08, 2018 at 03:24:40PM +0100, Rasmus Villemoes wrote: > On 2018-02-05 09:03, Shawn Guo wrote: > > On Fri, Jan 26, 2018 at 03:20:14PM +0100, Rasmus Villemoes wrote: > >> Add a node to device tree repesenting the QuadSPI controller present on > >> LS1021a. Driver support has been present since e8c034b2fbe5 (mtd: > >> spi-nor: fsl-quadspi: add support for ls1021a). > >> > >> Signed-off-by: Rasmus Villemoes <rasmus.villemoes@xxxxxxxxx> > > > > Applied, thanks. > > > > Sorry, I didn't know you already had a similar patch queued for 4.16 > (85f8ee78ab ARM: dts: ls1021a: Add support for QSPI with ls1021a SoC), > so I have to ask you to unapply (or do you want me to send a revert?) - > the ls1021a.dtsi in your imx/dt branch now has two almost-identical > qspi: nodes. Ah, I did not notice that either. Patch dropped. Shawn -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
