From: David S. Miller <davem@davemloft.net>
Date: Sun, 1 Apr 2018 02:17:30 +0000 (-0400)
Subject: Merge branch 'meson8b'
X-Git-Tag: v5.15~9146^2~33
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e8b270fcf1116d47e4954704fa1b7c58f272622;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'meson8b'

Martin Blumenstingl says:

====================
Meson8m2 support for dwmac-meson8b

The Meson8m2 SoC is an updated version of the Meson8 SoC. Some of the
peripherals are shared with Meson8b (for example the watchdog registers
and the internal temperature sensor calibration procedure).
Meson8m2 also seems to include the same Gigabit MAC register layout as
Meson8b.

The registers in the Amlogic dwmac "glue" seem identical between Meson8b
and Meson8m2. Manual testing seems to confirm this.

To be extra-safe a new compatible string is added because there's no
(public) documentation on the Meson8m2 SoC. This will allow us to
implement any SoC-specific variations later on (if needed).
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

5e8b270fcf1116d47e4954704fa1b7c58f272622