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