ARM: dts: fix the chip select gpios definition in the SPI nodes

This patch replaces the "cs-gpio" from "controller-data" node
as was specified in the old binding and uses the standard
"cs-gpios" property expected by the SPI core as is defined now
in the spi-s3c64xx driver DT binding.

Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index 636d16684750e4f342048d3bf3207a8929581b42..676e6e0c8cf396b562bc3971db21ef93deb35406 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -168,6 +168,7 @@
        };
 
        spi_2: spi@13940000 {
+               cs-gpios = <&gpc1 2 0>;
                status = "okay";
 
                w25x80@0 {
@@ -178,7 +179,6 @@
                        spi-max-frequency = <1000000>;
 
                        controller-data {
-                               cs-gpio = <&gpc1 2 0>;
                                samsung,spi-feedback-delay = <0>;
                        };
 

diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 77878447b3121f59009a7578f170be08f4915a56..11967f4561e023430e4f192b77c0c29c1aef3e7b 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -589,6 +589,7 @@
        spi_1: spi@13930000 {
                pinctrl-names = "default";
                pinctrl-0 = <&spi1_bus>;
+               cs-gpios = <&gpb 5 0>;
                status = "okay";
 
                s5c73m3_spi: s5c73m3 {
@@ -596,7 +597,6 @@
                        spi-max-frequency = <50000000>;
                        reg = <0>;
                        controller-data {
-                               cs-gpio = <&gpb 5 0>;
                                samsung,spi-feedback-delay = <2>;
                        };
                };

diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index a794a705d4040ec220c7b380e09dbc83a9193025..0c6433ae63ac1a1697e219e67024f29f112507b5 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -316,6 +316,7 @@
        };
 
        spi_1: spi@12d30000 {
+               cs-gpios = <&gpa2 5 0>;
                status = "okay";
 
                w25q80bw@0 {
@@ -326,7 +327,6 @@
                        spi-max-frequency = <1000000>;
 
                        controller-data {
-                               cs-gpio = <&gpa2 5 0>;
                                samsung,spi-feedback-delay = <0>;
                        };