Commit a127fdac authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt-5.9-1' of...

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: default avatarArnd Bergmann <arnd@arndb.de>
parents cf8182fc 43bf2025
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -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>;
	};
};

+1 −1
Original line number Diff line number Diff line
@@ -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/;