From patchwork Sun Mar 25 19:57:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: arm64: dts: armada-3720-espressobin: wire up spi flash From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 10306793 Message-Id: <20180325195736.19782-1-u.kleine-koenig@pengutronix.de> To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth Cc: Ellie Reeves , linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de Date: Sun, 25 Mar 2018 21:57:36 +0200 From: Ellie Reeves This is the storage the machine boots from by default. The partitioning is taken from the U-Boot that is shipped with the board. There is some more space on the flash that isn't used. Signed-off-by: Ellie Reeves Signed-off-by: Uwe Kleine-König --- .../boot/dts/marvell/armada-3720-espressobin.dts | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts index 882d6e4a04e4..5f98c2fecca4 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts @@ -108,6 +108,33 @@ status = "okay"; }; +&spi0 { + status = "okay"; + + flash@0 { + reg = <0>; + compatible = "winbond,w25q32dw", "jedec,spi-flash"; + spi-max-frequency = <104000000>; + m25p,fast-read; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "uboot"; + reg = <0 0x180000>; + }; + + partition@180000 { + label = "ubootenv"; + reg = <0x180000 0x10000>; + }; + }; + }; +}; + /* Exported on the micro USB connector J5 through an FTDI */ &uart0 { pinctrl-names = "default"; From patchwork Sat Apr 21 14:03:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: arm64: dts: marvell: armada-37xx: reserve memory for ATF From: Miquel Raynal X-Patchwork-Id: 10354187 Message-Id: <20180421140342.25082-1-miquel.raynal@bootlin.com> To: Gregory Clement , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth Cc: Mark Rutland , devicetree@vger.kernel.org, Antoine Tenart , Catalin Marinas , Will Deacon , Maxime Chevallier , Nadav Haklai , Rob Herring , Thomas Petazzoni , Miquel Raynal , Victor Gu , linux-arm-kernel@lists.infradead.org Date: Sat, 21 Apr 2018 16:03:42 +0200 From: Victor Gu The PSCI area should be reserved in Linux for PSCI operations such as suspend/resume. Reserve 2MiB of memory which matches the area used by ATF (BL1, BL2, BL3x, see [1] in ATF source code). This covers all PSCI code and data area and is 2MiB aligned, which is required by Linux for huge pages handling. [1] plat/marvell/a3700/common/include/platform_def.h Signed-off-by: Victor Gu [miquel.raynal@bootlin.com: reword of commit message] Signed-off-by: Miquel Raynal --- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi index 97207a61bc79..429ce91bfc39 100644 --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi @@ -22,6 +22,17 @@ serial1 = &uart1; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + psci-area@4000000 { + reg = <0 0x4000000 0 0x200000>; + no-map; + }; + }; + cpus { #address-cells = <1>; #size-cells = <0>;