Skip to contentSkip to conversation

arm64: dts: armada-3720-espressobin: sync with downstream

PATCH New Andre Heider 4 participants 25 messages Aug 31, 2020 – Sep 6, 2020 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 arm64: dts: armada-3720-espressobin: sync with downstream

This adds the disabled eMMC node.

---
 arch/arm/dts/armada-3720-espressobin.dts | 63 +++++++++---------------
 1 file changed, 23 insertions(+), 40 deletions(-)
arch/arm/dts/armada-3720-espressobin.dts +23 -40
index 4534f5ff29..a66ab814eb 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Device Tree file for Marvell Armada 3720 community board
  * (ESPRESSOBin)
@@ -5,53 +6,15 @@
  *
  * Gregory CLEMENT <[email protected]>
  * Konstantin Porotchkin <[email protected]>
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *  a) This file is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This file is distributed in the hope that it will be useful
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- * Or, alternatively
- *
- *  b) Permission is hereby granted, free of charge, to any person
- *     obtaining a copy of this software and associated documentation
- *     files (the "Software"), to deal in the Software without
- *     restriction, including without limitation the rights to use
- *     copy, modify, merge, publish, distribute, sublicense, and/or
- *     sell copies of the Software, and to permit persons to whom the
- *     Software is furnished to do so, subject to the following
- *     conditions:
- *
- *     The above copyright notice and this permission notice shall be
- *     included in all copies or substantial portions of the Software.
- *
- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *     OTHER DEALINGS IN THE SOFTWARE.
  */
-
 /dts-v1/;
 
 #include "armada-372x.dtsi"
 
 / {
 	model = "Marvell Armada 3720 Community Board ESPRESSOBin";
-	compatible = "marvell,armada-3720-espressobin", "marvell,armada3720", "marvell,armada3710";
+	compatible = "marvell,armada-3720-espressobin",
+		     "marvell,armada3720", "marvell,armada3710";
 
 	chosen {
 		stdout-path = "serial0:115200n8";
@@ -121,6 +84,7 @@
 	status = "okay";
 };
 
+/* J1 */
 &sdhci0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&sdio_pins>;
@@ -130,6 +94,25 @@
 	status = "okay";
 };
 
+/* U11 */
+&sdhci1 {
+	non-removable;
+	bus-width = <8>;
+	mmc-ddr-1_8v;
+	mmc-hs400-1_8v;
+	marvell,pad-type = "fixed-1-8v";
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc_pins>;
+	status = "disabled";
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+	mmccard: mmccard at 0 {
+		compatible = "mmc-card";
+		reg = <0>;
+	};
+};
+
 &spi0 {
 	status = "okay";
 	pinctrl-names = "default";
Signature · 1 line
2.28.0
#1 lore raw

PATCH 2/2 arm64: dts: armada-3720-espressobin-emmc: add emmc dts

Add the downstream dts for the Espressobin with eMMC.

---
 arch/arm/dts/Makefile                         |  1 +
 arch/arm/dts/armada-3720-espressobin-emmc.dts | 19 +++++++++++++++++++
 doc/README.marvell                            |  8 ++++++--
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/dts/armada-3720-espressobin-emmc.dts
arch/arm/dts/Makefile +1 -0
index 5e34192be6..8f1958b5a7 100644
@@ -202,6 +202,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
 dtb-$(CONFIG_ARCH_MVEBU) +=			\
 	armada-3720-db.dtb			\
 	armada-3720-espressobin.dtb		\
+	armada-3720-espressobin-emmc.dtb	\
 	armada-3720-turris-mox.dtb		\
 	armada-3720-uDPU.dtb			\
 	armada-375-db.dtb			\
arch/arm/dts/armada-3720-espressobin-emmc.dts new file +19 -0
new file mode 100644
index 0000000000..0dd59af9c0
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018 Marvell International Ltd.
+ */
+
+#include "armada-3720-espressobin.dts"
+
+/ {
+	model = "Marvell Armada 3720 Community Board ESPRESSOBin (eMMC)";
+	compatible = "marvell,armada-3720-espressobin",
+		     "marvell,armada-3720-espressobin-emmc",
+		     "marvell,armada3720", "marvell,armada3710";
+
+};
+
+/* U11 */
+&sdhci1 {
+	status = "okay";
+};
doc/README.marvell +6 -2
index 5416bc3035..c5cab2fb38 100644
@@ -43,8 +43,12 @@ Build Procedure
         In order to prevent this, the required device-tree MUST be set during compilation.
         All device-tree files are located in ./arch/arm/dts/ folder.
 
-	For other DB boards (MacchiatoBin, EspressoBin and 3700 DB board) compile u-boot with
-	just default device-tree from defconfig using:
+	For the EspressoBin with eMMC compile u-boot and set the required device-tree using:
+
+		# make DEVICE_TREE=armada-3720-espressobin-emmc
+
+	For other DB boards (MacchiatoBin, EspressoBin without eMMC and 3700 DB board) compile
+	u-boot with just default device-tree from defconfig using:
 
 		# make
 
Signature · 1 line
2.28.0
#2 lore raw

PATCH v2 2/2 arm64: mvebu: a37xx: Add support for EspressoBIN with eMMC

From: Konstantin Porotchkin <[email protected]>

Add support for additional EspressoBIN board with installed eMMC device (U11).
Starting from this patch the DEVICE_TREE= must be added to "make" in order to distinguish between platforms wth and without eMMC on board.
Regualr (no eMMC) EspressoBIN builds should use DTS file named armada-3720-espressobin and build for boards with eMMC installed the DTS named armada-3720-espressobin-emmc.
The default device tree string is now removed from mvebu_espressobin-88f3720_defconfig config file. Update build documentation accordingly.

Change-Id Id1a4f3ca01a6e52df57bf7279f33f0fe45f8ed18

Reviewed-on: http://vgitil04.il.marvell.com:8080/61290

[a.heider: adapt to mainline]

---
v2: base upon downstream patch

 arch/arm/dts/Makefile                         |  1 +
 arch/arm/dts/armada-3720-espressobin-emmc.dts | 19 +++++++++++++++++++
 configs/mvebu_espressobin-88f3720_defconfig   |  1 -
 doc/README.marvell                            |  7 ++++++-
 4 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/dts/armada-3720-espressobin-emmc.dts
arch/arm/dts/Makefile +1 -0
index 5e34192be6..8f1958b5a7 100644
@@ -202,6 +202,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
 dtb-$(CONFIG_ARCH_MVEBU) +=			\
 	armada-3720-db.dtb			\
 	armada-3720-espressobin.dtb		\
+	armada-3720-espressobin-emmc.dtb	\
 	armada-3720-turris-mox.dtb		\
 	armada-3720-uDPU.dtb			\
 	armada-375-db.dtb			\
arch/arm/dts/armada-3720-espressobin-emmc.dts new file +19 -0
new file mode 100644
index 0000000000..0dd59af9c0
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018 Marvell International Ltd.
+ */
+
+#include "armada-3720-espressobin.dts"
+
+/ {
+	model = "Marvell Armada 3720 Community Board ESPRESSOBin (eMMC)";
+	compatible = "marvell,armada-3720-espressobin",
+		     "marvell,armada-3720-espressobin-emmc",
+		     "marvell,armada3720", "marvell,armada3710";
+
+};
+
+/* U11 */
+&sdhci1 {
+	status = "okay";
+};
configs/mvebu_espressobin-88f3720_defconfig +0 -1
index 0c1c92d4ff..99f421d841 100644
@@ -11,7 +11,6 @@ CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_DM_GPIO=y
 CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=25804800
-CONFIG_DEFAULT_DEVICE_TREE="armada-3720-espressobin"
 CONFIG_DEBUG_UART=y
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
doc/README.marvell +6 -1
index 5416bc3035..ffd0544aef 100644
@@ -43,7 +43,12 @@ Build Procedure
         In order to prevent this, the required device-tree MUST be set during compilation.
         All device-tree files are located in ./arch/arm/dts/ folder.
 
-	For other DB boards (MacchiatoBin, EspressoBin and 3700 DB board) compile u-boot with
+	For the EspressoBin board without soldered eMMC device use
+		# make DEVICE_TREE=armada-3720-espressobin
+	For the EspressoBin board with populated eMMC device use
+		# make DEVICE_TREE=armada-3720-espressobin-emmc
+
+	For other DB boards (MacchiatoBin, and 3700 DB board) compile u-boot with
 	just default device-tree from defconfig using:
 
 		# make
Signature · 1 line
2.28.0
#3 lore raw

PATCH v2 2/2 arm64: mvebu: a37xx: Add support for EspressoBIN with eMMC

Quoted 5 lines · On Monday 31 August 2020 08:33:24 Andre Heider wrote:

From: Konstantin Porotchkin <[email protected]>

Add support for additional EspressoBIN board with installed eMMC device (U11).
Starting from this patch the DEVICE_TREE= must be added to

Why? Is not it better to have the most common non-emmc version by default instead forcing people to specify another compile time option? IIRC mmc versions are very rare.

Quoted 95 lines

"make" in order to distinguish between platforms wth and without eMMC on board.
Regualr (no eMMC) EspressoBIN builds should use DTS file named armada-3720-espressobin and build for boards with eMMC installed the DTS named armada-3720-espressobin-emmc.
The default device tree string is now removed from mvebu_espressobin-88f3720_defconfig config file. Update build documentation accordingly.

Change-Id Id1a4f3ca01a6e52df57bf7279f33f0fe45f8ed18

Reviewed-on: http://vgitil04.il.marvell.com:8080/61290

[a.heider: adapt to mainline]

---
v2: base upon downstream patch

 arch/arm/dts/Makefile                         |  1 +
 arch/arm/dts/armada-3720-espressobin-emmc.dts | 19 +++++++++++++++++++
 configs/mvebu_espressobin-88f3720_defconfig   |  1 -
 doc/README.marvell                            |  7 ++++++-
 4 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/dts/armada-3720-espressobin-emmc.dts
arch/arm/dts/Makefile +1 -0
index 5e34192be6..8f1958b5a7 100644
@@ -202,6 +202,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
 dtb-$(CONFIG_ARCH_MVEBU) +=			\
 	armada-3720-db.dtb			\
 	armada-3720-espressobin.dtb		\
+	armada-3720-espressobin-emmc.dtb	\
 	armada-3720-turris-mox.dtb		\
 	armada-3720-uDPU.dtb			\
 	armada-375-db.dtb			\
arch/arm/dts/armada-3720-espressobin-emmc.dts new file +19 -0
new file mode 100644
index 0000000000..0dd59af9c0
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018 Marvell International Ltd.
+ */
+
+#include "armada-3720-espressobin.dts"
+
+/ {
+	model = "Marvell Armada 3720 Community Board ESPRESSOBin (eMMC)";
+	compatible = "marvell,armada-3720-espressobin",
+		     "marvell,armada-3720-espressobin-emmc",
+		     "marvell,armada3720", "marvell,armada3710";
+
+};
+
+/* U11 */
+&sdhci1 {
+	status = "okay";
+};
configs/mvebu_espressobin-88f3720_defconfig +0 -1
index 0c1c92d4ff..99f421d841 100644
@@ -11,7 +11,6 @@ CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_DM_GPIO=y
 CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=25804800
-CONFIG_DEFAULT_DEVICE_TREE="armada-3720-espressobin"
 CONFIG_DEBUG_UART=y
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
doc/README.marvell +6 -1
index 5416bc3035..ffd0544aef 100644
@@ -43,7 +43,12 @@ Build Procedure
         In order to prevent this, the required device-tree MUST be set during compilation.
         All device-tree files are located in ./arch/arm/dts/ folder.
 
-	For other DB boards (MacchiatoBin, EspressoBin and 3700 DB board) compile u-boot with
+	For the EspressoBin board without soldered eMMC device use
+		# make DEVICE_TREE=armada-3720-espressobin
+	For the EspressoBin board with populated eMMC device use
+		# make DEVICE_TREE=armada-3720-espressobin-emmc
+
+	For other DB boards (MacchiatoBin, and 3700 DB board) compile u-boot with
 	just default device-tree from defconfig using:
 
 		# make
Signature · 1 line
2.28.0
#4 lore raw

PATCH v2 2/2 arm64: mvebu: a37xx: Add support for EspressoBIN with eMMC

Quoted 10 lines · Pali Roh?r
Quoted 5 lines · On Monday 31 August 2020 08:33:24 Andre Heider wrote:

From: Konstantin Porotchkin <[email protected]>

Add support for additional EspressoBIN board with installed eMMC device (U11).
Starting from this patch the DEVICE_TREE= must be added to

Why? Is not it better to have the most common non-emmc version by default instead forcing people to specify another compile time option? IIRC mmc versions are very rare.

That's actually what my v1 did, but other mvebu boards do it as well, as does downstream (which is where this patch original comes from). So I went ahead and kept it consistent.

But sure, I can change it again.

Thanks,
Andre

Quoted 95 lines
Quoted 95 lines

"make" in order to distinguish between platforms wth and without eMMC on board.
Regualr (no eMMC) EspressoBIN builds should use DTS file named armada-3720-espressobin and build for boards with eMMC installed the DTS named armada-3720-espressobin-emmc.
The default device tree string is now removed from mvebu_espressobin-88f3720_defconfig config file. Update build documentation accordingly.

Change-Id Id1a4f3ca01a6e52df57bf7279f33f0fe45f8ed18

Reviewed-on: http://vgitil04.il.marvell.com:8080/61290

[a.heider: adapt to mainline]

---
v2: base upon downstream patch

  arch/arm/dts/Makefile                         |  1 +
  arch/arm/dts/armada-3720-espressobin-emmc.dts | 19 +++++++++++++++++++
  configs/mvebu_espressobin-88f3720_defconfig   |  1 -
  doc/README.marvell                            |  7 ++++++-
  4 files changed, 26 insertions(+), 2 deletions(-)

create mode 100644 arch/arm/dts/armada-3720-espressobin-emmc.dts

arch/arm/dts/Makefile +1 -0
index 5e34192be6..8f1958b5a7 100644
@@ -202,6 +202,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
  dtb-$(CONFIG_ARCH_MVEBU) +=			\
  	armada-3720-db.dtb			\
  	armada-3720-espressobin.dtb		\
+	armada-3720-espressobin-emmc.dtb	\
  	armada-3720-turris-mox.dtb		\
  	armada-3720-uDPU.dtb			\
  	armada-375-db.dtb			\
arch/arm/dts/armada-3720-espressobin-emmc.dts new file +19 -0
new file mode 100644
index 0000000000..0dd59af9c0
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018 Marvell International Ltd.
+ */
+
+#include "armada-3720-espressobin.dts"
+
+/ {
+	model = "Marvell Armada 3720 Community Board ESPRESSOBin (eMMC)";
+	compatible = "marvell,armada-3720-espressobin",
+		     "marvell,armada-3720-espressobin-emmc",
+		     "marvell,armada3720", "marvell,armada3710";
+
+};
+
+/* U11 */
+&sdhci1 {
+	status = "okay";
+};
configs/mvebu_espressobin-88f3720_defconfig +0 -1
index 0c1c92d4ff..99f421d841 100644
@@ -11,7 +11,6 @@ CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DM_GPIO=y
  CONFIG_DEBUG_UART_BASE=0xd0012000
  CONFIG_DEBUG_UART_CLOCK=25804800
-CONFIG_DEFAULT_DEVICE_TREE="armada-3720-espressobin"
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
doc/README.marvell +6 -1
index 5416bc3035..ffd0544aef 100644
@@ -43,7 +43,12 @@ Build Procedure
          In order to prevent this, the required device-tree MUST be set during compilation.
          All device-tree files are located in ./arch/arm/dts/ folder.
 
-	For other DB boards (MacchiatoBin, EspressoBin and 3700 DB board) compile u-boot with
+	For the EspressoBin board without soldered eMMC device use
+		# make DEVICE_TREE=armada-3720-espressobin
+	For the EspressoBin board with populated eMMC device use
+		# make DEVICE_TREE=armada-3720-espressobin-emmc
+
+	For other DB boards (MacchiatoBin, and 3700 DB board) compile u-boot with
  	just default device-tree from defconfig using:
 
  		# make
Signature · 1 line
2.28.0
#5 lore raw

PATCH v2 2/2 arm64: mvebu: a37xx: Add support for EspressoBIN with eMMC

Quoted 8 lines · On Monday 31 August 2020 10:21:46 Andre Heider wrote:
Quoted 7 lines · Pali Roh?r
Quoted 5 lines · On Monday 31 August 2020 08:33:24 Andre Heider wrote:

From: Konstantin Porotchkin <[email protected]>

Add support for additional EspressoBIN board with installed eMMC device (U11).
Starting from this patch the DEVICE_TREE= must be added to

Quoted 7 lines
Quoted 3 lines

Why? Is not it better to have the most common non-emmc version by default instead forcing people to specify another compile time option? IIRC mmc versions are very rare.

That's actually what my v1 did, but other mvebu boards do it as well, as does downstream (which is where this patch original comes from). So I went ahead and kept it consistent.

If Marvell did something in their 2 years old unmaintained fork it does not mean that upstream U-Boot must copy+paste whole Marvell code including suspicious whitespace changes if there is no good reason for it.

And in my opinion, if we know that eMMC espressobin versions are rare and DTS file for non-eMMC version is compatible with eMMC espressobin HW, I do not see reason why not to have DTS file for non-eMMC version chosen by default. It would really simplify compilation and setup for most of people. And also it would simplify bisecting git repository for other Espressobin developers in case of some U-boot failure.

Quoted 99 lines

But sure, I can change it again.

Thanks,
Andre

Quoted 93 lines
Quoted 93 lines

"make" in order to distinguish between platforms wth and without eMMC on board.
Regualr (no eMMC) EspressoBIN builds should use DTS file named armada-3720-espressobin and build for boards with eMMC installed the DTS named armada-3720-espressobin-emmc.
The default device tree string is now removed from mvebu_espressobin-88f3720_defconfig config file. Update build documentation accordingly.

Change-Id Id1a4f3ca01a6e52df57bf7279f33f0fe45f8ed18

Reviewed-on: http://vgitil04.il.marvell.com:8080/61290

[a.heider: adapt to mainline]

---
v2: base upon downstream patch

  arch/arm/dts/Makefile                         |  1 +
  arch/arm/dts/armada-3720-espressobin-emmc.dts | 19 +++++++++++++++++++
  configs/mvebu_espressobin-88f3720_defconfig   |  1 -
  doc/README.marvell                            |  7 ++++++-
  4 files changed, 26 insertions(+), 2 deletions(-)

create mode 100644 arch/arm/dts/armada-3720-espressobin-emmc.dts

arch/arm/dts/Makefile +1 -0
index 5e34192be6..8f1958b5a7 100644
@@ -202,6 +202,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
  dtb-$(CONFIG_ARCH_MVEBU) +=			\
  	armada-3720-db.dtb			\
  	armada-3720-espressobin.dtb		\
+	armada-3720-espressobin-emmc.dtb	\
  	armada-3720-turris-mox.dtb		\
  	armada-3720-uDPU.dtb			\
  	armada-375-db.dtb			\
arch/arm/dts/armada-3720-espressobin-emmc.dts new file +19 -0
new file mode 100644
index 0000000000..0dd59af9c0
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018 Marvell International Ltd.
+ */
+
+#include "armada-3720-espressobin.dts"
+
+/ {
+	model = "Marvell Armada 3720 Community Board ESPRESSOBin (eMMC)";
+	compatible = "marvell,armada-3720-espressobin",
+		     "marvell,armada-3720-espressobin-emmc",
+		     "marvell,armada3720", "marvell,armada3710";
+
+};
+
+/* U11 */
+&sdhci1 {
+	status = "okay";
+};
configs/mvebu_espressobin-88f3720_defconfig +0 -1
index 0c1c92d4ff..99f421d841 100644
@@ -11,7 +11,6 @@ CONFIG_ENV_SECT_SIZE=0x10000
  CONFIG_DM_GPIO=y
  CONFIG_DEBUG_UART_BASE=0xd0012000
  CONFIG_DEBUG_UART_CLOCK=25804800
-CONFIG_DEFAULT_DEVICE_TREE="armada-3720-espressobin"
  CONFIG_DEBUG_UART=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
doc/README.marvell +6 -1
index 5416bc3035..ffd0544aef 100644
@@ -43,7 +43,12 @@ Build Procedure
          In order to prevent this, the required device-tree MUST be set during compilation.
          All device-tree files are located in ./arch/arm/dts/ folder.
-	For other DB boards (MacchiatoBin, EspressoBin and 3700 DB board) compile u-boot with
+	For the EspressoBin board without soldered eMMC device use
+		# make DEVICE_TREE=armada-3720-espressobin
+	For the EspressoBin board with populated eMMC device use
+		# make DEVICE_TREE=armada-3720-espressobin-emmc
+
+	For other DB boards (MacchiatoBin, and 3700 DB board) compile u-boot with
  	just default device-tree from defconfig using:
  		# make
Signature · 1 line
2.28.0
#6 lore raw

PATCH v2 2/2 arm64: mvebu: a37xx: Add support for EspressoBIN with eMMC

Quoted 13 lines · Pali Roh?r
Quoted 12 lines · On Monday 31 August 2020 10:21:46 Andre Heider wrote:
Quoted 10 lines · Pali Roh?r
Quoted 5 lines · On Monday 31 August 2020 08:33:24 Andre Heider wrote:

From: Konstantin Porotchkin <[email protected]>

Add support for additional EspressoBIN board with installed eMMC device (U11).
Starting from this patch the DEVICE_TREE= must be added to

Why? Is not it better to have the most common non-emmc version by default instead forcing people to specify another compile time option? IIRC mmc versions are very rare.

Quoted 8 lines
Quoted 3 lines

That's actually what my v1 did, but other mvebu boards do it as well, as does downstream (which is where this patch original comes from). So I went ahead and kept it consistent.

If Marvell did something in their 2 years old unmaintained fork it does not mean that upstream U-Boot must copy+paste whole Marvell code including suspicious whitespace changes if there is no good reason for it.

Hehe, of course not, there're changes I didn't carry over :) And that one whitespace change added a line break to a +80 char line, which I opted for.

Quoted 6 lines

And in my opinion, if we know that eMMC espressobin versions are rare and DTS file for non-eMMC version is compatible with eMMC espressobin HW, I do not see reason why not to have DTS file for non-eMMC version chosen by default. It would really simplify compilation and setup for most of people. And also it would simplify bisecting git repository for other Espressobin developers in case of some U-boot failure.

Those are two good points, thanks. I'll change it!

Quoted 99 lines
Quoted 99 lines

But sure, I can change it again.

Thanks,
Andre

Quoted 93 lines
Quoted 93 lines

"make" in order to distinguish between platforms wth and without eMMC on board.
Regualr (no eMMC) EspressoBIN builds should use DTS file named armada-3720-espressobin and build for boards with eMMC installed the DTS named armada-3720-espressobin-emmc.
The default device tree string is now removed from mvebu_espressobin-88f3720_defconfig config file. Update build documentation accordingly.

Change-Id Id1a4f3ca01a6e52df57bf7279f33f0fe45f8ed18

Reviewed-on: http://vgitil04.il.marvell.com:8080/61290

[a.heider: adapt to mainline]

---
v2: base upon downstream patch

   arch/arm/dts/Makefile                         |  1 +
   arch/arm/dts/armada-3720-espressobin-emmc.dts | 19 +++++++++++++++++++
   configs/mvebu_espressobin-88f3720_defconfig   |  1 -
   doc/README.marvell                            |  7 ++++++-
   4 files changed, 26 insertions(+), 2 deletions(-)

create mode 100644 arch/arm/dts/armada-3720-espressobin-emmc.dts

arch/arm/dts/Makefile +1 -0
index 5e34192be6..8f1958b5a7 100644
@@ -202,6 +202,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
   dtb-$(CONFIG_ARCH_MVEBU) +=			\
   	armada-3720-db.dtb			\
   	armada-3720-espressobin.dtb		\
+	armada-3720-espressobin-emmc.dtb	\
   	armada-3720-turris-mox.dtb		\
   	armada-3720-uDPU.dtb			\
   	armada-375-db.dtb			\
arch/arm/dts/armada-3720-espressobin-emmc.dts new file +19 -0
new file mode 100644
index 0000000000..0dd59af9c0
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018 Marvell International Ltd.
+ */
+
+#include "armada-3720-espressobin.dts"
+
+/ {
+	model = "Marvell Armada 3720 Community Board ESPRESSOBin (eMMC)";
+	compatible = "marvell,armada-3720-espressobin",
+		     "marvell,armada-3720-espressobin-emmc",
+		     "marvell,armada3720", "marvell,armada3710";
+
+};
+
+/* U11 */
+&sdhci1 {
+	status = "okay";
+};
configs/mvebu_espressobin-88f3720_defconfig +0 -1
index 0c1c92d4ff..99f421d841 100644
@@ -11,7 +11,6 @@ CONFIG_ENV_SECT_SIZE=0x10000
   CONFIG_DM_GPIO=y
   CONFIG_DEBUG_UART_BASE=0xd0012000
   CONFIG_DEBUG_UART_CLOCK=25804800
-CONFIG_DEFAULT_DEVICE_TREE="armada-3720-espressobin"
   CONFIG_DEBUG_UART=y
   CONFIG_AHCI=y
   CONFIG_DISTRO_DEFAULTS=y
doc/README.marvell +6 -1
index 5416bc3035..ffd0544aef 100644
@@ -43,7 +43,12 @@ Build Procedure
           In order to prevent this, the required device-tree MUST be set during compilation.
           All device-tree files are located in ./arch/arm/dts/ folder.
-	For other DB boards (MacchiatoBin, EspressoBin and 3700 DB board) compile u-boot with
+	For the EspressoBin board without soldered eMMC device use
+		# make DEVICE_TREE=armada-3720-espressobin
+	For the EspressoBin board with populated eMMC device use
+		# make DEVICE_TREE=armada-3720-espressobin-emmc
+
+	For other DB boards (MacchiatoBin, and 3700 DB board) compile u-boot with
   	just default device-tree from defconfig using:
   		# make
Signature · 1 line
2.28.0
#7 lore raw

PATCH v3 2/2 arm64: mvebu: a37xx: Add support for EspressoBIN with eMMC

In reply to Andre Heider

From: Konstantin Porotchkin <[email protected]>

Add support for additional EspressoBIN board with installed eMMC device (U11).
EspressoBIN boards with eMMC installed should use the DTS named armada-3720-espressobin-emmc.
Update build documentation accordingly.

Change-Id Id1a4f3ca01a6e52df57bf7279f33f0fe45f8ed18

Reviewed-on: http://vgitil04.il.marvell.com:8080/61290

[a.heider: adapt to mainline]

---
v2: base upon downstream patch
v3: keep CONFIG_DEFAULT_DEVICE_TREE for non-emmc boards

 arch/arm/dts/Makefile                         |  1 +
 arch/arm/dts/armada-3720-espressobin-emmc.dts | 19 +++++++++++++++++++
 doc/README.marvell                            |  7 +++++--
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/dts/armada-3720-espressobin-emmc.dts
arch/arm/dts/Makefile +1 -0
index 5e34192be6..8f1958b5a7 100644
@@ -202,6 +202,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
 dtb-$(CONFIG_ARCH_MVEBU) +=			\
 	armada-3720-db.dtb			\
 	armada-3720-espressobin.dtb		\
+	armada-3720-espressobin-emmc.dtb	\
 	armada-3720-turris-mox.dtb		\
 	armada-3720-uDPU.dtb			\
 	armada-375-db.dtb			\
arch/arm/dts/armada-3720-espressobin-emmc.dts new file +19 -0
new file mode 100644
index 0000000000..0dd59af9c0
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018 Marvell International Ltd.
+ */
+
+#include "armada-3720-espressobin.dts"
+
+/ {
+	model = "Marvell Armada 3720 Community Board ESPRESSOBin (eMMC)";
+	compatible = "marvell,armada-3720-espressobin",
+		     "marvell,armada-3720-espressobin-emmc",
+		     "marvell,armada3720", "marvell,armada3710";
+
+};
+
+/* U11 */
+&sdhci1 {
+	status = "okay";
+};
doc/README.marvell +5 -2
index 5416bc3035..be07f31f8c 100644
@@ -43,8 +43,11 @@ Build Procedure
         In order to prevent this, the required device-tree MUST be set during compilation.
         All device-tree files are located in ./arch/arm/dts/ folder.
 
-	For other DB boards (MacchiatoBin, EspressoBin and 3700 DB board) compile u-boot with
-	just default device-tree from defconfig using:
+	For the EspressoBin board with populated eMMC device use
+		# make DEVICE_TREE=armada-3720-espressobin-emmc
+
+	For other DB boards (MacchiatoBin, EspressoBin without soldered eMMC and 3700 DB board)
+	compile u-boot with just default device-tree from defconfig using:
 
 		# make
 
Signature · 1 line
2.28.0
#8 lore raw

PATCH v3 2/2 arm64: mvebu: a37xx: Add support for EspressoBIN with eMMC

Quoted 10 lines · On Tuesday 01 September 2020 09:03:59 Andre Heider wrote:

From: Konstantin Porotchkin <[email protected]>

Add support for additional EspressoBIN board with installed eMMC device (U11).
EspressoBIN boards with eMMC installed should use the DTS named armada-3720-espressobin-emmc.
Update build documentation accordingly.

Change-Id Id1a4f3ca01a6e52df57bf7279f33f0fe45f8ed18
Quoted 7 lines

Reviewed-on: http://vgitil04.il.marvell.com:8080/61290

[a.heider: adapt to mainline]

---
v2: base upon downstream patch
v3: keep CONFIG_DEFAULT_DEVICE_TREE for non-emmc boards

Now it looks good for me!

The only missing part is test these changes.

Quoted 64 lines
 arch/arm/dts/Makefile                         |  1 +
 arch/arm/dts/armada-3720-espressobin-emmc.dts | 19 +++++++++++++++++++
 doc/README.marvell                            |  7 +++++--
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/dts/armada-3720-espressobin-emmc.dts
arch/arm/dts/Makefile +1 -0
index 5e34192be6..8f1958b5a7 100644
@@ -202,6 +202,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
 dtb-$(CONFIG_ARCH_MVEBU) +=			\
 	armada-3720-db.dtb			\
 	armada-3720-espressobin.dtb		\
+	armada-3720-espressobin-emmc.dtb	\
 	armada-3720-turris-mox.dtb		\
 	armada-3720-uDPU.dtb			\
 	armada-375-db.dtb			\
arch/arm/dts/armada-3720-espressobin-emmc.dts new file +19 -0
new file mode 100644
index 0000000000..0dd59af9c0
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018 Marvell International Ltd.
+ */
+
+#include "armada-3720-espressobin.dts"
+
+/ {
+	model = "Marvell Armada 3720 Community Board ESPRESSOBin (eMMC)";
+	compatible = "marvell,armada-3720-espressobin",
+		     "marvell,armada-3720-espressobin-emmc",
+		     "marvell,armada3720", "marvell,armada3710";
+
+};
+
+/* U11 */
+&sdhci1 {
+	status = "okay";
+};
doc/README.marvell +5 -2
index 5416bc3035..be07f31f8c 100644
@@ -43,8 +43,11 @@ Build Procedure
         In order to prevent this, the required device-tree MUST be set during compilation.
         All device-tree files are located in ./arch/arm/dts/ folder.
 
-	For other DB boards (MacchiatoBin, EspressoBin and 3700 DB board) compile u-boot with
-	just default device-tree from defconfig using:
+	For the EspressoBin board with populated eMMC device use
+		# make DEVICE_TREE=armada-3720-espressobin-emmc
+
+	For other DB boards (MacchiatoBin, EspressoBin without soldered eMMC and 3700 DB board)
+	compile u-boot with just default device-tree from defconfig using:
 
 		# make
 
Signature · 1 line
2.28.0
#9 lore raw

PATCH v3 2/2 arm64: mvebu: a37xx: Add support for EspressoBIN with eMMC

In reply to Andre Heider
Quoted 8 lines · Andre Heider

From: Konstantin Porotchkin <[email protected]>

Add support for additional EspressoBIN board with installed eMMC device (U11).
EspressoBIN boards with eMMC installed should use the DTS named armada-3720-espressobin-emmc.
Update build documentation accordingly.

Quoted 6 lines
Change-Id Id1a4f3ca01a6e52df57bf7279f33f0fe45f8ed18

Reviewed-on: http://vgitil04.il.marvell.com:8080/61290

[a.heider: adapt to mainline]

Thanks,
Stefan

Quoted 56 lines

---
v2: base upon downstream patch
v3: keep CONFIG_DEFAULT_DEVICE_TREE for non-emmc boards

  arch/arm/dts/Makefile                         |  1 +
  arch/arm/dts/armada-3720-espressobin-emmc.dts | 19 +++++++++++++++++++
  doc/README.marvell                            |  7 +++++--
  3 files changed, 25 insertions(+), 2 deletions(-)

create mode 100644 arch/arm/dts/armada-3720-espressobin-emmc.dts

arch/arm/dts/Makefile +1 -0
index 5e34192be6..8f1958b5a7 100644
@@ -202,6 +202,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
  dtb-$(CONFIG_ARCH_MVEBU) +=			\
  	armada-3720-db.dtb			\
  	armada-3720-espressobin.dtb		\
+	armada-3720-espressobin-emmc.dtb	\
  	armada-3720-turris-mox.dtb		\
  	armada-3720-uDPU.dtb			\
  	armada-375-db.dtb			\
arch/arm/dts/armada-3720-espressobin-emmc.dts new file +19 -0
new file mode 100644
index 0000000000..0dd59af9c0
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018 Marvell International Ltd.
+ */
+
+#include "armada-3720-espressobin.dts"
+
+/ {
+	model = "Marvell Armada 3720 Community Board ESPRESSOBin (eMMC)";
+	compatible = "marvell,armada-3720-espressobin",
+		     "marvell,armada-3720-espressobin-emmc",
+		     "marvell,armada3720", "marvell,armada3710";
+
+};
+
+/* U11 */
+&sdhci1 {
+	status = "okay";
+};
doc/README.marvell +0 -0
index 5416bc3035..be07f31f8c 100644
@@ -43,8 +43,11 @@ Build Procedure
          In order to prevent this, the required device-tree MUST be set during compilation.
          All device-tree files are located in ./arch/arm/dts/ folder.
 

doc/README.marvell Build Procedure · line 53

Quoted 10 lines
doc/README.marvell +5 -2
-	For other DB boards (MacchiatoBin, EspressoBin and 3700 DB board) compile u-boot with
-	just default device-tree from defconfig using:
+	For the EspressoBin board with populated eMMC device use
+		# make DEVICE_TREE=armada-3720-espressobin-emmc
+
+	For other DB boards (MacchiatoBin, EspressoBin without soldered eMMC and 3700 DB board)
+	compile u-boot with just default device-tree from defconfig using:
 
  		# make
 

Viele Gr??e,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
#10 lore raw

PATCH 1/2 arm64: dts: armada-3720-espressobin: sync with downstream

In reply to Andre Heider
Quoted 49 lines · On Monday 31 August 2020 05:34:07 Andre Heider wrote:

This adds the disabled eMMC node.

---
 arch/arm/dts/armada-3720-espressobin.dts | 63 +++++++++---------------
 1 file changed, 23 insertions(+), 40 deletions(-)
arch/arm/dts/armada-3720-espressobin.dts +1 -29
index 4534f5ff29..a66ab814eb 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Device Tree file for Marvell Armada 3720 community board
  * (ESPRESSOBin)
@@ -5,53 +6,15 @@
  *
  * Gregory CLEMENT <[email protected]>
  * Konstantin Porotchkin <[email protected]>
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *  a) This file is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This file is distributed in the hope that it will be useful
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- * Or, alternatively
- *
- *  b) Permission is hereby granted, free of charge, to any person
- *     obtaining a copy of this software and associated documentation
- *     files (the "Software"), to deal in the Software without
- *     restriction, including without limitation the rights to use
- *     copy, modify, merge, publish, distribute, sublicense, and/or
- *     sell copies of the Software, and to permit persons to whom the
- *     Software is furnished to do so, subject to the following
- *     conditions:
- *
- *     The above copyright notice and this permission notice shall be
- *     included in all copies or substantial portions of the Software.

arch/arm/dts/armada-3720-espressobin.dts line 9

Quoted 10 lines
arch/arm/dts/armada-3720-espressobin.dts +0 -9
- *
- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *     OTHER DEALINGS IN THE SOFTWARE.
  */

You are changing license of whole file. Have all contributors and copyright holders agreed with it?

arch/arm/dts/armada-3720-espressobin.dts line 17

Quoted 10 lines
arch/arm/dts/armada-3720-espressobin.dts +2 -2
-
 /dts-v1/;
 
 #include "armada-372x.dtsi"
 
 / {
 	model = "Marvell Armada 3720 Community Board ESPRESSOBin";
-	compatible = "marvell,armada-3720-espressobin", "marvell,armada3720", "marvell,armada3710";
+	compatible = "marvell,armada-3720-espressobin",
+		     "marvell,armada3720", "marvell,armada3710";

There is no change on these two lines, right?

Quoted 40 lines
arch/arm/dts/armada-3720-espressobin.dts +20 -0
 	chosen {
 		stdout-path = "serial0:115200n8";
@@ -121,6 +84,7 @@
 	status = "okay";
 };
 
+/* J1 */
 &sdhci0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&sdio_pins>;
@@ -130,6 +94,25 @@
 	status = "okay";
 };
 
+/* U11 */
+&sdhci1 {
+	non-removable;
+	bus-width = <8>;
+	mmc-ddr-1_8v;
+	mmc-hs400-1_8v;
+	marvell,pad-type = "fixed-1-8v";
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc_pins>;
+	status = "disabled";
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+	mmccard: mmccard at 0 {
+		compatible = "mmc-card";
+		reg = <0>;
+	};
+};
+
 &spi0 {
 	status = "okay";
 	pinctrl-names = "default";
Signature · 1 line
2.28.0
#11 lore raw

PATCH 1/2 arm64: dts: armada-3720-espressobin: sync with downstream

Quoted 55 lines · Pali Roh?r
Quoted 54 lines · On Monday 31 August 2020 05:34:07 Andre Heider wrote:

This adds the disabled eMMC node.

---
  arch/arm/dts/armada-3720-espressobin.dts | 63 +++++++++---------------
  1 file changed, 23 insertions(+), 40 deletions(-)
arch/arm/dts/armada-3720-espressobin.dts +1 -34
index 4534f5ff29..a66ab814eb 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
  /*
   * Device Tree file for Marvell Armada 3720 community board
   * (ESPRESSOBin)
@@ -5,53 +6,15 @@
   *
   * Gregory CLEMENT <[email protected]>
   * Konstantin Porotchkin <[email protected]>
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *  a) This file is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This file is distributed in the hope that it will be useful
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- * Or, alternatively
- *
- *  b) Permission is hereby granted, free of charge, to any person
- *     obtaining a copy of this software and associated documentation
- *     files (the "Software"), to deal in the Software without
- *     restriction, including without limitation the rights to use
- *     copy, modify, merge, publish, distribute, sublicense, and/or
- *     sell copies of the Software, and to permit persons to whom the
- *     Software is furnished to do so, subject to the following
- *     conditions:
- *
- *     The above copyright notice and this permission notice shall be
- *     included in all copies or substantial portions of the Software.
- *
- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
Quoted 8 lines

arch/arm/dts/armada-3720-espressobin.dts line 9

Quoted 5 lines
arch/arm/dts/armada-3720-espressobin.dts +0 -4
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *     OTHER DEALINGS IN THE SOFTWARE.
   */

You are changing license of whole file. Have all contributors and copyright holders agreed with it?

These are all downstream changes, I haven't added any additional changes!

Quoted 6 lines
Quoted 6 lines
arch/arm/dts/armada-3720-espressobin.dts +0 -1
-
  /dts-v1/;
 
  #include "armada-372x.dtsi"
 
Quoted 7 lines

arch/arm/dts/armada-3720-espressobin.dts line 17

Quoted 5 lines
arch/arm/dts/armada-3720-espressobin.dts +2 -1
  / {
  	model = "Marvell Armada 3720 Community Board ESPRESSOBin";
-	compatible = "marvell,armada-3720-espressobin", "marvell,armada3720", "marvell,armada3710";
+	compatible = "marvell,armada-3720-espressobin",
+		     "marvell,armada3720", "marvell,armada3710";

There is no change on these two lines, right?

Right, just white spaces.

Quoted 41 lines
Quoted 41 lines
arch/arm/dts/armada-3720-espressobin.dts +20 -0
  	chosen {
  		stdout-path = "serial0:115200n8";
@@ -121,6 +84,7 @@
  	status = "okay";
  };
 
+/* J1 */
  &sdhci0 {
  	pinctrl-names = "default";
  	pinctrl-0 = <&sdio_pins>;
@@ -130,6 +94,25 @@
  	status = "okay";
  };
 
+/* U11 */
+&sdhci1 {
+	non-removable;
+	bus-width = <8>;
+	mmc-ddr-1_8v;
+	mmc-hs400-1_8v;
+	marvell,pad-type = "fixed-1-8v";
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc_pins>;
+	status = "disabled";
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+	mmccard: mmccard at 0 {
+		compatible = "mmc-card";
+		reg = <0>;
+	};
+};
+
  &spi0 {
  	status = "okay";
  	pinctrl-names = "default";
Signature · 1 line
2.28.0
#12 lore raw

PATCH 1/2 arm64: dts: armada-3720-espressobin: sync with downstream

In reply to Pali Rohár

Hi Andre,

Quoted 55 lines · Pali Roh?r
Quoted 54 lines · On Monday 31 August 2020 05:34:07 Andre Heider wrote:

This adds the disabled eMMC node.

---
  arch/arm/dts/armada-3720-espressobin.dts | 63 +++++++++---------------
  1 file changed, 23 insertions(+), 40 deletions(-)
arch/arm/dts/armada-3720-espressobin.dts +1 -34
index 4534f5ff29..a66ab814eb 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
  /*
   * Device Tree file for Marvell Armada 3720 community board
   * (ESPRESSOBin)
@@ -5,53 +6,15 @@
   *
   * Gregory CLEMENT <[email protected]>
   * Konstantin Porotchkin <[email protected]>
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *  a) This file is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This file is distributed in the hope that it will be useful
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- * Or, alternatively
- *
- *  b) Permission is hereby granted, free of charge, to any person
- *     obtaining a copy of this software and associated documentation
- *     files (the "Software"), to deal in the Software without
- *     restriction, including without limitation the rights to use
- *     copy, modify, merge, publish, distribute, sublicense, and/or
- *     sell copies of the Software, and to permit persons to whom the
- *     Software is furnished to do so, subject to the following
- *     conditions:
- *
- *     The above copyright notice and this permission notice shall be
- *     included in all copies or substantial portions of the Software.
- *
- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
Quoted 8 lines

arch/arm/dts/armada-3720-espressobin.dts line 9

Quoted 5 lines
arch/arm/dts/armada-3720-espressobin.dts +0 -4
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *     OTHER DEALINGS IN THE SOFTWARE.
   */

You are changing license of whole file. Have all contributors and copyright holders agreed with it?

First I though that you have been syncing the file with the Linux kernel version. But now I see that its sync'ed with downstream U-Boot most likely. As for the license of the file: The Linux kernel version has this SPDX tag:

// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

Changing this to this tag would haven been fine (AFAICT). But using a diffent one from a downstream U-Boot repository is a bit troublesome for my taste.

Can't you sync with Linux dts/dtsi files instead at some point?

Thanks,
Stefan

Quoted 45 lines

arch/arm/dts/armada-3720-espressobin.dts line 17

Quoted 10 lines
arch/arm/dts/armada-3720-espressobin.dts +2 -2
-
  /dts-v1/;
 
  #include "armada-372x.dtsi"
 
  / {
  	model = "Marvell Armada 3720 Community Board ESPRESSOBin";
-	compatible = "marvell,armada-3720-espressobin", "marvell,armada3720", "marvell,armada3710";
+	compatible = "marvell,armada-3720-espressobin",
+		     "marvell,armada3720", "marvell,armada3710";

There is no change on these two lines, right?

Quoted 32 lines
arch/arm/dts/armada-3720-espressobin.dts +18 -0
  	chosen {
  		stdout-path = "serial0:115200n8";
@@ -121,6 +84,7 @@
  	status = "okay";
  };
 
+/* J1 */
  &sdhci0 {
  	pinctrl-names = "default";
  	pinctrl-0 = <&sdio_pins>;
@@ -130,6 +94,25 @@
  	status = "okay";
  };
 
+/* U11 */
+&sdhci1 {
+	non-removable;
+	bus-width = <8>;
+	mmc-ddr-1_8v;
+	mmc-hs400-1_8v;
+	marvell,pad-type = "fixed-1-8v";
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc_pins>;
+	status = "disabled";
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+	mmccard: mmccard at 0 {
+		compatible = "mmc-card";
+		reg = <0>;
+	};
Quoted 8 lines
Quoted 8 lines
arch/arm/dts/armada-3720-espressobin.dts +2 -0
+};
+
  &spi0 {
  	status = "okay";
  	pinctrl-names = "default";
Signature · 1 line
2.28.0

Viele Gr??e,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
#13 lore raw

PATCH 1/2 arm64: dts: armada-3720-espressobin: sync with downstream

Hi Stefan,

Quoted 74 lines · Stefan Roese

Hi Andre,

Quoted 57 lines · Pali Roh?r
Quoted 56 lines · On Monday 31 August 2020 05:34:07 Andre Heider wrote:

This adds the disabled eMMC node.

---
? arch/arm/dts/armada-3720-espressobin.dts | 63 +++++++++--------------- ? 1 file changed, 23 insertions(+), 40 deletions(-)

arch/arm/dts/armada-3720-espressobin.dts +1 -0
index 4534f5ff29..a66ab814eb 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+

? /*
?? * Device Tree file for Marvell Armada 3720 community board ?? * (ESPRESSOBin)

arch/arm/dts/armada-3720-espressobin.dts +0 -0
@@ -5,53 +6,15 @@

?? *
?? * Gregory CLEMENT <[email protected]>
?? * Konstantin Porotchkin <[email protected]>
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *? a) This file is free software; you can redistribute it and/or
- *???? modify it under the terms of the GNU General Public License as
- *???? published by the Free Software Foundation; either version 2 of the
- *???? License, or (at your option) any later version.
- *
- *???? This file is distributed in the hope that it will be useful
- *???? but WITHOUT ANY WARRANTY; without even the implied warranty of
- *???? MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.? See the
- *???? GNU General Public License for more details.
- *
- * Or, alternatively
- *
- *? b) Permission is hereby granted, free of charge, to any person
- *???? obtaining a copy of this software and associated documentation
- *???? files (the "Software"), to deal in the Software without
- *???? restriction, including without limitation the rights to use
- *???? copy, modify, merge, publish, distribute, sublicense, and/or
- *???? sell copies of the Software, and to permit persons to whom the
- *???? Software is furnished to do so, subject to the following
- *???? conditions:
- *
- *???? The above copyright notice and this permission notice shall be
- *???? included in all copies or substantial portions of the Software.
- *
- *???? THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
- *???? EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *???? OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *???? NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

Quoted 8 lines
Quoted 5 lines

- *???? HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
- *???? WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *???? FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *???? OTHER DEALINGS IN THE SOFTWARE.
?? */

You are changing license of whole file. Have all contributors and copyright holders agreed with it?

First I though that you have been syncing the file with the Linux kernel version. But now I see that its sync'ed with downstream U-Boot most likely. As for the license of the file: The Linux kernel version has this SPDX tag:

Quoted 7 lines

// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

Changing this to this tag would haven been fine (AFAICT). But using a diffent one from a downstream U-Boot repository is a bit troublesome for my taste.

Can't you sync with Linux dts/dtsi files instead at some point?

at some point, yes. As far as I understand that's not yet possible due to the comphy driver. Quoting Marek's cover letter "[PATCH u-boot-marvell 00/11] Armada 37xx: port comphy to generic-phys (PLEASE TEST)" from 19th April:

Quoted 4 lines

I have ported the COMPHY and UTMI PHY drivers from Linux to U-Boot. With this we are able to abandon the current comphy_a3700 driver, which is incompatible with Linux' device trees. So if we want to have DTS files for A3720 boards identical to Linux', we have to do this.

So unfortunately we can't use Linux' dts files for a3700 yet. Marek said he plans to work on that set again in the near future, so hopefully that lands rather sooner than later ;)

Thanks,
Andre

#14 lore raw

PATCH 1/2 arm64: dts: armada-3720-espressobin: sync with downstream

Hi Andre,

On 04.09.20 14:35, Andre Heider wrote:

<snip>

Quoted 18 lines
Quoted 5 lines

First I though that you have been syncing the file with the Linux kernel version. But now I see that its sync'ed with downstream U-Boot most likely. As for the license of the file: The Linux kernel version has this SPDX tag:

Quoted 7 lines

// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

Changing this to this tag would haven been fine (AFAICT). But using a diffent one from a downstream U-Boot repository is a bit troublesome for my taste.

Can't you sync with Linux dts/dtsi files instead at some point?

at some point, yes. As far as I understand that's not yet possible due to the comphy driver. Quoting Marek's cover letter "[PATCH u-boot-marvell 00/11] Armada 37xx: port comphy to generic-phys (PLEASE TEST)" from 19th April:

Quoted 8 lines
Quoted 4 lines

I have ported the COMPHY and UTMI PHY drivers from Linux to U-Boot. With this we are able to abandon the current comphy_a3700 driver, which is incompatible with Linux' device trees. So if we want to have DTS files for A3720 boards identical to Linux', we have to do this.

So unfortunately we can't use Linux' dts files for a3700 yet. Marek said he plans to work on that set again in the near future, so hopefully that lands rather sooner than later ;)

Ah, thanks. I remember now. ;)

Can you then please drop the sync with the downstream dts and better only make the necessary changes for eMMC? In a git bisectable way please?

I know that nobody can test this right now. Perhaps Kostya or somebody at Marvell be help out here?

Thanks,
Stefan

#15 lore raw

PATCH 1/2 arm64: dts: armada-3720-espressobin: sync with downstream

Quoted 34 lines · Stefan Roese

Hi Andre,

On 04.09.20 14:35, Andre Heider wrote:

<snip>

Quoted 24 lines
Quoted 5 lines

First I though that you have been syncing the file with the Linux kernel version. But now I see that its sync'ed with downstream U-Boot most likely. As for the license of the file: The Linux kernel version has this SPDX tag:

Quoted 7 lines

// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

Changing this to this tag would haven been fine (AFAICT). But using a diffent one from a downstream U-Boot repository is a bit troublesome for my taste.

Can't you sync with Linux dts/dtsi files instead at some point?

at some point, yes. As far as I understand that's not yet possible due to the comphy driver. Quoting Marek's cover letter "[PATCH u-boot-marvell 00/11] Armada 37xx: port comphy to generic-phys (PLEASE TEST)" from 19th April:

?> I have ported the COMPHY and UTMI PHY drivers from Linux to U-Boot. ?> With this we are able to abandon the current comphy_a3700 driver, which
?> is incompatible with Linux' device trees. So if we want to have DTS ?> files for A3720 boards identical to Linux', we have to do this.

Quoted 3 lines

So unfortunately we can't use Linux' dts files for a3700 yet. Marek said he plans to work on that set again in the near future, so hopefully that lands rather sooner than later ;)

Quoted 5 lines

Ah, thanks. I remember now. ;)

Can you then please drop the sync with the downstream dts and better only make the necessary changes for eMMC? In a git bisectable way please?

Sure, I've just sent v2, completely redone. That also prepares synching from Linux, actually already imports two dts from from there.

Regards,
Andre

#16 lore raw

PATCH 1/2 arm64: dts: armada-3720-espressobin: sync with downstream

Quoted 35 lines · On Friday 04 September 2020 17:36:18 Andre Heider wrote:
Quoted 34 lines · Stefan Roese

Hi Andre,

On 04.09.20 14:35, Andre Heider wrote:

<snip>

Quoted 27 lines
Quoted 5 lines

First I though that you have been syncing the file with the Linux kernel version. But now I see that its sync'ed with downstream U-Boot most likely. As for the license of the file: The Linux kernel version has this SPDX tag:

Quoted 7 lines

// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

Changing this to this tag would haven been fine (AFAICT). But using a diffent one from a downstream U-Boot repository is a bit troublesome for my taste.

Can't you sync with Linux dts/dtsi files instead at some point?

at some point, yes. As far as I understand that's not yet possible due to the comphy driver. Quoting Marek's cover letter "[PATCH u-boot-marvell 00/11] Armada 37xx: port comphy to generic-phys (PLEASE TEST)" from 19th April:

?> I have ported the COMPHY and UTMI PHY drivers from Linux to U-Boot. ?> With this we are able to abandon the current comphy_a3700 driver, which
?> is incompatible with Linux' device trees. So if we want to have DTS ?> files for A3720 boards identical to Linux', we have to do this.

So unfortunately we can't use Linux' dts files for a3700 yet. Marek said he plans to work on that set again in the near future, so hopefully that lands rather sooner than later ;)

Quoted 8 lines
Quoted 5 lines

Ah, thanks. I remember now. ;)

Can you then please drop the sync with the downstream dts and better only make the necessary changes for eMMC? In a git bisectable way please?

Sure, I've just sent v2, completely redone. That also prepares synching from Linux, actually already imports two dts from from there.

So synchronization with Linux DTS files needs to wait until Armada comphy patches are finished and merged into mainline U-Boot.

#17 lore raw

PATCH 1/2 arm64: dts: armada-3720-espressobin: sync with downstream

In reply to Andre Heider
Quoted 91 lines · Andre Heider

Hi Stefan,

Quoted 74 lines · Stefan Roese

Hi Andre,

Quoted 57 lines · Pali Roh?r
Quoted 56 lines · On Monday 31 August 2020 05:34:07 Andre Heider wrote:

This adds the disabled eMMC node.

---
  arch/arm/dts/armada-3720-espressobin.dts | 63 +++++++++---------------
  1 file changed, 23 insertions(+), 40 deletions(-)
arch/arm/dts/armada-3720-espressobin.dts +1 -9
index 4534f5ff29..a66ab814eb 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
  /*
   * Device Tree file for Marvell Armada 3720 community board
   * (ESPRESSOBin)
@@ -5,53 +6,15 @@
   *
   * Gregory CLEMENT <[email protected]>
   * Konstantin Porotchkin <[email protected]>
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *  a) This file is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2

of the
- * License, or (at your option) any later version.
- *

- *     This file is distributed in the hope that it will be useful
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.

- *
- * Or, alternatively
- *
- * b) Permission is hereby granted, free of charge, to any person

- *     obtaining a copy of this software and associated documentation
- *     files (the "Software"), to deal in the Software without
- *     restriction, including without limitation the rights to use
- *     copy, modify, merge, publish, distribute, sublicense, and/or
- *     sell copies of the Software, and to permit persons to whom the
- *     Software is furnished to do so, subject to the following
- *     conditions:

- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *

- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
Quoted 8 lines
Quoted 5 lines
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *     OTHER DEALINGS IN THE SOFTWARE.

*/

You are changing license of whole file. Have all contributors and copyright holders agreed with it?

First I though that you have been syncing the file with the Linux kernel version. But now I see that its sync'ed with downstream U-Boot most likely. As for the license of the file: The Linux kernel version has this SPDX tag:

Quoted 7 lines

// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

Changing this to this tag would haven been fine (AFAICT). But using a diffent one from a downstream U-Boot repository is a bit troublesome for my taste.

Can't you sync with Linux dts/dtsi files instead at some point?

at some point, yes. As far as I understand that's not yet possible due to the comphy driver. Quoting Marek's cover letter "[PATCH u-boot-marvell 00/11] Armada 37xx: port comphy to generic-phys (PLEASE TEST)" from 19th April:

Quoted 8 lines
Quoted 4 lines

I have ported the COMPHY and UTMI PHY drivers from Linux to U-Boot. With this we are able to abandon the current comphy_a3700 driver, which is incompatible with Linux' device trees. So if we want to have DTS files for A3720 boards identical to Linux', we have to do this.

So unfortunately we can't use Linux' dts files for a3700 yet. Marek said he plans to work on that set again in the near future, so hopefully that lands rather sooner than later ;)

The way U-Boot usually deals with this is syncs as much of the Linux ones as possible and if there's bits not in the Linux one that's needed to make/keep U-Boot working they add it in a XXX-u-boot.dtsi file. There's a number of examples in the arch/arm/dts directory.

#18 lore raw

PATCH 1/2 arm64: dts: armada-3720-espressobin: sync with downstream

Quoted 4 lines · On Sunday 06 September 2020 17:03:29 Peter Robinson wrote:

The way U-Boot usually deals with this is syncs as much of the Linux ones as possible and if there's bits not in the Linux one that's needed to make/keep U-Boot working they add it in a XXX-u-boot.dtsi file. There's a number of examples in the arch/arm/dts directory.

Hello Peter! The main issue is that U-Boot has different comphy driver as Linux kernel and these two different implementations also needs different DTS files. Marek is working on patches to replace U-Boot comphy driver from Linux and then U-Boot will also use comphy DTS definitions from Linux.

I think it does not make sense to spend time on thinking and implementing how to semi-synchronize DTS files from kernel as after comphy U-Boot driver changes, DTS files would be again changed.

#19 lore raw

PATCH 1/2 arm64: dts: armada-3720-espressobin: sync with downstream

In reply to Andre Heider
Quoted 92 lines · On Monday 31 August 2020 05:34:07 Andre Heider wrote:

This adds the disabled eMMC node.

---
 arch/arm/dts/armada-3720-espressobin.dts | 63 +++++++++---------------
 1 file changed, 23 insertions(+), 40 deletions(-)
arch/arm/dts/armada-3720-espressobin.dts +12 -40
index 4534f5ff29..a66ab814eb 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Device Tree file for Marvell Armada 3720 community board
  * (ESPRESSOBin)
@@ -5,53 +6,15 @@
  *
  * Gregory CLEMENT <[email protected]>
  * Konstantin Porotchkin <[email protected]>
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *  a) This file is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This file is distributed in the hope that it will be useful
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- * Or, alternatively
- *
- *  b) Permission is hereby granted, free of charge, to any person
- *     obtaining a copy of this software and associated documentation
- *     files (the "Software"), to deal in the Software without
- *     restriction, including without limitation the rights to use
- *     copy, modify, merge, publish, distribute, sublicense, and/or
- *     sell copies of the Software, and to permit persons to whom the
- *     Software is furnished to do so, subject to the following
- *     conditions:
- *
- *     The above copyright notice and this permission notice shall be
- *     included in all copies or substantial portions of the Software.
- *
- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *     OTHER DEALINGS IN THE SOFTWARE.
  */
-
 /dts-v1/;
 
 #include "armada-372x.dtsi"
 
 / {
 	model = "Marvell Armada 3720 Community Board ESPRESSOBin";
-	compatible = "marvell,armada-3720-espressobin", "marvell,armada3720", "marvell,armada3710";
+	compatible = "marvell,armada-3720-espressobin",
+		     "marvell,armada3720", "marvell,armada3710";
 
 	chosen {
 		stdout-path = "serial0:115200n8";
@@ -121,6 +84,7 @@
 	status = "okay";
 };
 
+/* J1 */
 &sdhci0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&sdio_pins>;
@@ -130,6 +94,25 @@
 	status = "okay";
 };
 
+/* U11 */
+&sdhci1 {
+	non-removable;
+	bus-width = <8>;
+	mmc-ddr-1_8v;
+	mmc-hs400-1_8v;
+	marvell,pad-type = "fixed-1-8v";
+	pinctrl-names = "default";

arch/arm/dts/armada-3720-espressobin.dts line 114

Quoted 10 lines
arch/arm/dts/armada-3720-espressobin.dts +10 -0
+	pinctrl-0 = <&mmc_pins>;
+	status = "disabled";
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+	mmccard: mmccard at 0 {
+		compatible = "mmc-card";
+		reg = <0>;
+	};
+};

Anyway, Andre, have you tested these Marvell's patches on top of U-Boot from master git branch? Because espressobin with eMMC is rather rare (do not know who has this board for testing; do you really have it?) and from my experience with previous patches I know that Marvell's patches does not always work on current upstream U-Boot.

Quoted 7 lines
arch/arm/dts/armada-3720-espressobin.dts +1 -0
+
 &spi0 {
 	status = "okay";
 	pinctrl-names = "default";
Signature · 1 line
2.28.0
#20 lore raw

PATCH 1/2 arm64: dts: armada-3720-espressobin: sync with downstream

Quoted 101 lines · Pali Roh?r
Quoted 100 lines · On Monday 31 August 2020 05:34:07 Andre Heider wrote:

This adds the disabled eMMC node.

---
  arch/arm/dts/armada-3720-espressobin.dts | 63 +++++++++---------------
  1 file changed, 23 insertions(+), 40 deletions(-)
arch/arm/dts/armada-3720-espressobin.dts +20 -40
index 4534f5ff29..a66ab814eb 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
  /*
   * Device Tree file for Marvell Armada 3720 community board
   * (ESPRESSOBin)
@@ -5,53 +6,15 @@
   *
   * Gregory CLEMENT <[email protected]>
   * Konstantin Porotchkin <[email protected]>
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *  a) This file is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This file is distributed in the hope that it will be useful
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- * Or, alternatively
- *
- *  b) Permission is hereby granted, free of charge, to any person
- *     obtaining a copy of this software and associated documentation
- *     files (the "Software"), to deal in the Software without
- *     restriction, including without limitation the rights to use
- *     copy, modify, merge, publish, distribute, sublicense, and/or
- *     sell copies of the Software, and to permit persons to whom the
- *     Software is furnished to do so, subject to the following
- *     conditions:
- *
- *     The above copyright notice and this permission notice shall be
- *     included in all copies or substantial portions of the Software.
- *
- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *     OTHER DEALINGS IN THE SOFTWARE.
   */
-
  /dts-v1/;
 
  #include "armada-372x.dtsi"
 
  / {
  	model = "Marvell Armada 3720 Community Board ESPRESSOBin";
-	compatible = "marvell,armada-3720-espressobin", "marvell,armada3720", "marvell,armada3710";
+	compatible = "marvell,armada-3720-espressobin",
+		     "marvell,armada3720", "marvell,armada3710";
 
  	chosen {
  		stdout-path = "serial0:115200n8";
@@ -121,6 +84,7 @@
  	status = "okay";
  };
 
+/* J1 */
  &sdhci0 {
  	pinctrl-names = "default";
  	pinctrl-0 = <&sdio_pins>;
@@ -130,6 +94,25 @@
  	status = "okay";
  };
 
+/* U11 */
+&sdhci1 {
+	non-removable;
+	bus-width = <8>;
+	mmc-ddr-1_8v;
+	mmc-hs400-1_8v;
+	marvell,pad-type = "fixed-1-8v";
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc_pins>;
+	status = "disabled";
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+	mmccard: mmccard at 0 {
+		compatible = "mmc-card";
+		reg = <0>;
Quoted 8 lines

arch/arm/dts/armada-3720-espressobin.dts line 114

Quoted 2 lines
arch/arm/dts/armada-3720-espressobin.dts +2 -0
+	};
+};

Anyway, Andre, have you tested these Marvell's patches on top of U-Boot from master git branch? Because espressobin with eMMC is rather rare (do not know who has this board for testing; do you really have it?) and from my experience with previous patches I know that Marvell's patches does not always work on current upstream U-Boot.

I haven't tested it on a espressobin emmc myself, but the node is the same as for arch/arm/dts/armada-3720-db.dts and almost the same as for arch/arm/dts/armada-3720-uDPU.dts.

Thanks,
Andre

Quoted 8 lines
Quoted 8 lines
arch/arm/dts/armada-3720-espressobin.dts +1 -0
+
  &spi0 {
  	status = "okay";
  	pinctrl-names = "default";
Signature · 1 line
2.28.0
#21 lore raw

PATCH 1/2 arm64: dts: armada-3720-espressobin: sync with downstream

Quoted 27 lines · On Monday 31 August 2020 10:17:07 Andre Heider wrote:
Quoted 17 lines · Pali Roh?r
Quoted 16 lines · On Monday 31 August 2020 05:34:07 Andre Heider wrote:
arch/arm/dts/armada-3720-espressobin.dts +16 -0
+/* U11 */
+&sdhci1 {
+	non-removable;
+	bus-width = <8>;
+	mmc-ddr-1_8v;
+	mmc-hs400-1_8v;
+	marvell,pad-type = "fixed-1-8v";
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc_pins>;
+	status = "disabled";
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+	mmccard: mmccard at 0 {
+		compatible = "mmc-card";
+		reg = <0>;
Quoted 8 lines

arch/arm/dts/armada-3720-espressobin.dts line 114

Quoted 2 lines
arch/arm/dts/armada-3720-espressobin.dts +2 -0
+	};
+};

Anyway, Andre, have you tested these Marvell's patches on top of U-Boot from master git branch? Because espressobin with eMMC is rather rare (do not know who has this board for testing; do you really have it?) and from my experience with previous patches I know that Marvell's patches does not always work on current upstream U-Boot.

Quoted 3 lines

I haven't tested it on a espressobin emmc myself, but the node is the same as for arch/arm/dts/armada-3720-db.dts and almost the same as for arch/arm/dts/armada-3720-uDPU.dts.

I think changes should be tested prior merged them into upstream. Untested patches can cause other hidden issues.

Also as I wrote, other SD patches for EspressoBin copied+pasted from Marvell's did not worked as is applied on current upstream U-Boot. And also argument that "patch is similar as other node" is not reason to not test changed. As a first thing which I did for SD card support on EspressoBin was that I copied DTS node from Turris MOX... and on EspressoBin it did not worked. On MOX was card working fine.

#22 lore raw

PATCH 1/2 arm64: dts: armada-3720-espressobin: sync with downstream

Quoted 28 lines · Pali Roh?r
Quoted 27 lines · On Monday 31 August 2020 10:17:07 Andre Heider wrote:
Quoted 25 lines · Pali Roh?r
Quoted 8 lines · On Monday 31 August 2020 05:34:07 Andre Heider wrote:
arch/arm/dts/armada-3720-espressobin.dts +8 -0
+/* U11 */
+&sdhci1 {
+	non-removable;
+	bus-width = <8>;
+	mmc-ddr-1_8v;
+	mmc-hs400-1_8v;
+	marvell,pad-type = "fixed-1-8v";
+	pinctrl-names = "default";

arch/arm/dts/armada-3720-espressobin.dts line 114

Quoted 10 lines
arch/arm/dts/armada-3720-espressobin.dts +10 -0
+	pinctrl-0 = <&mmc_pins>;
+	status = "disabled";
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+	mmccard: mmccard at 0 {
+		compatible = "mmc-card";
+		reg = <0>;
+	};
+};

Anyway, Andre, have you tested these Marvell's patches on top of U-Boot from master git branch? Because espressobin with eMMC is rather rare (do not know who has this board for testing; do you really have it?) and from my experience with previous patches I know that Marvell's patches does not always work on current upstream U-Boot.

Quoted 6 lines
Quoted 3 lines

I haven't tested it on a espressobin emmc myself, but the node is the same as for arch/arm/dts/armada-3720-db.dts and almost the same as for arch/arm/dts/armada-3720-uDPU.dts.

I think changes should be tested prior merged them into upstream. Untested patches can cause other hidden issues.

Like an utterly broken u-boot for 2 years due to data aborts? :)

Quoted 6 lines

Also as I wrote, other SD patches for EspressoBin copied+pasted from Marvell's did not worked as is applied on current upstream U-Boot. And also argument that "patch is similar as other node" is not reason to not test changed. As a first thing which I did for SD card support on EspressoBin was that I copied DTS node from Turris MOX... and on EspressoBin it did not worked. On MOX was card working fine.

I would test the patches if I had the hardware, but I just don't.

Maybe someone with an espressobin-emmc reads and tests this. And I can try to find users on e.g. the openwrt forums. But I wouldn't hold my breath...

Thanks,
Andre

#23 lore raw

PATCH 1/2 arm64: dts: armada-3720-espressobin: sync with downstream

Quoted 29 lines · On Monday 31 August 2020 11:59:28 Andre Heider wrote:
Quoted 28 lines · Pali Roh?r
Quoted 27 lines · On Monday 31 August 2020 10:17:07 Andre Heider wrote:
Quoted 25 lines · Pali Roh?r
Quoted 8 lines · On Monday 31 August 2020 05:34:07 Andre Heider wrote:
arch/arm/dts/armada-3720-espressobin.dts +8 -0
+/* U11 */
+&sdhci1 {
+	non-removable;
+	bus-width = <8>;
+	mmc-ddr-1_8v;
+	mmc-hs400-1_8v;
+	marvell,pad-type = "fixed-1-8v";
+	pinctrl-names = "default";

arch/arm/dts/armada-3720-espressobin.dts line 114

Quoted 10 lines
arch/arm/dts/armada-3720-espressobin.dts +10 -0
+	pinctrl-0 = <&mmc_pins>;
+	status = "disabled";
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+	mmccard: mmccard at 0 {
+		compatible = "mmc-card";
+		reg = <0>;
+	};
+};

Anyway, Andre, have you tested these Marvell's patches on top of U-Boot from master git branch? Because espressobin with eMMC is rather rare (do not know who has this board for testing; do you really have it?) and from my experience with previous patches I know that Marvell's patches does not always work on current upstream U-Boot.

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

I haven't tested it on a espressobin emmc myself, but the node is the same as for arch/arm/dts/armada-3720-db.dts and almost the same as for arch/arm/dts/armada-3720-uDPU.dts.

I think changes should be tested prior merged them into upstream. Untested patches can cause other hidden issues.

Like an utterly broken u-boot for 2 years due to data aborts? :)

Exactly!

Quoted 7 lines
Quoted 6 lines

Also as I wrote, other SD patches for EspressoBin copied+pasted from Marvell's did not worked as is applied on current upstream U-Boot. And also argument that "patch is similar as other node" is not reason to not test changed. As a first thing which I did for SD card support on EspressoBin was that I copied DTS node from Turris MOX... and on EspressoBin it did not worked. On MOX was card working fine.

Quoted 5 lines

I would test the patches if I had the hardware, but I just don't.

Maybe someone with an espressobin-emmc reads and tests this. And I can try to find users on e.g. the openwrt forums. But I wouldn't hold my breath...

Another option could be to solder eMMC on existing non-eMMC EspressoBin board, but this is rather very hard without expensive equipment.

Anyway, if there are no users with hardware I think it does not make sense to try supporting such HW combination.

#24 lore raw

PATCH 1/2 arm64: dts: armada-3720-espressobin: sync with downstream

In reply to Andre Heider
Quoted 3 lines · Andre Heider

This adds the disabled eMMC node.

Thanks,
Stefan

Quoted 94 lines
---
  arch/arm/dts/armada-3720-espressobin.dts | 63 +++++++++---------------
  1 file changed, 23 insertions(+), 40 deletions(-)
arch/arm/dts/armada-3720-espressobin.dts +16 -40
index 4534f5ff29..a66ab814eb 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
  /*
   * Device Tree file for Marvell Armada 3720 community board
   * (ESPRESSOBin)
@@ -5,53 +6,15 @@
   *
   * Gregory CLEMENT <[email protected]>
   * Konstantin Porotchkin <[email protected]>
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *  a) This file is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This file is distributed in the hope that it will be useful
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- * Or, alternatively
- *
- *  b) Permission is hereby granted, free of charge, to any person
- *     obtaining a copy of this software and associated documentation
- *     files (the "Software"), to deal in the Software without
- *     restriction, including without limitation the rights to use
- *     copy, modify, merge, publish, distribute, sublicense, and/or
- *     sell copies of the Software, and to permit persons to whom the
- *     Software is furnished to do so, subject to the following
- *     conditions:
- *
- *     The above copyright notice and this permission notice shall be
- *     included in all copies or substantial portions of the Software.
- *
- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *     OTHER DEALINGS IN THE SOFTWARE.
   */
-
  /dts-v1/;
 
  #include "armada-372x.dtsi"
 
  / {
  	model = "Marvell Armada 3720 Community Board ESPRESSOBin";
-	compatible = "marvell,armada-3720-espressobin", "marvell,armada3720", "marvell,armada3710";
+	compatible = "marvell,armada-3720-espressobin",
+		     "marvell,armada3720", "marvell,armada3710";
 
  	chosen {
  		stdout-path = "serial0:115200n8";
@@ -121,6 +84,7 @@
  	status = "okay";
  };
 
+/* J1 */
  &sdhci0 {
  	pinctrl-names = "default";
  	pinctrl-0 = <&sdio_pins>;
@@ -130,6 +94,25 @@
  	status = "okay";
  };
 
+/* U11 */
+&sdhci1 {
+	non-removable;
+	bus-width = <8>;
+	mmc-ddr-1_8v;
+	mmc-hs400-1_8v;
+	marvell,pad-type = "fixed-1-8v";
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc_pins>;
+	status = "disabled";
+
+	#address-cells = <1>;

arch/arm/dts/armada-3720-espressobin.dts line 118

Quoted 10 lines
arch/arm/dts/armada-3720-espressobin.dts +7 -0
+	#size-cells = <0>;
+	mmccard: mmccard at 0 {
+		compatible = "mmc-card";
+		reg = <0>;
+	};
+};
+
  &spi0 {
  	status = "okay";
  	pinctrl-names = "default";

Viele Gr??e,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de