From d1b1bf55a9f25e3408f1036a7fb0e4598d9ea8ef Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 27 May 2019 10:02:20 +0200 Subject: [PATCH] arm64: zynqmp: Align model name with DT All qspi configurations are marked as MINI QSPI which is wrong. Use model property to distinguish different configurations. Signed-off-by: Michal Simek --- arch/arm/dts/zynqmp-mini-qspi-parallel.dts | 4 ++++ arch/arm/dts/zynqmp-mini-qspi-single.dts | 4 ++++ arch/arm/dts/zynqmp-mini-qspi-stacked.dts | 4 ++++ arch/arm/dts/zynqmp-mini-qspi-x1-single.dts | 4 ++++ arch/arm/dts/zynqmp-mini-qspi-x1-stacked.dts | 4 ++++ arch/arm/dts/zynqmp-mini-qspi-x2-single.dts | 4 ++++ arch/arm/dts/zynqmp-mini-qspi-x2-stacked.dts | 4 ++++ 7 files changed, 28 insertions(+) diff --git a/arch/arm/dts/zynqmp-mini-qspi-parallel.dts b/arch/arm/dts/zynqmp-mini-qspi-parallel.dts index 68c0e5c2e60..ce43e4c1c3b 100644 --- a/arch/arm/dts/zynqmp-mini-qspi-parallel.dts +++ b/arch/arm/dts/zynqmp-mini-qspi-parallel.dts @@ -7,6 +7,10 @@ #include "zynqmp-mini-qspi.dts" +/ { + model = "ZynqMP MINI QSPI PARALLEL"; +}; + &qspi { is-dual = <1>; }; diff --git a/arch/arm/dts/zynqmp-mini-qspi-single.dts b/arch/arm/dts/zynqmp-mini-qspi-single.dts index 552c790f50a..636ee04e4d4 100644 --- a/arch/arm/dts/zynqmp-mini-qspi-single.dts +++ b/arch/arm/dts/zynqmp-mini-qspi-single.dts @@ -7,6 +7,10 @@ #include "zynqmp-mini-qspi.dts" +/ { + model = "ZynqMP MINI QSPI SINGLE"; +}; + &flash0 { spi-rx-bus-width = <4>; }; diff --git a/arch/arm/dts/zynqmp-mini-qspi-stacked.dts b/arch/arm/dts/zynqmp-mini-qspi-stacked.dts index 73d06e6a4b3..895ffb654fb 100644 --- a/arch/arm/dts/zynqmp-mini-qspi-stacked.dts +++ b/arch/arm/dts/zynqmp-mini-qspi-stacked.dts @@ -7,6 +7,10 @@ #include "zynqmp-mini-qspi.dts" +/ { + model = "ZynqMP MINI QSPI STACKED"; +}; + &qspi { is-dual = <0>; is-stacked = <1>; diff --git a/arch/arm/dts/zynqmp-mini-qspi-x1-single.dts b/arch/arm/dts/zynqmp-mini-qspi-x1-single.dts index eb4cabb2e65..3988836f63e 100644 --- a/arch/arm/dts/zynqmp-mini-qspi-x1-single.dts +++ b/arch/arm/dts/zynqmp-mini-qspi-x1-single.dts @@ -7,6 +7,10 @@ #include "zynqmp-mini-qspi.dts" +/ { + model = "ZynqMP MINI QSPI X1 SINGLE"; +}; + &flash0 { spi-rx-bus-width = <1>; }; diff --git a/arch/arm/dts/zynqmp-mini-qspi-x1-stacked.dts b/arch/arm/dts/zynqmp-mini-qspi-x1-stacked.dts index 8ba20990b79..8158ae4cc3a 100644 --- a/arch/arm/dts/zynqmp-mini-qspi-x1-stacked.dts +++ b/arch/arm/dts/zynqmp-mini-qspi-x1-stacked.dts @@ -7,6 +7,10 @@ #include "zynqmp-mini-qspi.dts" +/ { + model = "ZynqMP MINI QSPI X1 STACKED"; +}; + &qspi { is-dual = <0>; is-stacked = <1>; diff --git a/arch/arm/dts/zynqmp-mini-qspi-x2-single.dts b/arch/arm/dts/zynqmp-mini-qspi-x2-single.dts index b642ffe3e25..1bc2572966d 100644 --- a/arch/arm/dts/zynqmp-mini-qspi-x2-single.dts +++ b/arch/arm/dts/zynqmp-mini-qspi-x2-single.dts @@ -7,6 +7,10 @@ #include "zynqmp-mini-qspi.dts" +/ { + model = "ZynqMP MINI QSPI X2 SINGLE"; +}; + &flash0 { spi-rx-bus-width = <2>; }; diff --git a/arch/arm/dts/zynqmp-mini-qspi-x2-stacked.dts b/arch/arm/dts/zynqmp-mini-qspi-x2-stacked.dts index a28c8ec6129..edc07f08bd1 100644 --- a/arch/arm/dts/zynqmp-mini-qspi-x2-stacked.dts +++ b/arch/arm/dts/zynqmp-mini-qspi-x2-stacked.dts @@ -7,6 +7,10 @@ #include "zynqmp-mini-qspi.dts" +/ { + model = "ZynqMP MINI QSPI X2 STACKED"; +}; + &qspi { is-dual = <0>; is-stacked = <1>; -- 2.47.3