59 lines
1.7 KiB
Diff
59 lines
1.7 KiB
Diff
From 096f58e564aed56936ef6de42a44c3101e9b8ed1 Mon Sep 17 00:00:00 2001
|
|
From: Atish Patra <atish.patra@wdc.com>
|
|
Date: Wed, 3 Mar 2021 11:55:49 -0800
|
|
Subject: [PATCH 148/247] 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: edac63861db7 ("add userio bits as platform configuration")
|
|
|
|
Signed-off-by: Atish Patra <atish.patra@wdc.com>
|
|
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/cadence/macb_main.c | 15 ++++++++-------
|
|
1 file changed, 8 insertions(+), 7 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/cadence/macb_main.c
|
|
+++ b/drivers/net/ethernet/cadence/macb_main.c
|
|
@@ -3865,6 +3865,13 @@ static int macb_init(struct platform_dev
|
|
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
|
|
@@ -4380,13 +4387,6 @@ static int fu540_c000_init(struct platfo
|
|
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,
|
|
@@ -4535,6 +4535,7 @@ static const struct macb_config default_
|
|
.dma_burst_length = 16,
|
|
.clk_init = macb_clk_init,
|
|
.init = macb_init,
|
|
+ .usrio = &macb_default_usrio,
|
|
.jumbo_max_len = 10240,
|
|
};
|
|
|