From f70db30c7fabe406b60b4bfe7b1215a9b001ac80 Mon Sep 17 00:00:00 2001 From: Allen Xu Date: Tue, 9 Sep 2014 17:01:09 -0500 Subject: [PATCH] ENGR00331054 Revert "ENGR00303629-1: ARM: dts: imx6sx-sdb: support NOR Flash SF25FL128S" The DT node for QSPI has already existed, it's not necessary to cherry-pick this commit. This reverts commit 84fef446d673601ce1db811dbadca6df2c131fa8. Signed-off-by: Allen Xu --- arch/arm/boot/dts/imx6sx-sdb.dts | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts index 63f8c41f0a0b..ff7e47386067 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dts +++ b/arch/arm/boot/dts/imx6sx-sdb.dts @@ -546,25 +546,3 @@ }; }; }; - -&qspi2 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_qspi2_1>; - status = "okay"; - - flash0: s25fl128s@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "spansion,s25fl128s"; - spi-max-frequency = <66000000>; - reg = <0>; - }; - - flash1: s25fl128s@1 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "spansion,s25fl128s"; - spi-max-frequency = <66000000>; - reg = <1>; - }; -}; -- 2.39.2