Skip to content

Commit

Permalink
riscv: dts: canaan: Fix SPI3 bus width
Browse files Browse the repository at this point in the history
According to the K210 Standalone SDK Programming guide:
https://canaan-creative.com/wp-content/uploads/2020/03/kendryte_standalone_programming_guide_20190311144158_en.pdf

Section 15.4.3.3:
SPI0 and SPI1 supports: standard, dual, quad and octal transfers.
SPI3 supports: standard, dual and quad transfers (octal is not supported).

In order to support quad transfers (Quad SPI), SPI3 must have four IO wires
connected to the SPI flash.

Update the device tree to specify the correct bus width.

Tested on maix bit, maix dock and maixduino, which all have the same
SPI flash (gd25lq128d) connected to SPI3. maix go is untested, but it
would not make sense for this k210 board to be designed differently.

Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Fixes: 8f5b0e7 ("riscv: Add SiPeed MAIXDUINO board device tree")
Fixes: 8194f08 ("riscv: Add SiPeed MAIX GO board device tree")
Fixes: a40f920 ("riscv: Add SiPeed MAIX DOCK board device tree")
Fixes: 97c279b ("riscv: Add SiPeed MAIX BiT board device tree")
Cc: stable@vger.kernel.org
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
  • Loading branch information
Niklas Cassel authored and Palmer Dabbelt committed Mar 31, 2022
1 parent bee7fbc commit 6846d65
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,8 @@
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
spi-rx-bus-width = <4>;
m25p,fast-read;
broken-flash-reset;
};
Expand Down
2 changes: 2 additions & 0 deletions arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
spi-rx-bus-width = <4>;
m25p,fast-read;
broken-flash-reset;
};
Expand Down
2 changes: 2 additions & 0 deletions arch/riscv/boot/dts/canaan/sipeed_maix_go.dts
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
spi-rx-bus-width = <4>;
m25p,fast-read;
broken-flash-reset;
};
Expand Down
2 changes: 2 additions & 0 deletions arch/riscv/boot/dts/canaan/sipeed_maixduino.dts
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <50000000>;
spi-tx-bus-width = <4>;
spi-rx-bus-width = <4>;
m25p,fast-read;
broken-flash-reset;
};
Expand Down

0 comments on commit 6846d65

Please sign in to comment.