On Wednesday 14 October 2020 10:17:45 Stefan Roese wrote: > On 04.09.20 17:33, Andre Heider wrote: > > Import armada-3720-espressobin-emmc.dts from Linux, but use sdhc1 for > > emmc, since our dtsi is still based on downstream and sdhc0 is used for > > the sd card. > > > > Signed-off-by: Andre Heider <a.hei...@gmail.com> > > Applied to u-boot-marvell/master > > Thanks, > Stefan > > > --- > > arch/arm/dts/Makefile | 1 + > > arch/arm/dts/armada-3720-espressobin-emmc.dts | 44 +++++++++++++++++++ > > doc/README.marvell | 7 ++- > > 3 files changed, 50 insertions(+), 2 deletions(-) > > create mode 100644 arch/arm/dts/armada-3720-espressobin-emmc.dts > > > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > > index 5e34192be6..8f1958b5a7 100644 > > --- a/arch/arm/dts/Makefile > > +++ b/arch/arm/dts/Makefile > > @@ -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 \ > > diff --git a/arch/arm/dts/armada-3720-espressobin-emmc.dts > > b/arch/arm/dts/armada-3720-espressobin-emmc.dts > > new file mode 100644 > > index 0000000000..29ccb6a573 > > --- /dev/null > > +++ b/arch/arm/dts/armada-3720-espressobin-emmc.dts > > @@ -0,0 +1,44 @@ > > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > +/* > > + * Device Tree file for Globalscale Marvell ESPRESSOBin Board with eMMC > > + * Copyright (C) 2018 Marvell > > + * > > + * Romain Perier <romain.per...@free-electrons.com> > > + * Konstantin Porotchkin <kos...@marvell.com> > > + * > > + */ > > +/* > > + * Schematic available at > > http://espressobin.net/wp-content/uploads/2017/08/ESPRESSObin_V5_Schematics.pdf > > + */ > > + > > +/dts-v1/; > > + > > +#include "armada-3720-espressobin.dtsi" > > + > > +/ { > > + model = "Globalscale Marvell ESPRESSOBin Board (eMMC)"; > > + compatible = "globalscale,espressobin-emmc", "globalscale,espressobin", > > + "marvell,armada3720", "marvell,armada3710"; > > +}; > > + > > +/* U11 */ > > +&sdhci1 { > > + non-removable; > > + bus-width = <8>; > > + mmc-ddr-1_8v; > > + mmc-hs400-1_8v; > > + marvell,xenon-emmc; > > + marvell,xenon-tun-count = <9>; > > + marvell,pad-type = "fixed-1-8v"; > > + > > + pinctrl-names = "default"; > > + pinctrl-0 = <&mmc_pins>; > > + status = "okay"; > > + > > + #address-cells = <1>; > > + #size-cells = <0>; > > + mmccard: mmccard@0 { > > + compatible = "mmc-card"; > > + reg = <0>; > > + }; > > +}; > > diff --git a/doc/README.marvell b/doc/README.marvell > > index 5416bc3035..be07f31f8c 100644 > > --- a/doc/README.marvell > > +++ b/doc/README.marvell > > @@ -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:
Hello! Does not it really make sense to do autodetection of eMMC presence and enable it in U-Boot code only when needed and therefore avoid having two DTS files and needs for specifying DEVICE_TREE variable and therefore variant of Espressobin, as I stated in previous emails? I think this just complicates build process... E.g. we already have a code in U-Boot which detects V5 vs V7 variant. > > # make > > > > > Viele Grüße, > Stefan > > -- > 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: s...@denx.de
