diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-07-24 17:02:32 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-07-24 17:05:45 +0300 |
| commit | a127fdac2397b75ad7a4a37089d381d5cbcce711 (patch) | |
| tree | 993068b06ca9cc89d5096d25dfc2fcb64768330e /arch/arm/boot | |
| parent | cf8182fc9d3d5baf5b8be9043c956aa894b2581d (diff) | |
| parent | 43bf2025452d26ba006a7f321daf014cea952c8b (diff) | |
| download | linux-a127fdac2397b75ad7a4a37089d381d5cbcce711.tar.xz | |
Merge tag 'mvebu-dt-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/dt
mvebu dt for 5.9 (part 1)
- Fix the reg-init PHY for the dlink-dns327l (Armada 370)
- Replace HTTP links with HTTPS one in device tree of the Excito
Bubba B3 (Kirkwood)
* tag 'mvebu-dt-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
ARM: dts: dlink-dns327l: fix reg-init PHY
ARM: dts: kirkwood: Replace HTTP links with HTTPS ones
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-b3.dts | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/armada-370-dlink-dns327l.dts b/arch/arm/boot/dts/armada-370-dlink-dns327l.dts index baa459dd51e4..2008c6eaaa52 100644 --- a/arch/arm/boot/dts/armada-370-dlink-dns327l.dts +++ b/arch/arm/boot/dts/armada-370-dlink-dns327l.dts @@ -247,9 +247,8 @@ &mdio { phy0: ethernet-phy@0 { /* Marvell 88E1318 */ reg = <0>; - marvell,reg-init = <0x0 0x16 0x0 0x0002>, - <0x0 0x19 0x0 0x0077>, - <0x0 0x18 0x0 0x5747>; + marvell,reg-init = <0x2 0x19 0x0 0x0077>, + <0x2 0x18 0x0 0x5747>; }; }; diff --git a/arch/arm/boot/dts/kirkwood-b3.dts b/arch/arm/boot/dts/kirkwood-b3.dts index 17f48f88a983..a7636fe28501 100644 --- a/arch/arm/boot/dts/kirkwood-b3.dts +++ b/arch/arm/boot/dts/kirkwood-b3.dts @@ -9,7 +9,7 @@ * L2 cache. If your B3 silently fails to boot, u-boot is probably too * old. Either upgrade, or consider the following email: * - * http://lists.debian.org/debian-arm/2012/08/msg00128.html + * https://lists.debian.org/debian-arm/2012/08/msg00128.html */ /dts-v1/; |