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