From 953f6340517c2e04328d398e30baa01607b3b8b2 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 7 Apr 2016 11:19:11 +0200 Subject: [PATCH] ARM: zynq: Unify qspi mode Put together two qspi mode references and remove duplication. Signed-off-by: Michal Simek --- arch/arm/dts/zynq-zc702.dts | 6 +----- arch/arm/dts/zynq-zc706.dts | 4 ---- arch/arm/dts/zynq-zc770-xm010.dts | 4 ---- arch/arm/dts/zynq-zed.dts | 4 ---- 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/arch/arm/dts/zynq-zc702.dts b/arch/arm/dts/zynq-zc702.dts index e6b2ce4255b..f7cce4fe4d2 100644 --- a/arch/arm/dts/zynq-zc702.dts +++ b/arch/arm/dts/zynq-zc702.dts @@ -388,6 +388,7 @@ }; &qspi { + u-boot,dm-pre-reloc; status = "okay"; is-dual = <0>; num-cs = <1>; @@ -436,11 +437,6 @@ pinctrl-0 = <&pinctrl_uart1_default>; }; -&qspi { - u-boot,dm-pre-reloc; - status = "okay"; -}; - &usb0 { status = "okay"; dr_mode = "host"; diff --git a/arch/arm/dts/zynq-zc706.dts b/arch/arm/dts/zynq-zc706.dts index fbe8491240c..4d72390ac11 100644 --- a/arch/arm/dts/zynq-zc706.dts +++ b/arch/arm/dts/zynq-zc706.dts @@ -355,10 +355,6 @@ pinctrl-0 = <&pinctrl_uart1_default>; }; -&qspi { - status = "okay"; -}; - &usb0 { status = "okay"; dr_mode = "host"; diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts index bb90df43566..1d50212fd27 100644 --- a/arch/arm/dts/zynq-zc770-xm010.dts +++ b/arch/arm/dts/zynq-zc770-xm010.dts @@ -88,10 +88,6 @@ }; }; -&qspi { - status = "okay"; -}; - &can0 { status = "okay"; }; diff --git a/arch/arm/dts/zynq-zed.dts b/arch/arm/dts/zynq-zed.dts index 40db009445a..5911dab1798 100644 --- a/arch/arm/dts/zynq-zed.dts +++ b/arch/arm/dts/zynq-zed.dts @@ -95,10 +95,6 @@ status = "okay"; }; -&qspi { - status = "okay"; -}; - &usb0 { status = "okay"; dr_mode = "host"; -- 2.47.3