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

Merge tag 'mvebu-fixes-5.8-1' of...

Merge tag 'mvebu-fixes-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/fixes

mvebu fixes for 5.8 (part 1)

- DT change for Armada 38x allowing to add the register needed to fix
  NETA lockup when repeatedly switching speed.

* tag 'mvebu-fixes-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  ARM: dts: armada-38x: fix NETA lockup when repeatedly switching speeds
parents 7c8c70ba 09781ba0
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -342,7 +342,8 @@

			comphy: phy@18300 {
				compatible = "marvell,armada-380-comphy";
				reg = <0x18300 0x100>;
				reg-names = "comphy", "conf";
				reg = <0x18300 0x100>, <0x18460 4>;
				#address-cells = <1>;
				#size-cells = <0>;