On Fri, Aug 16, 2019 at 01:57:50PM +0200, Corentin Labbe wrote: > On Fri, Aug 16, 2019 at 01:36:50PM +0200, Maxime Ripard wrote: > > On Fri, Aug 16, 2019 at 11:35:13AM +0200, Corentin Labbe wrote: > > > On Wed, Aug 14, 2019 at 03:33:22PM +0200, Maxime Ripard wrote: > > > > On Wed, Aug 14, 2019 at 03:17:41PM +0200, Corentin Labbe wrote: > > > > > On Mon, Aug 12, 2019 at 11:40:00AM +0200, Maxime Ripard wrote: > > > > > > On Thu, Aug 08, 2019 at 10:42:53AM +0200, Corentin Labbe wrote: > > > > > > > This patch adds the evaluation variant of the model A of the PineH64. > > > > > > > The model A has the same size of the pine64 and has a PCIE slot. > > > > > > > > > > > > > > The only devicetree difference with current pineH64, is the PHY > > > > > > > regulator. > > > > > > > > > > > > > > Signed-off-by: Corentin Labbe > > > > > > > --- > > > > > > > arch/arm64/boot/dts/allwinner/Makefile | 1 + > > > > > > > .../sun50i-h6-pine-h64-modelA-eval.dts | 26 +++++++++++++++++++ > > > > > > > 2 files changed, 27 insertions(+) > > > > > > > create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelA-eval.dts > > > > > > > > > > > > > > diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile > > > > > > > index f6db0611cb85..9a02166cbf72 100644 > > > > > > > --- a/arch/arm64/boot/dts/allwinner/Makefile > > > > > > > +++ b/arch/arm64/boot/dts/allwinner/Makefile > > > > > > > @@ -25,3 +25,4 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-3.dtb > > > > > > > dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-lite2.dtb > > > > > > > dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-one-plus.dtb > > > > > > > dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb > > > > > > > +dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64-modelA-eval.dtb > > > > > > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelA-eval.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelA-eval.dts > > > > > > > new file mode 100644 > > > > > > > index 000000000000..d8ff02747efe > > > > > > > --- /dev/null > > > > > > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelA-eval.dts > > > > > > > @@ -0,0 +1,26 @@ > > > > > > > +// SPDX-License-Identifier: (GPL-2.0+ or MIT) > > > > > > > +/* > > > > > > > + * Copyright (C) 2019 Corentin Labbe > > > > > > > + */ > > > > > > > + > > > > > > > +#include "sun50i-h6-pine-h64.dts" > > > > > > > + > > > > > > > +/ { > > > > > > > + model = "Pine H64 model A evaluation board"; > > > > > > > + compatible = "pine64,pine-h64-modelA-eval", "allwinner,sun50i-h6"; > > > > > > > + > > > > > > > + reg_gmac_3v3: gmac-3v3 { > > > > > > > + compatible = "regulator-fixed"; > > > > > > > + regulator-name = "vcc-gmac-3v3"; > > > > > > > + regulator-min-microvolt = <3300000>; > > > > > > > + regulator-max-microvolt = <3300000>; > > > > > > > + startup-delay-us = <100000>; > > > > > > > + gpio = <&pio 2 16 GPIO_ACTIVE_HIGH>; > > > > > > > + enable-active-high; > > > > > > > + }; > > > > > > > + > > > > > > > +}; > > > > > > > + > > > > > > > +&emac { > > > > > > > + phy-supply = <®_gmac_3v3>; > > > > > > > +}; > > > > > > > > > > > > I might be missing some context here, but I'm pretty sure that the > > > > > > initial intent of the pine h64 DTS was to support the model A all > > > > > > along. > > > > > > > > > > > > > > > > The regulator changed between modelA and B. > > > > > See this old patchset (supporting modelA) https://patchwork.kernel.org/patch/10539149/ for example. > > > > > > > > I'm not sure what your point is, but mine is that everything about the > > > > model A should be in sun50i-h6-pine-h64.dts. > > > > > > > > > > model A and B are different enough for distinct dtb, (see sub-thread > > > on HDMI difference for an other difference than PHY regulator) > > > > I don't mind having separate DTBs for model A and model B. > > > > > And clearly, the current dtb is for model B. > > > > That DTS was added almost a year before the model B was announced, and > > no commit to that file mention the model B, so it's definitely not > > clear. > > Normal it was added for model A (without any ethernet/HDMI support, > so nothing distinct from model B), and the modelB ethernet/HDMI > support cames after. Changing the board a DT is meant to halfway through the development is definitely not ok. > > > So do you mean that we need to create a new dtb for model B ? (and > > > hack the current back to model A ?) > > > > I'd prefer not to hack anything, but yes > > > > Since model A is not public (only evaluations boards exists), the > probability of a production model A is low and the current dtb is > perfect for model B , could you reconsider this ? I mean, you could buy it, so it's definitely public. Model A also had HDMI, and it doesn't look like there's anything particularly specific with that board. On the Ethernet side, the only thing that changes is the regulator / GPIO being used to enable the PHY? Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com