From b57e7cc09af02de8428028d6d72979c24505ced2 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 27 Mar 2018 13:09:15 +0200 Subject: [PATCH] arm64: zynqmp: Fix spi flash partition definition for zc1751 dc2 Using different node name and label partitions as data. Also use latest compatible strings based on mainline review. Signed-off-by: Michal Simek --- arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts index 79535c3d806..b92acd06750 100644 --- a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts +++ b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts @@ -488,15 +488,15 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_spi0_default>; - spi0_flash0: spi0_flash0@0 { - compatible = "m25p80"; + spi0_flash0: flash@0 { #address-cells = <1>; #size-cells = <1>; + compatible = "sst,sst25wf080", "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; - spi0_flash0@0 { - label = "spi0_flash0"; + partition@0 { + label = "data"; reg = <0x0 0x100000>; }; }; @@ -508,15 +508,15 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_spi1_default>; - spi1_flash0: spi1_flash0@0 { - compatible = "mtd_dataflash"; + spi1_flash0: flash@0 { #address-cells = <1>; #size-cells = <1>; + compatible = "atmel,at45db041e", "atmel,at45", "atmel,dataflash"; spi-max-frequency = <20000000>; reg = <0>; - spi1_flash0@0 { - label = "spi1_flash0"; + partition@0 { + label = "data"; reg = <0x0 0x84000>; }; }; -- 2.47.3