diff options
author | Dinh Nguyen <dinguyen@kernel.org> | 2021-11-22 09:10:03 -0600 |
---|---|---|
committer | Dinh Nguyen <dinguyen@kernel.org> | 2021-12-27 04:20:06 -0600 |
commit | 36de991e93908f7ad5c2a0eac9c4ecf8b723fa4a (patch) | |
tree | 5f15180537ae389dd70153ce8972ff55b5125259 /arch/arm | |
parent | f34e8875ae244462711e31fcc4a82db13a16d36f (diff) | |
download | lwn-36de991e93908f7ad5c2a0eac9c4ecf8b723fa4a.tar.gz lwn-36de991e93908f7ad5c2a0eac9c4ecf8b723fa4a.zip |
ARM: dts: socfpga: change qspi to "intel,socfpga-qspi"
Because of commit 9cb2ff111712 ("spi: cadence-quadspi: Disable Auto-HW polling"),
which does a write to the CQSPI_REG_WR_COMPLETION_CTRL register
regardless of any condition. Well, the Cadence QuadSPI controller on
Intel's SoCFPGA platforms does not implement the
CQSPI_REG_WR_COMPLETION_CTRL register, thus a write to this register
results in a crash!
So starting with v5.16, I introduced the patch
98d948eb833 ("spi: cadence-quadspi: fix write completion support"),
which adds the dts compatible "intel,socfpga-qspi" that is specific for
versions that doesn't have the CQSPI_REG_WR_COMPLETION_CTRL register implemented.
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
---
v3: revert back to "intel,socfpga-qspi"
v2: use both "cdns,qspi-nor" and "cdns,qspi-nor-0010"
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/socfpga.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/socfpga_arria10.dtsi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi index 0b021eef0b53..7c1d6423d7f8 100644 --- a/arch/arm/boot/dts/socfpga.dtsi +++ b/arch/arm/boot/dts/socfpga.dtsi @@ -782,7 +782,7 @@ }; qspi: spi@ff705000 { - compatible = "cdns,qspi-nor"; + compatible = "intel,socfpga-qspi", "cdns,qspi-nor"; #address-cells = <1>; #size-cells = <0>; reg = <0xff705000 0x1000>, diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi index a574ea91d9d3..3ba431dfa8c9 100644 --- a/arch/arm/boot/dts/socfpga_arria10.dtsi +++ b/arch/arm/boot/dts/socfpga_arria10.dtsi @@ -756,7 +756,7 @@ }; qspi: spi@ff809000 { - compatible = "cdns,qspi-nor"; + compatible = "intel,socfpga-qspi", "cdns,qspi-nor"; #address-cells = <1>; #size-cells = <0>; reg = <0xff809000 0x100>, |