Commit b1242236 authored by Atish Patra's avatar Atish Patra Committed by David S. Miller
Browse files

net: macb: Add default usrio config to default gem config 



There is no usrio config defined for default gem config leading to
a kernel panic devices that don't define a data. This issue can be
reprdouced with microchip polar fire soc where compatible string
is defined as "cdns,macb".

Fixes: edac6386 ("add userio bits as platform configuration")

Signed-off-by: default avatarAtish Patra <atish.patra@wdc.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ef9a6df0

drivers/net/ethernet/cadence/macb_main.c

+8 −7
Original line number Diff line number Diff line
@@ -3954,6 +3954,13 @@ static int macb_init(struct platform_device *pdev) 
	return 0;

}



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),

};



#if defined(CONFIG_OF)

/* 1518 rounded up */

#define AT91ETHER_MAX_RBUFF_SZ	0x600
@@ -4439,13 +4446,6 @@ 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_usrio_config sama7g5_usrio = {

	.mii = 0,

	.rmii = 1,
@@ -4594,6 +4594,7 @@ static const struct macb_config default_gem_config = { 
	.dma_burst_length = 16,

	.clk_init = macb_clk_init,

	.init = macb_init,

	.usrio = &macb_default_usrio,

	.jumbo_max_len = 10240,

};