From 741148625359ef92ad078b1096e3352cdb36dd0d Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 31 Dec 2014 20:14:55 +0100 Subject: dt: socfpga: Rename snps, dw-spi-mmio to snps, dw-apb-ssi Linux now also contains SPI driver, yet the name is 'snps,dw-apb-ssi'. Fix the naming before we have to support both names. Signed-off-by: Marek Vasut Cc: Chin Liang See Cc: Dinh Nguyen Cc: Pavel Machek Cc: Stefan Roese Cc: Vince Bridgers Reviewed-by: Stefan Roese Acked-by: Pavel Machek Reviewed-by: Jagannadha Sutradharudu Teki --- arch/arm/dts/socfpga.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch') diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi index 969e5ad..93d3776 100644 --- a/arch/arm/dts/socfpga.dtsi +++ b/arch/arm/dts/socfpga.dtsi @@ -644,7 +644,7 @@ }; spi0: spi@fff00000 { - compatible = "snps,dw-spi-mmio"; + compatible = "snps,dw-apb-ssi"; #address-cells = <1>; #size-cells = <0>; reg = <0xfff00000 0x1000>; @@ -658,7 +658,7 @@ }; spi1: spi@fff01000 { - compatible = "snps,dw-spi-mmio"; + compatible = "snps,dw-apb-ssi"; #address-cells = <1>; #size-cells = <0>; reg = <0xfff01000 0x1000>; -- cgit v1.1 From 653cda8f6605676504d03eb76f84932a20a6feb1 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 31 Dec 2014 20:14:56 +0100 Subject: dt: socfpga: Replace num-chipselect with num-cs This optional DT property is called 'num-cs', so repair the misnomers. Signed-off-by: Marek Vasut Cc: Chin Liang See Cc: Dinh Nguyen Cc: Pavel Machek Cc: Stefan Roese Cc: Vince Bridgers Acked-by: Pavel Machek Reviewed-by: Jagannadha Sutradharudu Teki --- arch/arm/dts/socfpga.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'arch') diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi index 93d3776..bf791c5 100644 --- a/arch/arm/dts/socfpga.dtsi +++ b/arch/arm/dts/socfpga.dtsi @@ -637,7 +637,7 @@ 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"; @@ -649,7 +649,7 @@ #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>; @@ -663,7 +663,7 @@ #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>; -- cgit v1.1