summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2015-01-08 13:50:38 -0500
committerTom Rini <trini@ti.com>2015-01-08 13:50:38 -0500
commitf10d86d3fff9f53723a404b3794cca98a785ce6a (patch)
treeac3ba29d5b79ef0d00734c677320211771631782 /arch
parent906d6fe3033910a5eca72ef6fc9b47a957b113e5 (diff)
parentadc0fabfd9662fa690e866332cd4277351f991c4 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/dts/socfpga.dtsi10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
index 969e5ad751c..bf791c5ddef 100644
--- a/arch/arm/dts/socfpga.dtsi
+++ b/arch/arm/dts/socfpga.dtsi
@@ -637,19 +637,19 @@
interrupts = <0 151 4>;
clocks = <&qspi_clk>;
ext-decoder = <0>; /* external decoder */
- num-chipselect = <4>;
+ num-cs = <4>;
fifo-depth = <128>;
bus-num = <2>;
status = "disabled";
};
spi0: spi@fff00000 {
- compatible = "snps,dw-spi-mmio";
+ compatible = "snps,dw-apb-ssi";
#address-cells = <1>;
#size-cells = <0>;
reg = <0xfff00000 0x1000>;
interrupts = <0 154 4>;
- num-chipselect = <4>;
+ num-cs = <4>;
bus-num = <0>;
tx-dma-channel = <&pdma 16>;
rx-dma-channel = <&pdma 17>;
@@ -658,12 +658,12 @@
};
spi1: spi@fff01000 {
- compatible = "snps,dw-spi-mmio";
+ compatible = "snps,dw-apb-ssi";
#address-cells = <1>;
#size-cells = <0>;
reg = <0xfff01000 0x1000>;
interrupts = <0 156 4>;
- num-chipselect = <4>;
+ num-cs = <4>;
bus-num = <1>;
tx-dma-channel = <&pdma 20>;
rx-dma-channel = <&pdma 21>;