| Message ID | 20160916130947.11367-9-sr@denx.de |
|---|---|
| State | Superseded |
| Delegated to: | Stefan Roese |
| Headers | show |
On Fri, Sep 16, 2016 at 6:39 PM, Stefan Roese <sr@denx.de> wrote: > This patch adds the SPI device tree nodes that are still missing to > the Armada 3700 dts files. > > Signed-off-by: Stefan Roese <sr@denx.de> > Cc: Nadav Haklai <nadavh@marvell.com> > Cc: Kostya Porotchkin <kostap@marvell.com> > Cc: Wilson Ding <dingwei@marvell.com> > Cc: Victor Gu <xigu@marvell.com> > Cc: Hua Jing <jinghua@marvell.com> > Cc: Terry Zhou <bjzhou@marvell.com> > Cc: Hanna Hawa <hannah@marvell.com> > Cc: Haim Boot <hayim@marvell.com> > --- > arch/arm/dts/armada-3720-db.dts | 17 +++++++++++++++++ > arch/arm/dts/armada-37xx.dtsi | 11 +++++++++++ > 2 files changed, 28 insertions(+) > > diff --git a/arch/arm/dts/armada-3720-db.dts b/arch/arm/dts/armada-3720-db.dts > index 86110a6..52c90c2 100644 > --- a/arch/arm/dts/armada-3720-db.dts > +++ b/arch/arm/dts/armada-3720-db.dts > @@ -56,6 +56,10 @@ > stdout-path = "serial0:115200n8"; > }; > > + aliases { > + spi0 = &spi0; > + }; > + > memory { > device_type = "memory"; > reg = <0x00000000 0x00000000 0x00000000 0x20000000>; > @@ -67,6 +71,19 @@ > status = "okay"; > }; > > +&spi0 { > + status = "okay"; > + > + spi-flash@0 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "st,m25p128", "jedec,spi-nor"; Use spi-flash instead of jedec,spi-nor thanks!
diff --git a/arch/arm/dts/armada-3720-db.dts b/arch/arm/dts/armada-3720-db.dts index 86110a6..52c90c2 100644 --- a/arch/arm/dts/armada-3720-db.dts +++ b/arch/arm/dts/armada-3720-db.dts @@ -56,6 +56,10 @@ stdout-path = "serial0:115200n8"; }; + aliases { + spi0 = &spi0; + }; + memory { device_type = "memory"; reg = <0x00000000 0x00000000 0x00000000 0x20000000>; @@ -67,6 +71,19 @@ status = "okay"; }; +&spi0 { + status = "okay"; + + spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "st,m25p128", "jedec,spi-nor"; + reg = <0>; /* Chip select 0 */ + spi-max-frequency = <50000000>; + m25p,fast-read; + }; +}; + /* Exported on the micro USB connector CON32 through an FTDI */ &uart0 { status = "okay"; diff --git a/arch/arm/dts/armada-37xx.dtsi b/arch/arm/dts/armada-37xx.dtsi index 9e2efb8..bb14f54 100644 --- a/arch/arm/dts/armada-37xx.dtsi +++ b/arch/arm/dts/armada-37xx.dtsi @@ -140,6 +140,17 @@ reg = <0x1d00000 0x10000>, /* GICD */ <0x1d40000 0x40000>; /* GICR */ }; + + spi0: spi@10600 { + compatible = "marvell,armada-3700-spi"; + reg = <0x10600 0x50>; + #address-cells = <1>; + #size-cells = <0>; + #clock-cells = <0>; + clock-frequency = <160000>; + spi-max-frequency = <40000>; + status = "disabled"; + }; }; }; };
This patch adds the SPI device tree nodes that are still missing to the Armada 3700 dts files. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Nadav Haklai <nadavh@marvell.com> Cc: Kostya Porotchkin <kostap@marvell.com> Cc: Wilson Ding <dingwei@marvell.com> Cc: Victor Gu <xigu@marvell.com> Cc: Hua Jing <jinghua@marvell.com> Cc: Terry Zhou <bjzhou@marvell.com> Cc: Hanna Hawa <hannah@marvell.com> Cc: Haim Boot <hayim@marvell.com> --- arch/arm/dts/armada-3720-db.dts | 17 +++++++++++++++++ arch/arm/dts/armada-37xx.dtsi | 11 +++++++++++ 2 files changed, 28 insertions(+)