diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-07-24 16:14:24 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-07-24 16:14:24 +0200 |
| commit | b0fef5edff0330eb6de267acd3b6cccb32a43633 (patch) | |
| tree | a36f056e73ed0e14a0ba81401bb75c4625c00274 /arch | |
| parent | Merge tag 'imx-fixes-5.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | ARM: dts: armada-38x: fix NETA lockup when repeatedly switching speeds (diff) | |
| download | linux-b0fef5edff0330eb6de267acd3b6cccb32a43633.tar.xz linux-b0fef5edff0330eb6de267acd3b6cccb32a43633.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/armada-38x.dtsi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index 348116501aa2..9b1a24cc5e91 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi @@ -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>; |