Compared with the upstream DT, we have a lot of duplicated properties, so let's drop them from the barebox override.
Signed-off-by: Ahmad Fatoum <[email protected]> --- arch/arm/dts/socfpga_cyclone5_socdk.dts | 20 +------ arch/arm/dts/socfpga_cyclone5_socrates.dts | 69 +++++++++------------- 2 files changed, 30 insertions(+), 59 deletions(-) diff --git a/arch/arm/dts/socfpga_cyclone5_socdk.dts b/arch/arm/dts/socfpga_cyclone5_socdk.dts index f0a6ae98edf3..0dfd5ebaed6e 100644 --- a/arch/arm/dts/socfpga_cyclone5_socdk.dts +++ b/arch/arm/dts/socfpga_cyclone5_socdk.dts @@ -31,22 +31,6 @@ }; }; -&qspi { - status = "okay"; - - flash: flash@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "n25q00"; - reg = <0>; - spi-max-frequency = <108000000>; - m25p,fast-read; - cdns,page-size = <256>; - cdns,block-size = <16>; - cdns,read-delay = <4>; - cdns,tshsl-ns = <50>; - cdns,tsd2d-ns = <50>; - cdns,tchsh-ns = <4>; - cdns,tslch-ns = <4>; - }; +&flash0 { + compatible = "n25q00"; }; diff --git a/arch/arm/dts/socfpga_cyclone5_socrates.dts b/arch/arm/dts/socfpga_cyclone5_socrates.dts index e731b55a6c8b..dd45140cbab5 100644 --- a/arch/arm/dts/socfpga_cyclone5_socrates.dts +++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts @@ -34,52 +34,39 @@ }; }; -&qspi { - status = "okay"; +&flash { + compatible = "n25q00"; + cdns,page-size = <256>; + cdns,block-size = <16>; + cdns,read-delay = <4>; - flash: flash@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "n25q00"; - reg = <0>; - spi-max-frequency = <100000000>; - m25p,fast-read; - cdns,page-size = <256>; - cdns,block-size = <16>; - cdns,read-delay = <4>; - cdns,tshsl-ns = <50>; - cdns,tsd2d-ns = <50>; - cdns,tchsh-ns = <4>; - cdns,tslch-ns = <4>; - - partition@0 { - label = "prebootloader0"; - reg = <0x00000 0x10000>; - }; + partition@0 { + label = "prebootloader0"; + reg = <0x00000 0x10000>; + }; - partition@1 { - label = "prebootloader1"; - reg = <0x10000 0x10000>; - }; + partition@1 { + label = "prebootloader1"; + reg = <0x10000 0x10000>; + }; - partition@2 { - label = "prebootloader2"; - reg = <0x20000 0x10000>; - }; + partition@2 { + label = "prebootloader2"; + reg = <0x20000 0x10000>; + }; - partition@3 { - label = "prebootloader3"; - reg = <0x30000 0x10000>; - }; + partition@3 { + label = "prebootloader3"; + reg = <0x30000 0x10000>; + }; - partition@4 { - label = "barebox"; - reg = <0x40000 0x80000>; - }; + partition@4 { + label = "barebox"; + reg = <0x40000 0x80000>; + }; - partition@5 { - label = "data"; - reg = <0xc0000 0x1f40000>; - }; + partition@5 { + label = "data"; + reg = <0xc0000 0x1f40000>; }; }; -- 2.30.2
