Commit 82192c49 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

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: default avatarPaolo Abeni <pabeni@redhat.com>
parents 05fc65f3 2d2a514c

Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
	"marvell,armada-370-neta"

	"marvell,armada-xp-neta"

	"marvell,armada-3700-neta"

	"marvell,armada-ac5-neta"

- reg: address and length of the register set for the device.

- interrupts: interrupt for the device

- phy: See ethernet.txt file in the same directory.

drivers/net/ethernet/marvell/mvneta.c

+12 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ 
#define MVNETA_WIN_SIZE(w)                      (0x2204 + ((w) << 3))

#define MVNETA_WIN_REMAP(w)                     (0x2280 + ((w) << 2))

#define MVNETA_BASE_ADDR_ENABLE                 0x2290

#define      MVNETA_AC5_CNM_DDR_TARGET		0x2

#define      MVNETA_AC5_CNM_DDR_ATTR		0xb

#define MVNETA_ACCESS_PROTECT_ENABLE            0x2294

#define MVNETA_PORT_CONFIG                      0x2400

#define      MVNETA_UNI_PROMISC_MODE            BIT(0)
@@ -544,6 +546,7 @@ struct mvneta_port { 


	/* Flags for special SoC configurations */

	bool neta_armada3700;

	bool neta_ac5;

	u16 rx_offset_correction;

	const struct mbus_dram_target_info *dram_target_info;

};
@@ -5324,6 +5327,10 @@ static void mvneta_conf_mbus_windows(struct mvneta_port *pp, 
			win_protect |= 3 << (2 * i);

		}

	} else {

		if (pp->neta_ac5)

			mvreg_write(pp, MVNETA_WIN_BASE(0),

				    (MVNETA_AC5_CNM_DDR_ATTR << 8) |

				    MVNETA_AC5_CNM_DDR_TARGET);

		/* For Armada3700 open default 4GB Mbus window, leaving

		 * arbitration of target/attribute to a different layer

		 * of configuration.
@@ -5409,6 +5416,10 @@ static int mvneta_probe(struct platform_device *pdev) 
	/* Get special SoC configurations */

	if (of_device_is_compatible(dn, "marvell,armada-3700-neta"))

		pp->neta_armada3700 = true;

	if (of_device_is_compatible(dn, "marvell,armada-ac5-neta")) {

		pp->neta_armada3700 = true;

		pp->neta_ac5 = true;

	}



	dev->irq = irq_of_parse_and_map(dn, 0);

	if (dev->irq == 0)
@@ -5769,6 +5780,7 @@ static const struct of_device_id mvneta_match[] = { 
	{ .compatible = "marvell,armada-370-neta" },

	{ .compatible = "marvell,armada-xp-neta" },

	{ .compatible = "marvell,armada-3700-neta" },

	{ .compatible = "marvell,armada-ac5-neta" },

	{ }

};

MODULE_DEVICE_TABLE(of, mvneta_match);