Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'net-mvneta-armada-98dx2530-soc'

Chris Packham says:

====================
net: mvneta: Armada 98DX2530 SoC

This is split off from [1] to let it go in via net-next rather than waiting for
the rest of the series to land.

[1] - https://lore.kernel.org/lkml/20220314213143.2404162-1-chris.packham@alliedtelesis.co.nz/
====================

Link: https://lore.kernel.org/r/20220315215207.2746793-1-chris.packham@alliedtelesis.co.nz
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

+13
+1
Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt
··· 5 5 "marvell,armada-370-neta" 6 6 "marvell,armada-xp-neta" 7 7 "marvell,armada-3700-neta" 8 + "marvell,armada-ac5-neta" 8 9 - reg: address and length of the register set for the device. 9 10 - interrupts: interrupt for the device 10 11 - phy: See ethernet.txt file in the same directory.
+12
drivers/net/ethernet/marvell/mvneta.c
··· 76 76 #define MVNETA_WIN_SIZE(w) (0x2204 + ((w) << 3)) 77 77 #define MVNETA_WIN_REMAP(w) (0x2280 + ((w) << 2)) 78 78 #define MVNETA_BASE_ADDR_ENABLE 0x2290 79 + #define MVNETA_AC5_CNM_DDR_TARGET 0x2 80 + #define MVNETA_AC5_CNM_DDR_ATTR 0xb 79 81 #define MVNETA_ACCESS_PROTECT_ENABLE 0x2294 80 82 #define MVNETA_PORT_CONFIG 0x2400 81 83 #define MVNETA_UNI_PROMISC_MODE BIT(0) ··· 546 544 547 545 /* Flags for special SoC configurations */ 548 546 bool neta_armada3700; 547 + bool neta_ac5; 549 548 u16 rx_offset_correction; 550 549 const struct mbus_dram_target_info *dram_target_info; 551 550 }; ··· 5327 5324 win_protect |= 3 << (2 * i); 5328 5325 } 5329 5326 } else { 5327 + if (pp->neta_ac5) 5328 + mvreg_write(pp, MVNETA_WIN_BASE(0), 5329 + (MVNETA_AC5_CNM_DDR_ATTR << 8) | 5330 + MVNETA_AC5_CNM_DDR_TARGET); 5330 5331 /* For Armada3700 open default 4GB Mbus window, leaving 5331 5332 * arbitration of target/attribute to a different layer 5332 5333 * of configuration. ··· 5416 5409 /* Get special SoC configurations */ 5417 5410 if (of_device_is_compatible(dn, "marvell,armada-3700-neta")) 5418 5411 pp->neta_armada3700 = true; 5412 + if (of_device_is_compatible(dn, "marvell,armada-ac5-neta")) { 5413 + pp->neta_armada3700 = true; 5414 + pp->neta_ac5 = true; 5415 + } 5419 5416 5420 5417 dev->irq = irq_of_parse_and_map(dn, 0); 5421 5418 if (dev->irq == 0) ··· 5780 5769 { .compatible = "marvell,armada-370-neta" }, 5781 5770 { .compatible = "marvell,armada-xp-neta" }, 5782 5771 { .compatible = "marvell,armada-3700-neta" }, 5772 + { .compatible = "marvell,armada-ac5-neta" }, 5783 5773 { } 5784 5774 }; 5785 5775 MODULE_DEVICE_TABLE(of, mvneta_match);