On Mon, Oct 09, 2017 at 09:22:03AM +0200, Maxime Ripard wrote: > On Fri, Oct 06, 2017 at 09:11:22AM +0000, Antony Antony wrote: > > Hi > > > > Thanks Chen-Yu and Maxime. > > > > On Tue, Oct 03, 2017 at 10:11:00AM +0800, Chen-Yu Tsai wrote: > > > On Mon, Oct 2, 2017 at 1:34 AM, Antony Antony <ant...@phenome.org> wrote: > > > > Hi Maxime, > > > > > > > > sorry for the delayed response. > > > > > > > > On Mon, Sep 25, 2017 at 01:12:23PM +0200, Maxime Ripard wrote: > > > >> On Sat, Sep 23, 2017 at 05:59:15PM +0000, Antony Antony wrote: > > > >> > Add initial DT for NanoPi NEO Plus2 by FriendlyARM > > > >> > - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU > > > >> > - 1 GB DDR3 RAM > > > >> > - 8GB eMMC flash (Samsung KLM8G1WEPD-B031) > > > >> > - micro SD card slot > > > >> > - Gigabit Ethernet (external RTL8211E-VB-CG chip) > > > >> > - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module) > > > >> > - 2x USB 2.0 host ports > > > >> > > > > >> > Signed-off-by: Antony Antony <ant...@phenome.org> > > > >> > --- > > > >> > Changes v1->v2 > > > >> > removed memory {}, compatible ="allwinner,sun5i-a13-mmc" > > > >> > remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y > > > >> > (no SPI) > > > >> > remove CONFIG_SD_BOOT=y > > > >> > Changes v2->v3 > > > >> > removed compatible ="allwinner,sun50i-a64-mmc" > > > >> > --- > > > >> > arch/arm/dts/Makefile | 1 + > > > >> > arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 107 > > > >> > ++++++++++++++++++++++++++++ > > > >> > configs/nanopi_neo_plus2_defconfig | 18 +++++ > > > >> > 3 files changed, 126 insertions(+) > > > >> > create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts > > > >> > create mode 100644 configs/nanopi_neo_plus2_defconfig > > > >> > > > > >> > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > > > >> > index fee4680..295a675 100644 > > > >> > --- a/arch/arm/dts/Makefile > > > >> > +++ b/arch/arm/dts/Makefile > > > >> > @@ -333,6 +333,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \ > > > >> > sun8i-v3s-licheepi-zero.dtb > > > >> > dtb-$(CONFIG_MACH_SUN50I_H5) += \ > > > >> > sun50i-h5-nanopi-neo2.dtb \ > > > >> > + sun50i-h5-nanopi-neo-plus2.dtb \ > > > >> > sun50i-h5-orangepi-pc2.dtb \ > > > >> > sun50i-h5-orangepi-prime.dtb \ > > > >> > sun50i-h5-orangepi-zero-plus2.dtb > > > >> > diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts > > > >> > b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts > > > >> > new file mode 100644 > > > >> > index 0000000..8ac098e > > > >> > --- /dev/null > > > >> > +++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts > > > >> > @@ -0,0 +1,107 @@ > > > >> > +/* > > > >> > + * Copyright (C) 2017 Antony Antony <ant...@phenome.org> > > > >> > + * Copyright (c) 2016 ARM Ltd. > > > >> > + * > > > >> > + * 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 library 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 library 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 "AS IS", 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 "sun50i-h5.dtsi" > > > >> > + > > > >> > +#include <dt-bindings/gpio/gpio.h> > > > >> > + > > > >> > +/ { > > > >> > + model = "FriendlyARM NanoPi NEO Plus 2"; > > > >> > + compatible = "friendlyarm,nanopi-neo-plus2", > > > >> > "allwinner,sun50i-h5"; > > > >> > + > > > >> > + aliases { > > > >> > + serial0 = &uart0; > > > >> > + }; > > > >> > + > > > >> > + chosen { > > > >> > + stdout-path = "serial0:115200n8"; > > > >> > + }; > > > >> > + > > > >> > + reg_vcc3v3: vcc3v3 { > > > >> > + compatible = "regulator-fixed"; > > > >> > + regulator-name = "vcc3v3"; > > > >> > + regulator-min-microvolt = <3300000>; > > > >> > + regulator-max-microvolt = <3300000>; > > > >> > + }; > > > >> > +}; > > > >> > + > > > >> > +&ehci1 { > > > >> > + status = "okay"; > > > >> > +}; > > > >> > + > > > >> > +&mmc0 { > > > >> > + compatible = "allwinner,sun50i-h5-mmc"; > > > >> > > > >> No, you need to keep the a64 one. But I'm still not sure why do you > > > >> need to set it here. > > > >> > > > > > > > > Antother option is remove the "allwinner,sun50i-h5-mmc"; line. That > > > > works > > > > too. > > > > > > Maxime's point is that you should do compatible string overrides for > > > in the .dtsi file for any hardware block within the SoC itself. > > > > > > > > > > > I realzied mmc0 comes from "sun8i-h3.dtsi" which is included in > > > > sun50i-h5.dtsi > > > > > > > > sun8i-h3.dtsi has: > > > > mmc0: mmc@01c0f000 { > > > > compatible = "allwinner,sun7i-a20-mmc", > > > > "allwinner,sun5i-a13-mmc"; > > > > > > > > If I follow the a64, sun50i-a64.dtsi has mmc0 and it has a different > > > > entry. > > > > mmc0: mmc@1c0f000 { > > > > compatible = "allwinner,sun50i-a64-mmc"; > > > > > > > > I am a bit confused. What is your opinion? > > > > > > These denote the variant of the mmc controller in the SoC. The H5 has > > > one that is compatible with the A64's, so you should have a soc specific > > > compatible string, followed by a fallback one that it is compatible with. > > > So it should be: > > > > > > compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc"; > > > > > > in the H5 .dtsi file. > > > > I notice there two solutions. > > > > First, a board specific dts with the following compatible line. > > &mmc0 { > > compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc"; > > > > This is my v2 https://patchwork.ozlabs.org/patch/817502/ > > > > Second solution, send a v4 without the compatible line and a new patch to > > fix sun50i-h5.dtsi. The New patch will add a compatible. > > > > &mmc0 { > > compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc"; > > } > > Still not sure what the issue you're trying to solve, but in general > the second one is preferred.
thanks. Would you be happy to apply the v2? If yes, there is nothing more to solve. https://patchwork.ozlabs.org/patch/817502 I started exploring more options after you comment to v2. -antony _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot