diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-10-26 10:11:55 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-10-26 10:11:55 +0100 |
| commit | 3a69e4e606a65a247d2f76fce6652bb150c6ecc5 (patch) | |
| tree | 3d97f511fdc9c80f3ddda92000d8005cbd61f0db /arch/arm/mach-mvebu | |
| parent | 666674cc1872abd917dc7a07a70ade3f3a1e91bf (diff) | |
| parent | 0b58725fb9a446890c1fd28fc6c9e393ce21acb7 (diff) | |
| download | lwn-3a69e4e606a65a247d2f76fce6652bb150c6ecc5.tar.gz lwn-3a69e4e606a65a247d2f76fce6652bb150c6ecc5.zip | |
Merge tag 'mvebu-fixes-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/fixes
mvebu fixes for 5.9 (part 1)
- Allow to use correct MAC address for particular DSA slaves /
ethernet ports on Espressobin (Armada 3720)
- Remove incorrect check in ll_get_coherency_base() used for Armada
370/XP SoCs.
* tag 'mvebu-fixes-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
ARM: mvebu: drop pointless check for coherency_base
arm64: dts: marvell: espressobin: Add ethernet switch aliases
Link: https://lore.kernel.org/r/87y2kkesj5.fsf@BL-laptop
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mvebu')
| -rw-r--r-- | arch/arm/mach-mvebu/coherency_ll.S | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-mvebu/coherency_ll.S b/arch/arm/mach-mvebu/coherency_ll.S index 2d962fe48821..a3a64bf97250 100644 --- a/arch/arm/mach-mvebu/coherency_ll.S +++ b/arch/arm/mach-mvebu/coherency_ll.S @@ -35,13 +35,8 @@ ENTRY(ll_get_coherency_base) /* * MMU is disabled, use the physical address of the coherency - * base address. However, if the coherency fabric isn't mapped - * (i.e its virtual address is zero), it means coherency is - * not enabled, so we return 0. + * base address, (or 0x0 if the coherency fabric is not mapped) */ - ldr r1, =coherency_base - cmp r1, #0 - beq 2f adr r1, 3f ldr r3, [r1] ldr r1, [r1, r3] |