Skip to content

Commit 36de991

Browse files
author
Dinh Nguyen
committed
ARM: dts: socfpga: change qspi to "intel,socfpga-qspi"
Because of commit 9cb2ff1 ("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 98d948e ("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 <[email protected]> --- v3: revert back to "intel,socfpga-qspi" v2: use both "cdns,qspi-nor" and "cdns,qspi-nor-0010"
1 parent f34e887 commit 36de991

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

arch/arm/boot/dts/socfpga.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@
782782
};
783783

784784
qspi: spi@ff705000 {
785-
compatible = "cdns,qspi-nor";
785+
compatible = "intel,socfpga-qspi", "cdns,qspi-nor";
786786
#address-cells = <1>;
787787
#size-cells = <0>;
788788
reg = <0xff705000 0x1000>,

arch/arm/boot/dts/socfpga_arria10.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@
756756
};
757757

758758
qspi: spi@ff809000 {
759-
compatible = "cdns,qspi-nor";
759+
compatible = "intel,socfpga-qspi", "cdns,qspi-nor";
760760
#address-cells = <1>;
761761
#size-cells = <0>;
762762
reg = <0xff809000 0x100>,

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@
594594
};
595595

596596
qspi: spi@ff8d2000 {
597-
compatible = "cdns,qspi-nor";
597+
compatible = "intel,socfpga-qspi", "cdns,qspi-nor";
598598
#address-cells = <1>;
599599
#size-cells = <0>;
600600
reg = <0xff8d2000 0x100>,

arch/arm64/boot/dts/intel/socfpga_agilex.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@
628628
};
629629

630630
qspi: spi@ff8d2000 {
631-
compatible = "cdns,qspi-nor";
631+
compatible = "intel,socfpga-qspi", "cdns,qspi-nor";
632632
#address-cells = <1>;
633633
#size-cells = <0>;
634634
reg = <0xff8d2000 0x100>,

0 commit comments

Comments
 (0)