From 866d7ef232c16ae0d1d7b084abbbfa4d97e97eb3 Mon Sep 17 00:00:00 2001 From: Siva Durga Prasad Paladugu Date: Tue, 11 Sep 2018 15:09:56 +0530 Subject: [PATCH] arm: zynq: cse_qspi: Fix overwriting spi-rx-bus-width property spi-rx-bus-width property is part of flash, so it should be moved to flash node from qspi node. This patch fixes the incorrect read of spi-rx-bus-width property by moving it to flash node. Signed-off-by: Siva Durga Prasad Paladugu Signed-off-by: Michal Simek --- arch/arm/dts/zynq-cse-qspi-parallel.dts | 3 +++ arch/arm/dts/zynq-cse-qspi-single.dts | 2 +- arch/arm/dts/zynq-cse-qspi-stacked.dts | 3 +++ arch/arm/dts/zynq-cse-qspi-x1-single.dts | 2 +- arch/arm/dts/zynq-cse-qspi-x1-stacked.dts | 3 +++ arch/arm/dts/zynq-cse-qspi-x2-single.dts | 2 +- arch/arm/dts/zynq-cse-qspi-x2-stacked.dts | 3 +++ arch/arm/dts/zynq-cse-qspi.dtsi | 2 +- 8 files changed, 16 insertions(+), 4 deletions(-) diff --git a/arch/arm/dts/zynq-cse-qspi-parallel.dts b/arch/arm/dts/zynq-cse-qspi-parallel.dts index 52e6ce7537f..bbb5e327772 100644 --- a/arch/arm/dts/zynq-cse-qspi-parallel.dts +++ b/arch/arm/dts/zynq-cse-qspi-parallel.dts @@ -10,5 +10,8 @@ &qspi { is-dual = <1>; +}; + +&flash0 { spi-rx-bus-width = <4>; }; diff --git a/arch/arm/dts/zynq-cse-qspi-single.dts b/arch/arm/dts/zynq-cse-qspi-single.dts index bc08303d7a1..fab7e3c620e 100644 --- a/arch/arm/dts/zynq-cse-qspi-single.dts +++ b/arch/arm/dts/zynq-cse-qspi-single.dts @@ -8,6 +8,6 @@ #include "zynq-cse-qspi.dtsi" -&qspi { +&flash0 { spi-rx-bus-width = <4>; }; diff --git a/arch/arm/dts/zynq-cse-qspi-stacked.dts b/arch/arm/dts/zynq-cse-qspi-stacked.dts index 68bba697e37..bc72ae1c18e 100644 --- a/arch/arm/dts/zynq-cse-qspi-stacked.dts +++ b/arch/arm/dts/zynq-cse-qspi-stacked.dts @@ -11,5 +11,8 @@ &qspi { is-dual = <0>; is-stacked = <1>; +}; + +&flash0 { spi-rx-bus-width = <4>; }; diff --git a/arch/arm/dts/zynq-cse-qspi-x1-single.dts b/arch/arm/dts/zynq-cse-qspi-x1-single.dts index f660a524405..704ace0cbb3 100644 --- a/arch/arm/dts/zynq-cse-qspi-x1-single.dts +++ b/arch/arm/dts/zynq-cse-qspi-x1-single.dts @@ -8,6 +8,6 @@ #include "zynq-cse-qspi.dtsi" -&qspi { +&flash0 { spi-rx-bus-width = <1>; }; diff --git a/arch/arm/dts/zynq-cse-qspi-x1-stacked.dts b/arch/arm/dts/zynq-cse-qspi-x1-stacked.dts index 885f0347736..ae564d2fcb7 100644 --- a/arch/arm/dts/zynq-cse-qspi-x1-stacked.dts +++ b/arch/arm/dts/zynq-cse-qspi-x1-stacked.dts @@ -11,5 +11,8 @@ &qspi { is-dual = <0>; is-stacked = <1>; +}; + +&flash0 { spi-rx-bus-width = <1>; }; diff --git a/arch/arm/dts/zynq-cse-qspi-x2-single.dts b/arch/arm/dts/zynq-cse-qspi-x2-single.dts index 1e5497468fb..a299d81e4ba 100644 --- a/arch/arm/dts/zynq-cse-qspi-x2-single.dts +++ b/arch/arm/dts/zynq-cse-qspi-x2-single.dts @@ -8,6 +8,6 @@ #include "zynq-cse-qspi.dtsi" -&qspi { +&flash0 { spi-rx-bus-width = <2>; }; diff --git a/arch/arm/dts/zynq-cse-qspi-x2-stacked.dts b/arch/arm/dts/zynq-cse-qspi-x2-stacked.dts index 9d2113e5927..a94e4d67238 100644 --- a/arch/arm/dts/zynq-cse-qspi-x2-stacked.dts +++ b/arch/arm/dts/zynq-cse-qspi-x2-stacked.dts @@ -11,5 +11,8 @@ &qspi { is-dual = <0>; is-stacked = <1>; +}; + +&flash0 { spi-rx-bus-width = <2>; }; diff --git a/arch/arm/dts/zynq-cse-qspi.dtsi b/arch/arm/dts/zynq-cse-qspi.dtsi index 1c3736f1cd6..3c0695e03c2 100644 --- a/arch/arm/dts/zynq-cse-qspi.dtsi +++ b/arch/arm/dts/zynq-cse-qspi.dtsi @@ -60,7 +60,7 @@ #address-cells = <1>; #size-cells = <0>; num-cs = <1>; - flash@0 { + flash0: flash@0 { compatible = "n25q128a11"; reg = <0x0>; spi-tx-bus-width = <1>; -- 2.47.3