| Message ID | 20180126142014.13819-1-rasmus.villemoes@prevas.dk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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@prevas.dk> Applied, thanks.
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@prevas.dk> > > 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. Rasmus
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@prevas.dk> > > > > 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
diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi index d82d8fa7afbb..5e5c84db3946 100644 --- a/arch/arm/boot/dts/ls1021a.dtsi +++ b/arch/arm/boot/dts/ls1021a.dtsi @@ -162,6 +162,20 @@ big-endian; }; + qspi: quadspi@1550000 { + compatible = "fsl,ls1021a-qspi"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x0 0x1550000 0x0 0x10000>, + <0x0 0x40000000 0x0 0x4000000>; + reg-names = "QuadSPI", "QuadSPI-memory"; + interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "qspi_en", "qspi"; + clocks = <&clockgen 4 1>, <&clockgen 4 1>; + big-endian; + status = "disabled"; + }; + esdhc: esdhc@1560000 { compatible = "fsl,esdhc"; reg = <0x0 0x1560000 0x0 0x10000>;
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@prevas.dk> --- arch/arm/boot/dts/ls1021a.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+)