Commit edac6386 authored by Claudiu Beznea's avatar Claudiu Beznea Committed by David S. Miller
Browse files

net: macb: add userio bits as platform configuration 



This is necessary for SAMA7G5 as it uses different values for
PHY interface and also introduces hdfctlen bit.

Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 102e2c07

drivers/net/ethernet/cadence/macb.h

+10 −0
Original line number Diff line number Diff line
@@ -1147,6 +1147,14 @@ struct macb_pm_data { 
	u32 usrio;

};



struct macb_usrio_config {

	u32 mii;

	u32 rmii;

	u32 rgmii;

	u32 refclk;

	u32 hdfctlen;

};



struct macb_config {

	u32			caps;

	unsigned int		dma_burst_length;
@@ -1155,6 +1163,7 @@ struct macb_config { 
			    struct clk **rx_clk, struct clk **tsu_clk);

	int	(*init)(struct platform_device *pdev);

	int	jumbo_max_len;

	const struct macb_usrio_config *usrio;

};



struct tsu_incr {
@@ -1288,6 +1297,7 @@ struct macb { 
	u32	rx_intr_mask;



	struct macb_pm_data pm_data;

	const struct macb_usrio_config *usrio;

};



#ifdef CONFIG_MACB_USE_HWSTAMP

drivers/net/ethernet/cadence/macb_main.c

+24 −4
Original line number Diff line number Diff line
@@ -3913,15 +3913,15 @@ static int macb_init(struct platform_device *pdev) 
	if (!(bp->caps & MACB_CAPS_USRIO_DISABLED)) {

		val = 0;

		if (phy_interface_mode_is_rgmii(bp->phy_interface))

			val = GEM_BIT(RGMII);

			val = bp->usrio->rgmii;

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

			 (bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII))

			val = MACB_BIT(RMII);

			val = bp->usrio->rmii;

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

			val = MACB_BIT(MII);

			val = bp->usrio->mii;



		if (bp->caps & MACB_CAPS_USRIO_HAS_CLKEN)

			val |= MACB_BIT(CLKEN);

			val |= bp->usrio->refclk;



		macb_or_gem_writel(bp, USRIO, val);

	}
@@ -4439,6 +4439,13 @@ static int fu540_c000_init(struct platform_device *pdev) 
	return macb_init(pdev);

}



static const struct macb_usrio_config macb_default_usrio = {

	.mii = MACB_BIT(MII),

	.rmii = MACB_BIT(RMII),

	.rgmii = GEM_BIT(RGMII),

	.refclk = MACB_BIT(CLKEN),

};



static const struct macb_config fu540_c000_config = {

	.caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_JUMBO |

		MACB_CAPS_GEM_HAS_PTP,
@@ -4446,12 +4453,14 @@ static const struct macb_config fu540_c000_config = { 
	.clk_init = fu540_c000_clk_init,

	.init = fu540_c000_init,

	.jumbo_max_len = 10240,

	.usrio = &macb_default_usrio,

};



static const struct macb_config at91sam9260_config = {

	.caps = MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII,

	.clk_init = macb_clk_init,

	.init = macb_init,

	.usrio = &macb_default_usrio,

};



static const struct macb_config sama5d3macb_config = {
@@ -4459,6 +4468,7 @@ static const struct macb_config sama5d3macb_config = { 
	      | MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII,

	.clk_init = macb_clk_init,

	.init = macb_init,

	.usrio = &macb_default_usrio,

};



static const struct macb_config pc302gem_config = {
@@ -4466,6 +4476,7 @@ static const struct macb_config pc302gem_config = { 
	.dma_burst_length = 16,

	.clk_init = macb_clk_init,

	.init = macb_init,

	.usrio = &macb_default_usrio,

};



static const struct macb_config sama5d2_config = {
@@ -4473,6 +4484,7 @@ static const struct macb_config sama5d2_config = { 
	.dma_burst_length = 16,

	.clk_init = macb_clk_init,

	.init = macb_init,

	.usrio = &macb_default_usrio,

};



static const struct macb_config sama5d3_config = {
@@ -4482,6 +4494,7 @@ static const struct macb_config sama5d3_config = { 
	.clk_init = macb_clk_init,

	.init = macb_init,

	.jumbo_max_len = 10240,

	.usrio = &macb_default_usrio,

};



static const struct macb_config sama5d4_config = {
@@ -4489,18 +4502,21 @@ static const struct macb_config sama5d4_config = { 
	.dma_burst_length = 4,

	.clk_init = macb_clk_init,

	.init = macb_init,

	.usrio = &macb_default_usrio,

};



static const struct macb_config emac_config = {

	.caps = MACB_CAPS_NEEDS_RSTONUBR | MACB_CAPS_MACB_IS_EMAC,

	.clk_init = at91ether_clk_init,

	.init = at91ether_init,

	.usrio = &macb_default_usrio,

};



static const struct macb_config np4_config = {

	.caps = MACB_CAPS_USRIO_DISABLED,

	.clk_init = macb_clk_init,

	.init = macb_init,

	.usrio = &macb_default_usrio,

};



static const struct macb_config zynqmp_config = {
@@ -4511,6 +4527,7 @@ static const struct macb_config zynqmp_config = { 
	.clk_init = macb_clk_init,

	.init = macb_init,

	.jumbo_max_len = 10240,

	.usrio = &macb_default_usrio,

};



static const struct macb_config zynq_config = {
@@ -4519,6 +4536,7 @@ static const struct macb_config zynq_config = { 
	.dma_burst_length = 16,

	.clk_init = macb_clk_init,

	.init = macb_init,

	.usrio = &macb_default_usrio,

};



static const struct of_device_id macb_dt_ids[] = {
@@ -4640,6 +4658,8 @@ static int macb_probe(struct platform_device *pdev) 
		bp->wol |= MACB_WOL_HAS_MAGIC_PACKET;

	device_set_wakeup_capable(&pdev->dev, bp->wol & MACB_WOL_HAS_MAGIC_PACKET);



	bp->usrio = macb_config->usrio;



	spin_lock_init(&bp->lock);



	/* setup capabilities */