[PATCH 2/2 v3] ARM: DTS: move "cs-gpio" from "controller-data" to under spi node
From: Javier Martinez Canillas <hidden>
Date: 2014-06-11 11:21:35
Also in:
linux-devicetree, linux-samsung-soc
Hello Naveen, On 06/11/2014 08:31 AM, Naveen Krishna Chatradhi wrote:
This patch moves the "cs-gpio" field from "controller-data" child node to under the spi device node.
Your patch looks good to me but I think that the commit message is inaccurate. It does not move the cs-gpio property to the top SPI dev node but it replaces the cs-gpio from controller-data as was specified in the old binding and use the standard cs-gpios property expected by the SPI core as is defined in the new binding. Having a proper commit message is important since out-of-tree DTS can use this commit as a reference on how to fix their FDT in case this change broke their platforms.
quoted hunk ↗ jump to hunk
Respective changes are preposed to spi-s3c64xx.c driver. Signed-off-by: Naveen Krishna Chatradhi <redacted> Acked-by: Rob Herring <robh@kernel.org> Cc: Javier Martinez Canillas <redacted> Cc: Doug Anderson <dianders@chromium.org> Cc: Tomasz Figa <redacted> --- Changes since v2: None arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +- arch/arm/boot/dts/exynos4412-trats2.dts | 2 +- arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts index 636d166..9191491 100644 --- a/arch/arm/boot/dts/exynos4210-smdkv310.dts +++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts@@ -169,6 +169,7 @@ spi_2: spi at 13940000 { status = "okay"; + cs-gpios = <&gpc1 2 0>; w25x80 at 0 { #address-cells = <1>;@@ -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 8a558b7..204b0de 100644 --- a/arch/arm/boot/dts/exynos4412-trats2.dts +++ b/arch/arm/boot/dts/exynos4412-trats2.dts@@ -512,6 +512,7 @@ spi_1: spi at 13930000 { pinctrl-names = "default"; pinctrl-0 = <&spi1_bus>; + cs-gpios = <&gpb 5 0>; status = "okay"; s5c73m3_spi: s5c73m3 {@@ -519,7 +520,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 a794a70..0c6433a 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts@@ -316,6 +316,7 @@ }; spi_1: spi at 12d30000 { + cs-gpios = <&gpa2 5 0>; status = "okay"; w25q80bw at 0 {@@ -326,7 +327,6 @@ spi-max-frequency = <1000000>; controller-data { - cs-gpio = <&gpa2 5 0>; samsung,spi-feedback-delay = <0>; };
Best regards, Javier