Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8487489 authored by Boris Brezillon's avatar Boris Brezillon Committed by David S. Miller
Browse files

net: macb: remove #if defined(CONFIG_ARCH_AT91) sections 



With multi platform support those sections could lead to unexpected
behavior if both ARCH_AT91 and another ARM SoC using the MACB IP are
selected.
Add two new capabilities to encode the default MII mode and the presence
of a CLKEN bit in USRIO register.
Then define the appropriate config for IPs embedded in at91 SoCs.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Reviewed-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9c348d45

drivers/net/ethernet/cadence/macb.c

+17 −15
Original line number Diff line number Diff line
@@ -2131,6 +2131,10 @@ static const struct net_device_ops macb_netdev_ops = { 
};



#if defined(CONFIG_OF)

static struct macb_config at91sam9260_config = {

	.caps = MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MII,

};



static struct macb_config pc302gem_config = {

	.caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE,

	.dma_burst_length = 16,
@@ -2148,7 +2152,7 @@ static struct macb_config sama5d4_config = { 


static const struct of_device_id macb_dt_ids[] = {

	{ .compatible = "cdns,at32ap7000-macb" },

	{ .compatible = "cdns,at91sam9260-macb" },

	{ .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config },

	{ .compatible = "cdns,macb" },

	{ .compatible = "cdns,pc302-gem", .data = &pc302gem_config },

	{ .compatible = "cdns,gem", .data = &pc302gem_config },
@@ -2408,21 +2412,19 @@ static int macb_probe(struct platform_device *pdev) 
		bp->phy_interface = err;

	}



	config = 0;

	if (bp->phy_interface == PHY_INTERFACE_MODE_RGMII)

		macb_or_gem_writel(bp, USRIO, GEM_BIT(RGMII));

	else if (bp->phy_interface == PHY_INTERFACE_MODE_RMII)

#if defined(CONFIG_ARCH_AT91)

		macb_or_gem_writel(bp, USRIO, (MACB_BIT(RMII) |

					       MACB_BIT(CLKEN)));

#else

		macb_or_gem_writel(bp, USRIO, 0);

#endif

	else

#if defined(CONFIG_ARCH_AT91)

		macb_or_gem_writel(bp, USRIO, MACB_BIT(CLKEN));

#else

		macb_or_gem_writel(bp, USRIO, MACB_BIT(MII));

#endif

		config = GEM_BIT(RGMII);

	else if (bp->phy_interface == PHY_INTERFACE_MODE_RMII &&

		 (bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII))

		config = MACB_BIT(RMII);

	else if (!(bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII))

		config = MACB_BIT(MII);



	if (bp->caps & MACB_CAPS_USRIO_HAS_CLKEN)

		config |= MACB_BIT(CLKEN);



	macb_or_gem_writel(bp, USRIO, config);



	err = register_netdev(dev);

	if (err) {

drivers/net/ethernet/cadence/macb.h

+2 −0
Original line number Diff line number Diff line
@@ -391,6 +391,8 @@ 


/* Capability mask bits */

#define MACB_CAPS_ISR_CLEAR_ON_WRITE		0x00000001

#define MACB_CAPS_USRIO_HAS_CLKEN		0x00000002

#define MACB_CAPS_USRIO_DEFAULT_IS_MII		0x00000004

#define MACB_CAPS_FIFO_MODE			0x10000000

#define MACB_CAPS_GIGABIT_MODE_AVAILABLE	0x20000000

#define MACB_CAPS_SG_DISABLED			0x40000000