Jonathan Gray schreef op 2017-09-28 09:51:
On Thu, Sep 28, 2017 at 09:34:49AM +0200, Mark Kettenis wrote:
Jonathan Gray schreef op 2017-09-28 05:02:
> On Wed, Sep 27, 2017 at 10:56:44PM +0200, Patrick Wildt wrote:
> > So, first of all copying the dtb entries is not a good idea.  The
> > reason
> > is that the phandles are gonna be all wrong and overriden, because
> > those
> > are _generated_ on compile time.  As you can see, the ethernet
> > controller references phy handle 0x7, but the phy has a phandle of
> > 0x47.
> > Something is wrong there.
> >
> > You should try to apply this "revert" that was committed in linux.
> > Hope
> > they'll soon make up their minds and commit a newer version.
>
> The device tree that is included with
> /usr/local/share/u-boot/orangepi_one/u-boot-sunxi-with-spl.bin
> should still have emac nodes.

But they use a different binding from the Linux kernel, which are the ones
Patrick
used for the implementation. And some of the regulator stuff is missing so things don't actually work even if we would change the driver to use the
bindings currently used by U-Boot.  It's a mess.

So using the dtb from Linux with the revert applied is the way to go for
now.


So we patch the dtb port to revert the revert commits for now?
Doesn't appear to have been added back in 3.14 rcs yet.

We could do that.

This is required for Ethernet with the recently added driver to work on
H3/H5/A64?  The pine64 dtbs in the arm64 miniroot are part of the fit
image should additional dtbs be installed into the fat fs for now?

Yes. If we want working Ethernet, the dtbs should be installed on the msdos filesystem. They need to be placed in a "allwinner" directory, otherwise
U-Boot won't pick them up.

Unfortunately doing this will block future updates of the device tree from U-Boot.

commit fe45174b72aead678da581bab9e9a37c9b26a070
Author: Maxime Ripard <maxime.rip...@free-electrons.com>
Date:   Fri Aug 25 20:36:48 2017 +0200

    arm: dts: sunxi: Revert EMAC changes

Since the discussion is not settled yet for the EMAC, and that the release in getting really close, let's revert the changes for now, and we'll
    reintroduce them later.

    Acked-by: Chen-Yu Tsai <w...@csie.org>
    Signed-off-by: Maxime Ripard <maxime.rip...@free-electrons.com>

 arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts |  9 ---------
arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 19 -------------------
 arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts         |  7 -------
 arch/arm/boot/dts/sun8i-h3-orangepi-2.dts         |  8 --------
 arch/arm/boot/dts/sun8i-h3-orangepi-one.dts       |  8 --------
 arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts   |  5 -----
 arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts        |  8 --------
arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 22 ---------------------- arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts | 16 ----------------
 arch/arm/boot/dts/sunxi-h3-h5.dtsi                | 26
--------------------------
 10 files changed, 128 deletions(-)

commit 87e1f5e8bb4bd584de0a8f3b1e42196dca221d02
Author: Maxime Ripard <maxime.rip...@free-electrons.com>
Date:   Fri Aug 25 20:36:48 2017 +0200

    arm64: dts: allwinner: Revert EMAC changes

Since the discussion is not settled yet for the EMAC, and that the release in getting really close, let's revert the changes for now, and we'll
    reintroduce them later.

    Acked-by: Chen-Yu Tsai <w...@csie.org>
    Signed-off-by: Maxime Ripard <maxime.rip...@free-electrons.com>

 arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts     | 16
----------------
 arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts      | 15
---------------
 arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts           | 17
-----------------
 arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts | 16
----------------
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi                 | 20
--------------------
 arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts       | 17
-----------------
 arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts      | 17
-----------------
 arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts    | 17
-----------------
 8 files changed, 135 deletions(-)

Reply via email to