riscv: sifive/fu540: Enable SPI-NOR support
Subsystems (3)
cover riscv: sifive/fu540: Enable SPI-NOR support
This patchset, enable SPI-NOR flash on SiFive hifive-unleashed-a00 board.
patch 0001 - 02: support devicetree
patch 0003: add is25wp256 chip
patch 0004 - 05: enable spi-nor flash
All tested in Sifive fuse540 hifive-unleashed-a00 board.
Any inputs?
Jagan.
Jagan Teki (5):
riscv: dts: Add hifive-unleashed-a00 dts from Linux
sifive: fu540: Enable OF_SEPARATE
mtd: spi-nor: ids: Add is25wp256 chip
riscv: dts: hifive-unleashed-a00: Add -u-boot.dtsi
sifive: fu540: Enable spi-nor flash support
arch/riscv/dts/Makefile | 1 + arch/riscv/dts/fu540-c000.dtsi | 235 ++++++++++++++++++ .../dts/hifive-unleashed-a00-u-boot.dtsi | 11 + arch/riscv/dts/hifive-unleashed-a00.dts | 88 +++++++ board/sifive/fu540/Kconfig | 3 + configs/sifive_fu540_defconfig | 3 +- doc/board/sifive/fu540.rst | 21 +- drivers/mtd/spi/spi-nor-ids.c | 2 + 8 files changed, 362 insertions(+), 2 deletions(-) create mode 100644 arch/riscv/dts/fu540-c000.dtsi create mode 100644 arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi create mode 100644 arch/riscv/dts/hifive-unleashed-a00.dts
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 1/5 riscv: dts: Add hifive-unleashed-a00 dts from Linux
Sync the hifive-unleashed-a00 dts from Linux with
below commit details:
commit 11ae2d892139a1086f257188d457ddcb71ab5257
Author: Paul Walmsley <[email protected]> Date: Thu Jul 25 13:41:31 2019 -0700
riscv: dts: fu540-c000: drop "timebase-frequency"
Idea is to periodically sync the dts from Linux instead of tweeking internal changes one after another, so better not add any intermediate changes in between. This would help to maintain the dts files easy and meaningful since we are reusing devicetree files from Linux.
--- arch/riscv/dts/Makefile | 1 + arch/riscv/dts/fu540-c000.dtsi | 235 ++++++++++++++++++++++++ arch/riscv/dts/hifive-unleashed-a00.dts | 88 +++++++++ 3 files changed, 324 insertions(+) create mode 100644 arch/riscv/dts/fu540-c000.dtsi create mode 100644 arch/riscv/dts/hifive-unleashed-a00.dts
arch/riscv/dts/Makefile +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ dtb-$(CONFIG_TARGET_AX25_AE350) += ae350_32.dtb ae350_64.dtb +dtb-$(CONFIG_TARGET_SIFIVE_FU540) += hifive-unleashed-a00.dtb targets += $(dtb-y)
arch/riscv/dts/fu540-c000.dtsi new file +235 -0
235 lines not on this page · raw message
arch/riscv/dts/hifive-unleashed-a00.dts new file +88 -0
88 lines not on this page · raw message
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 1/5 riscv: dts: Add hifive-unleashed-a00 dts from Linux
Hi Jagan,
Quoted 4 lines · Jagan Teki
Sync the hifive-unleashed-a00 dts from Linux with below commit details:
commit11ae2d892139a1086f257188d457ddcb71ab5257
The latest commit should be:
commit c81007116bd23e9e2103c267184dc38d3acc1099
Author: Bin Meng <[email protected]> Date: Thu Sep 5 05:45:53 2019 -0700
riscv: dts: sifive: Drop "clock-frequency" property of cpu nodes
Could you use the latest one?
Quoted 7 lines
Author: Paul Walmsley <[email protected]> Date: Thu Jul 25 13:41:31 2019 -0700riscv: dts: fu540-c000: drop "timebase-frequency"Idea is to periodically sync the dts from Linux instead of tweeking internal changes one after another, so better not
typo, tweaking
Quoted 3 lines
add any intermediate changes in between. This would help to maintain the dts files easy and meaningful since we are reusing devicetree files from Linux.
nits: device tree
Quoted 10 lines
Signed-off-by Jagan Teki <[email protected]>--- arch/riscv/dts/Makefile | 1 + arch/riscv/dts/fu540-c000.dtsi | 235 ++++++++++++++++++++++++ arch/riscv/dts/hifive-unleashed-a00.dts | 88 +++++++++ 3 files changed, 324 insertions(+) create mode 100644 arch/riscv/dts/fu540-c000.dtsi create mode 100644 arch/riscv/dts/hifive-unleashed-a00.dts
Regards,
Bin
PATCH 1/5 riscv: dts: Add hifive-unleashed-a00 dts from Linux
Quoted 11 lines · Bin Meng
Hi Jagan,
Quoted 4 lines · Jagan Teki
Sync the hifive-unleashed-a00 dts from Linux with
below commit details:
commit11ae2d892139a1086f257188d457ddcb71ab5257The latest commit should be:
Quoted 7 lines
commit
c81007116bd23e9e2103c267184dc38d3acc1099Author: Bin Meng <[email protected]> Date: Thu Sep 5 05:45:53 2019 -0700riscv: dts: sifive: Drop "clock-frequency" property of cpu nodes
Could you use the latest one?
Yes, will use this.
PATCH 1/5 riscv: dts: Add hifive-unleashed-a00 dts from Linux
In reply to Bin MengQuoted 11 lines · Bin Meng
Hi Jagan,
Quoted 4 lines · Jagan Teki
Sync the hifive-unleashed-a00 dts from Linux with
below commit details:
commit11ae2d892139a1086f257188d457ddcb71ab5257The latest commit should be:
Quoted 7 lines
commit
c81007116bd23e9e2103c267184dc38d3acc1099Author: Bin Meng <[email protected]> Date: Thu Sep 5 05:45:53 2019 -0700riscv: dts: sifive: Drop "clock-frequency" property of cpu nodes
Could you use the latest one?
Syncing these commits other than the patch used one seems not working. SBI is failing to load u-boot-dtb.bin. I think this would some sort of cpu nodes changes on commits after
riscv: dts: fu540-c000: drop "timebase-frequency"
Auer
PATCH 1/5 riscv: dts: Add hifive-unleashed-a00 dts from Linux
Hi Jagan,
Quoted 14 lines · Jagan Teki
Quoted 13 lines · Bin Meng
Hi Jagan,
Quoted 3 lines · Jagan Teki
Sync the hifive-unleashed-a00 dts from Linux with
below commit details:
commit11ae2d892139a1086f257188d457ddcb71ab5257The latest commit should be:
commit
c81007116bd23e9e2103c267184dc38d3acc1099Author: Bin Meng <[email protected]> Date: Thu Sep 5 05:45:53 2019 -0700
Quoted 8 lines
Quoted 3 lines
riscv: dts: sifive: Drop "clock-frequency" property of cpu nodes
Could you use the latest one?
Syncing these commits other than the patch used one seems not working. SBI is failing to load u-boot-dtb.bin. I think this would some sort of cpu nodes changes on commits after
riscv: dts: fu540-c000: drop "timebase-frequency"
I just tried it with the device tree from the commit Bin referred to and did not have any problems starting U-Boot. Are you perhaps only missing chosen/stdout-path?
Thanks,
Lukas
Auer
PATCH 1/5 riscv: dts: Add hifive-unleashed-a00 dts from Linux
In reply to Jagan TekiHi Jagan,
Quoted 288 lines · Jagan Teki
Sync the hifive-unleashed-a00 dts from Linux with
below commit details:
commit11ae2d892139a1086f257188d457ddcb71ab5257Author: Paul Walmsley <[email protected]> Date: Thu Jul 25 13:41:31 2019 -0700riscv: dts: fu540-c000: drop "timebase-frequency"Idea is to periodically sync the dts from Linux instead of tweeking internal changes one after another, so better not add any intermediate changes in between. This would help to maintain the dts files easy and meaningful since we are reusing devicetree files from Linux.
Signed-off-by Jagan Teki <[email protected]>--- arch/riscv/dts/Makefile | 1 + arch/riscv/dts/fu540-c000.dtsi | 235 ++++++++++++++++++++++++ arch/riscv/dts/hifive-unleashed-a00.dts | 88 +++++++++ 3 files changed, 324 insertions(+) create mode 100644 arch/riscv/dts/fu540-c000.dtsi create mode 100644 arch/riscv/dts/hifive-unleashed-a00.dtsarch/riscv/dts/Makefile +1
-0@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ dtb-$(CONFIG_TARGET_AX25_AE350) += ae350_32.dtb ae350_64.dtb +dtb-$(CONFIG_TARGET_SIFIVE_FU540) += hifive-unleashed-a00.dtb targets += $(dtb-y)arch/riscv/dts/fu540-c000.dtsi new file +235
-0@@ -0,0 +1,235 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* Copyright (c) 2018-2019 SiFive, Inc */ + +/dts-v1/; + +#include <dt-bindings/clock/sifive-fu540-prci.h> + +/ { + #address-cells = <2>; + #size-cells = <2>; + compatible = "sifive,fu540-c000", "sifive,fu540"; + + aliases { + serial0 = &uart0; + serial1 = &uart1; + }; + + chosen { + }; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + cpu0: cpu at 0 { + compatible = "sifive,e51", "sifive,rocket0", "riscv"; + device_type = "cpu"; + i-cache-block-size = <64>; + i-cache-sets = <128>; + i-cache-size = <16384>; + reg = <0>; + riscv,isa = "rv64imac"; + status = "disabled"; + cpu0_intc: interrupt-controller { + #interrupt-cells = <1>; + compatible = "riscv,cpu-intc"; + interrupt-controller; + }; + }; + cpu1: cpu at 1 { + compatible = "sifive,u54-mc", "sifive,rocket0", "riscv"; + d-cache-block-size = <64>; + d-cache-sets = <64>; + d-cache-size = <32768>; + d-tlb-sets = <1>; + d-tlb-size = <32>; + device_type = "cpu"; + i-cache-block-size = <64>; + i-cache-sets = <64>; + i-cache-size = <32768>; + i-tlb-sets = <1>; + i-tlb-size = <32>; + mmu-type = "riscv,sv39"; + reg = <1>; + riscv,isa = "rv64imafdc"; + tlb-split; + cpu1_intc: interrupt-controller { + #interrupt-cells = <1>; + compatible = "riscv,cpu-intc"; + interrupt-controller; + }; + }; + cpu2: cpu at 2 { + clock-frequency = <0>; + compatible = "sifive,u54-mc", "sifive,rocket0", "riscv"; + d-cache-block-size = <64>; + d-cache-sets = <64>; + d-cache-size = <32768>; + d-tlb-sets = <1>; + d-tlb-size = <32>; + device_type = "cpu"; + i-cache-block-size = <64>; + i-cache-sets = <64>; + i-cache-size = <32768>; + i-tlb-sets = <1>; + i-tlb-size = <32>; + mmu-type = "riscv,sv39"; + reg = <2>; + riscv,isa = "rv64imafdc"; + tlb-split; + cpu2_intc: interrupt-controller { + #interrupt-cells = <1>; + compatible = "riscv,cpu-intc"; + interrupt-controller; + }; + }; + cpu3: cpu at 3 { + clock-frequency = <0>; + compatible = "sifive,u54-mc", "sifive,rocket0", "riscv"; + d-cache-block-size = <64>; + d-cache-sets = <64>; + d-cache-size = <32768>; + d-tlb-sets = <1>; + d-tlb-size = <32>; + device_type = "cpu"; + i-cache-block-size = <64>; + i-cache-sets = <64>; + i-cache-size = <32768>; + i-tlb-sets = <1>; + i-tlb-size = <32>; + mmu-type = "riscv,sv39"; + reg = <3>; + riscv,isa = "rv64imafdc"; + tlb-split; + cpu3_intc: interrupt-controller { + #interrupt-cells = <1>; + compatible = "riscv,cpu-intc"; + interrupt-controller; + }; + }; + cpu4: cpu at 4 { + clock-frequency = <0>; + compatible = "sifive,u54-mc", "sifive,rocket0", "riscv"; + d-cache-block-size = <64>; + d-cache-sets = <64>; + d-cache-size = <32768>; + d-tlb-sets = <1>; + d-tlb-size = <32>; + device_type = "cpu"; + i-cache-block-size = <64>; + i-cache-sets = <64>; + i-cache-size = <32768>; + i-tlb-sets = <1>; + i-tlb-size = <32>; + mmu-type = "riscv,sv39"; + reg = <4>; + riscv,isa = "rv64imafdc"; + tlb-split; + cpu4_intc: interrupt-controller { + #interrupt-cells = <1>; + compatible = "riscv,cpu-intc"; + interrupt-controller; + }; + }; + }; + soc { + #address-cells = <2>; + #size-cells = <2>; + compatible = "sifive,fu540-c000", "sifive,fu540", "simple-bus"; + ranges; + plic0: interrupt-controller at c000000 { + #interrupt-cells = <1>; + compatible = "sifive,plic-1.0.0"; + reg = <0x0 0xc000000 0x0 0x4000000>; + riscv,ndev = <53>; + interrupt-controller; + interrupts-extended = < + &cpu0_intc 0xffffffff + &cpu1_intc 0xffffffff &cpu1_intc 9 + &cpu2_intc 0xffffffff &cpu2_intc 9 + &cpu3_intc 0xffffffff &cpu3_intc 9 + &cpu4_intc 0xffffffff &cpu4_intc 9>; + }; + prci: clock-controller at 10000000 { + compatible = "sifive,fu540-c000-prci"; + reg = <0x0 0x10000000 0x0 0x1000>; + clocks = <&hfclk>, <&rtcclk>; + #clock-cells = <1>; + }; + uart0: serial at 10010000 { + compatible = "sifive,fu540-c000-uart", "sifive,uart0"; + reg = <0x0 0x10010000 0x0 0x1000>; + interrupt-parent = <&plic0>; + interrupts = <4>; + clocks = <&prci PRCI_CLK_TLCLK>; + status = "disabled"; + }; + uart1: serial at 10011000 { + compatible = "sifive,fu540-c000-uart", "sifive,uart0"; + reg = <0x0 0x10011000 0x0 0x1000>; + interrupt-parent = <&plic0>; + interrupts = <5>; + clocks = <&prci PRCI_CLK_TLCLK>; + status = "disabled"; + }; + i2c0: i2c at 10030000 { + compatible = "sifive,fu540-c000-i2c", "sifive,i2c0"; + reg = <0x0 0x10030000 0x0 0x1000>; + interrupt-parent = <&plic0>; + interrupts = <50>; + clocks = <&prci PRCI_CLK_TLCLK>; + reg-shift = <2>; + reg-io-width = <1>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + qspi0: spi at 10040000 { + compatible = "sifive,fu540-c000-spi", "sifive,spi0"; + reg = <0x0 0x10040000 0x0 0x1000 + 0x0 0x20000000 0x0 0x10000000>; + interrupt-parent = <&plic0>; + interrupts = <51>; + clocks = <&prci PRCI_CLK_TLCLK>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + qspi1: spi at 10041000 { + compatible = "sifive,fu540-c000-spi", "sifive,spi0"; + reg = <0x0 0x10041000 0x0 0x1000 + 0x0 0x30000000 0x0 0x10000000>; + interrupt-parent = <&plic0>; + interrupts = <52>; + clocks = <&prci PRCI_CLK_TLCLK>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + qspi2: spi at 10050000 { + compatible = "sifive,fu540-c000-spi", "sifive,spi0"; + reg = <0x0 0x10050000 0x0 0x1000>; + interrupt-parent = <&plic0>; + interrupts = <6>; + clocks = <&prci PRCI_CLK_TLCLK>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + eth0: ethernet at 10090000 { + compatible = "sifive,fu540-c000-gem"; + interrupt-parent = <&plic0>; + interrupts = <53>; + reg = <0x0 0x10090000 0x0 0x2000 + 0x0 0x100a0000 0x0 0x1000>; + local-mac-address = [00 00 00 00 00 00]; + clock-names = "pclk", "hclk"; + clocks = <&prci PRCI_CLK_GEMGXLPLL>, + <&prci PRCI_CLK_GEMGXLPLL>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + }; +};arch/riscv/dts/hifive-unleashed-a00.dts new file +6
-0@@ -0,0 +1,88 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* Copyright (c) 2018-2019 SiFive, Inc */ + +#include "fu540-c000.dtsi" + +/* Clock frequency (in Hz) of the PCB crystal for rtcclk */
arch/riscv/dts/hifive-unleashed-a00.dts line 16
Quoted 10 lines
arch/riscv/dts/hifive-unleashed-a00.dts new file +10
-0+#define RTCCLK_FREQ 1000000 + +/ { + #address-cells = <2>; + #size-cells = <2>; + model = "SiFive HiFive Unleashed A00"; + compatible = "sifive,hifive-unleashed-a00", "sifive,fu540-c000"; + + chosen { + stdout-path = "/soc/serial at 10010000:115200";
This is not part of the upstream Linux device tree, so it is probably better to put it into hifive-unleashed-a00-u-boot.dtsi.
Thanks,
Lukas
Quoted 72 lines
arch/riscv/dts/hifive-unleashed-a00.dts new file +72
-0+ }; + + cpus { + timebase-frequency = <RTCCLK_FREQ>; + }; + + memory at 80000000 { + device_type = "memory"; + reg = <0x0 0x80000000 0x2 0x00000000>; + }; + + soc { + }; + + hfclk: hfclk { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <33333333>; + clock-output-names = "hfclk"; + }; + + rtcclk: rtcclk { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <RTCCLK_FREQ>; + clock-output-names = "rtcclk"; + }; +}; + +&uart0 { + status = "okay"; +}; + +&uart1 { + status = "okay"; +}; + +&i2c0 { + status = "okay"; +}; + +&qspi0 { + status = "okay"; + flash at 0 { + compatible = "issi,is25wp256", "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <50000000>; + m25p,fast-read; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; +}; + +&qspi2 { + status = "okay"; + mmc at 0 { + compatible = "mmc-spi-slot"; + reg = <0>; + spi-max-frequency = <20000000>; + voltage-ranges = <3300 3300>; + disable-wp; + }; +}; + +ð0 { + status = "okay"; + phy-mode = "gmii"; + phy-handle = <&phy0>; + phy0: ethernet-phy at 0 { + reg = <0>; + }; +};
PATCH 2/5 sifive: fu540: Enable OF_SEPARATE
In reply to Jagan TekiUse dts support from U-Boot via OF_SEPARATE instead of depending from opensbi.
This would help to make the necessary changes in drivers and devicetrees in uboot tree itself. this feature would also be helpful to not pass dtb during opensbi builds.
--- configs/sifive_fu540_defconfig | 3 ++- doc/board/sifive/fu540.rst | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
configs/sifive_fu540_defconfig +2 -1
@@ -6,6 +6,7 @@ CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_MISC_INIT_R=y +CONFIG_DEFAULT_DEVICE_TREE="hifive-unleashed-a00" CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y -CONFIG_OF_PRIOR_STAGE=y +CONFIG_OF_SEPARATE=y
doc/board/sifive/fu540.rst +1 -1
@@ -58,7 +58,7 @@ firmware. We need to compile OpenSBI with below command: .. code-block:: none - make PLATFORM=sifive/fu540 FW_PAYLOAD_PATH=<path to u-boot.bin> FW_PAYLOAD_FDT_PATH=<path to hifive-unleashed-a00.dtb from Linux> + make PLATFORM=sifive/fu540 FW_PAYLOAD_PATH=<path to u-boot-dtb.bin> (Note: Prefer hifive-unleashed-a00.dtb from Linux-5.3 or higher) (Note: Linux-5.2 is also fine but it does not have ethernet DT node)
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 2/5 sifive: fu540: Enable OF_SEPARATE
Quoted 5 lines · Jagan Teki
Use dts support from U-Boot via
OF_SEPARATEinstead of depending from opensbi.This would help to make the necessary changes in drivers and devicetrees
nits: device trees
Quoted 1 line
in uboot tree itself. this feature would also be helpful to not pass
U-Boot. This feature
Quoted 8 lines
dtb during opensbi builds.
Signed-off-by Jagan Teki <[email protected]>--- configs/sifive_fu540_defconfig | 3 ++- doc/board/sifive/fu540.rst | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
Regards,
Bin
PATCH 3/5 mtd: spi-nor: ids: Add is25wp256 chip
In reply to Jagan TekiAdd is25wp256, chip to spi-nor id table.
Tested on Sifive fuse540 board.
--- drivers/mtd/spi/spi-nor-ids.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/mtd/spi/spi-nor-ids.c +2 -0
@@ -128,6 +128,8 @@ const struct flash_info spi_nor_ids[] = { SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { INFO("is25wp128", 0x9d7018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { INFO("is25wp256", 0x9d7019, 0, 64 * 1024, 512, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, #endif #ifdef CONFIG_SPI_FLASH_MACRONIX /* MACRONIX *//* Macronix */
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 3/5 mtd: spi-nor: ids: Add is25wp256 chip
Quoted 4 lines · Jagan Teki
Add is25wp256, chip to spi-nor id table.
Tested on Sifive fuse540 board.
Should be: SiFive FU540
Quoted 6 lines
Signed-off-by Jagan Teki <[email protected]>--- drivers/mtd/spi/spi-nor-ids.c | 2 ++ 1 file changed, 2 insertions(+)
PATCH 4/5 riscv: dts: hifive-unleashed-a00: Add -u-boot.dtsi
In reply to Jagan TekiAdd u-boot specific dts file for hifive-unleashed-a00, this would help to add u-boot specific properties and other node changes without touching the base dts(i) files which are easy to sync from Linux.
Added spi2 alias for qspi2 as an initial u-boot specific property change.
spi probing in current dm model is very much rely on aliases numbering. even though the qspi2 can't comes under any associated spi nor flash it would require to specify the same to make proper binding happen for other spi slaves.
--- arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi
arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi new file +10 -0
@@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki <[email protected]> + */ + +/ { + aliases { + spi2 = &qspi2; + }; +};
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 4/5 riscv: dts: hifive-unleashed-a00: Add -u-boot.dtsi
Hi Jagan,
Quoted 26 lines · Jagan Teki
Add u-boot specific dts file for hifive-unleashed-a00, this would help to add u-boot specific properties and other node changes without touching the base dts(i) files which are easy to sync from Linux.
Added spi2 alias for qspi2 as an initial u-boot specific property change.
spi probing in current dm model is very much rely on aliases numbering. even though the qspi2 can't comes under any associated spi nor flash it would require to specify the same to make proper binding happen for other spi slaves.
Signed-off-by Jagan Teki <[email protected]>--- arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsiarch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi new file +0
-0
arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi line 8
Quoted 8 lines
arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi new file +8
-0@@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki <[email protected]> + */ + +/ { + aliases { + spi2 = &qspi2;
With the following 2 patches, this is no longer needed for SPI.
http://patchwork.ozlabs.org/patch/1158960/
http://patchwork.ozlabs.org/patch/1158961/
arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi
Quoted 3 lines
arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi new file +2
-1+ }; +}; --
Regards,
Bin
PATCH 4/5 riscv: dts: hifive-unleashed-a00: Add -u-boot.dtsi
Quoted 41 lines · Bin Meng
Hi Jagan,
Quoted 26 lines · Jagan Teki
Add u-boot specific dts file for hifive-unleashed-a00, this would help to add u-boot specific properties and other node changes without touching the base dts(i) files which are easy to sync from Linux.
Added spi2 alias for qspi2 as an initial u-boot specific property change.
spi probing in current dm model is very much rely on aliases numbering. even though the qspi2 can't comes under any associated spi nor flash it would require to specify the same to make proper binding happen for other spi slaves.
Signed-off-by Jagan Teki <[email protected]>--- arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsiarch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi new file +0
-0arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi line 8
Quoted 8 lines
arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi new file +8
-0@@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki <[email protected]> + */ + +/ { + aliases { + spi2 = &qspi2;With the following 2 patches, this is no longer needed for SPI.
Thanks, will check these.
PATCH 4/5 riscv: dts: hifive-unleashed-a00: Add -u-boot.dtsi
In reply to Bin MengQuoted 41 lines · Bin Meng
Hi Jagan,
Quoted 26 lines · Jagan Teki
Add u-boot specific dts file for hifive-unleashed-a00, this would help to add u-boot specific properties and other node changes without touching the base dts(i) files which are easy to sync from Linux.
Added spi2 alias for qspi2 as an initial u-boot specific property change.
spi probing in current dm model is very much rely on aliases numbering. even though the qspi2 can't comes under any associated spi nor flash it would require to specify the same to make proper binding happen for other spi slaves.
Signed-off-by Jagan Teki <[email protected]>--- arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsiarch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi new file +0
-0arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi line 8
Quoted 8 lines
arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi new file +8
-0@@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki <[email protected]> + */ + +/ { + aliases { + spi2 = &qspi2;With the following 2 patches, this is no longer needed for SPI.
These changes doesn't related to this, checked the same. SPI MMC need to bringup like normal spi via alias to make proper graceful probing for next spi slaves.
PATCH 5/5 sifive: fu540: Enable spi-nor flash support
In reply to Jagan TekiHiFive Unleashed A00 has internal is25wp256 spi-nor flash, so enable the same. added test result log for future reference.
Tested on Sifive fuse540 board.
--- .../dts/hifive-unleashed-a00-u-boot.dtsi | 1 + board/sifive/fu540/Kconfig | 3 +++ doc/board/sifive/fu540.rst | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+)
arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi +1 -0
@@ -5,6 +5,7 @@ / { aliases { + spi0 = &qspi0; spi2 = &qspi2; }; };
board/sifive/fu540/Kconfig +3 -0
@@ -26,6 +26,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy imply CMD_FS_GENERIC imply CMD_NET imply CMD_PING + imply CMD_SF imply CLK_SIFIVE imply CLK_SIFIVE_FU540_PRCI imply DOS_PARTITION
@@ -40,6 +41,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy imply SIFIVE_SERIAL imply SPI imply SPI_SIFIVE + imply SPI_FLASH + imply SPI_FLASH_ISSI imply MMC imply MMC_SPI imply MMC_BROKEN_CD
doc/board/sifive/fu540.rst +19 -0
@@ -366,3 +366,22 @@ load uImage. Please press Enter to activate this console. / # + +Sample spi nor flash test +------------------------- + +.. code-block:: none + + => sf probe 0:2 + SF: Detected is25wp256 with page size 256 Bytes, erase size 4 KiB, total 32 MiB + => sf erase 0x1000000 0x100000 + SF: 1048576 bytes @ 0x1000000 Erased: OK + => mw.b 0xc0000000 0xaa 0x100000 + => sf write 0xc0000000 0x1000000 0x100000 + device 0 offset 0x1000000, size 0x100000 + SF: 1048576 bytes @ 0x1000000 Written: OK + => sf read 0xf0000000 0x1000000 0x100000 + device 0 offset 0x1000000, size 0x100000 + SF: 1048576 bytes @ 0x1000000 Read: OK + => cmp.b 0xf0000000 0xc0000000 0x100000 + Total of 1048576 byte(s) were the same
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 5/5 sifive: fu540: Enable spi-nor flash support
Quoted 2 lines · Jagan Teki
HiFive Unleashed A00 has internal is25wp256 spi-nor flash,
What does "internal" mean? The flash is mounted "externally" to the FU540 SoC.
Quoted 3 lines
so enable the same. added test result log for future reference.
Tested on Sifive fuse540 board.
SiFive FU540
Quoted 46 lines
Signed-off-by Jagan Teki <[email protected]>--- .../dts/hifive-unleashed-a00-u-boot.dtsi | 1 + board/sifive/fu540/Kconfig | 3 +++ doc/board/sifive/fu540.rst | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+)arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi +1
-0@@ -5,6 +5,7 @@ / { aliases { + spi0 = &qspi0; spi2 = &qspi2; }; };board/sifive/fu540/Kconfig +3
-0@@ -26,6 +26,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy imply CMD_FS_GENERIC imply CMD_NET imply CMD_PING + imply CMD_SF imply CLK_SIFIVE imply CLK_SIFIVE_FU540_PRCI imply DOS_PARTITION@@ -40,6 +41,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy imply SIFIVE_SERIAL imply SPI imply SPI_SIFIVE + imply SPI_FLASH + imply SPI_FLASH_ISSI imply MMC imply MMC_SPI imply MMC_BROKEN_CDdoc/board/sifive/fu540.rst +0
-0
doc/board/sifive/fu540.rst load uImage. · line 375
Quoted 10 lines
doc/board/sifive/fu540.rst +7
-0@@ -366,3 +366,22 @@ load uImage. Please press Enter to activate this console. / # + +Sample spi nor flash test +------------------------- + +.. code-block:: none + + => sf probe 0:2
Why cs 2? The flash is definitely on cs 0.
You may find my patch series useful to solve this issue of the cs number.
http://patchwork.ozlabs.org/project/uboot/list/?series=129736
doc/board/sifive/fu540.rst load uImage.
Quoted 13 lines
doc/board/sifive/fu540.rst +12
-1+ SF: Detected is25wp256 with page size 256 Bytes, erase size 4 KiB, total 32 MiB + => sf erase 0x1000000 0x100000 + SF: 1048576 bytes @ 0x1000000 Erased: OK + => mw.b 0xc0000000 0xaa 0x100000 + => sf write 0xc0000000 0x1000000 0x100000 + device 0 offset 0x1000000, size 0x100000 + SF: 1048576 bytes @ 0x1000000 Written: OK + => sf read 0xf0000000 0x1000000 0x100000 + device 0 offset 0x1000000, size 0x100000 + SF: 1048576 bytes @ 0x1000000 Read: OK + => cmp.b 0xf0000000 0xc0000000 0x100000 + Total of 1048576 byte(s) were the same --
With the above fixed,
Regards,
Bin
PATCH 5/5 sifive: fu540: Enable spi-nor flash support
Quoted 72 lines · Bin Meng
Quoted 2 lines · Jagan Teki
HiFive Unleashed A00 has internal is25wp256 spi-nor flash,
What does "internal" mean? The flash is mounted "externally" to the FU540 SoC.
Quoted 3 lines
so enable the same. added test result log for future reference.
Tested on Sifive fuse540 board.
SiFive FU540
Quoted 46 lines
Signed-off-by Jagan Teki <[email protected]>--- .../dts/hifive-unleashed-a00-u-boot.dtsi | 1 + board/sifive/fu540/Kconfig | 3 +++ doc/board/sifive/fu540.rst | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+)arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi +1
-0@@ -5,6 +5,7 @@ / { aliases { + spi0 = &qspi0; spi2 = &qspi2; }; };board/sifive/fu540/Kconfig +3
-0@@ -26,6 +26,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy imply CMD_FS_GENERIC imply CMD_NET imply CMD_PING + imply CMD_SF imply CLK_SIFIVE imply CLK_SIFIVE_FU540_PRCI imply DOS_PARTITION@@ -40,6 +41,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy imply SIFIVE_SERIAL imply SPI imply SPI_SIFIVE + imply SPI_FLASH + imply SPI_FLASH_ISSI imply MMC imply MMC_SPI imply MMC_BROKEN_CDdoc/board/sifive/fu540.rst +0
-0doc/board/sifive/fu540.rst load uImage. · line 375
Quoted 10 lines
doc/board/sifive/fu540.rst +7
-0@@ -366,3 +366,22 @@ load uImage. Please press Enter to activate this console. / # + +Sample spi nor flash test +------------------------- + +.. code-block:: none + + => sf probe 0:2Why cs 2? The flash is definitely on cs 0.
Quoted 2 lines
You may find my patch series useful to solve this issue of the cs number.
http://patchwork.ozlabs.org/project/uboot/list/?series=129736
I have checked this, while working on this. let me rebase again.
cover riscv: sifive/fu540: Enable SPI-NOR support
In reply to Jagan TekiHi Jagan,
Quoted 6 lines · Jagan Teki
This patchset, enable SPI-NOR flash on SiFive hifive-unleashed-a00 board.
patch 0001 - 02: support devicetree
Quoted 7 lines
patch 0003: add is25wp256 chip
patch 0004 - 05: enable spi-nor flash
All tested in Sifive fuse540 hifive-unleashed-a00 board.
Any inputs?
Is this independent work? I see this series was posted by SiFive folks before.
http://patchwork.ozlabs.org/project/uboot/list/?series=124900
Regards,
Bin
cover riscv: sifive/fu540: Enable SPI-NOR support
Hi Bin,
Quoted 12 lines · Bin Meng
Hi Jagan,
Quoted 8 lines · Jagan Teki
This patchset, enable SPI-NOR flash on SiFive hifive-unleashed-a00 board.
patch 0001 - 02: support devicetree
patch 0003: add is25wp256 chip
Quoted 8 lines
Quoted 5 lines
patch 0004 - 05: enable spi-nor flash
All tested in Sifive fuse540 hifive-unleashed-a00 board.
Any inputs?
Is this independent work? I see this series was posted by SiFive folks before.
http://patchwork.ozlabs.org/project/uboot/list/?series=124900
Yes, this would be an independent. Missed seeing this thread in ML.
cover riscv: sifive/fu540: Enable SPI-NOR support
Hi Jagan,
Quoted 18 lines · Jagan Teki
Hi Bin,
Quoted 14 lines · Bin Meng
Hi Jagan,
Quoted 10 lines · Jagan Teki
This patchset, enable SPI-NOR flash on SiFive hifive-unleashed-a00 board.
patch 0001 - 02: support devicetree
patch 0003: add is25wp256 chip
patch 0004 - 05: enable spi-nor flash
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
All tested in Sifive fuse540 hifive-unleashed-a00 board.
Any inputs?
Is this independent work? I see this series was posted by SiFive folks before.
http://patchwork.ozlabs.org/project/uboot/list/?series=124900Yes, this would be an independent. Missed seeing this thread in ML.
Good to know. Previous spi-nor patch series submitted by SiFive folks never worked for me as it bricked my board.
Regards,
Bin