1 From 89f37ac2780d113d3c17d329726c0e92a1400744 Mon Sep 17 00:00:00 2001
2 From: Claudiu Beznea <claudiu.beznea@microchip.com>
3 Date: Wed, 9 Dec 2020 15:03:32 +0200
4 Subject: [PATCH 115/247] net: macb: add userio bits as platform configuration
6 This is necessary for SAMA7G5 as it uses different values for
7 PHY interface and also introduces hdfctlen bit.
9 Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
10 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
11 Signed-off-by: David S. Miller <davem@davemloft.net>
13 drivers/net/ethernet/cadence/macb.h | 10 +++++++++
14 drivers/net/ethernet/cadence/macb_main.c | 28 ++++++++++++++++++++----
15 2 files changed, 34 insertions(+), 4 deletions(-)
17 diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
18 index 5de47f6fde5a..e9385a1390a9 100644
19 --- a/drivers/net/ethernet/cadence/macb.h
20 +++ b/drivers/net/ethernet/cadence/macb.h
21 @@ -1104,6 +1104,14 @@ struct macb_pm_data {
25 +struct macb_usrio_config {
35 unsigned int dma_burst_length;
36 @@ -1112,6 +1120,7 @@ struct macb_config {
37 struct clk **rx_clk, struct clk **tsu_clk);
38 int (*init)(struct platform_device *pdev);
40 + const struct macb_usrio_config *usrio;
44 @@ -1244,6 +1253,7 @@ struct macb {
47 struct macb_pm_data pm_data;
48 + const struct macb_usrio_config *usrio;
51 #ifdef CONFIG_MACB_USE_HWSTAMP
52 diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
53 index 1e8bf6b9834b..a8326b75eca8 100644
54 --- a/drivers/net/ethernet/cadence/macb_main.c
55 +++ b/drivers/net/ethernet/cadence/macb_main.c
56 @@ -3800,15 +3800,15 @@ static int macb_init(struct platform_device *pdev)
57 if (!(bp->caps & MACB_CAPS_USRIO_DISABLED)) {
59 if (phy_interface_mode_is_rgmii(bp->phy_interface))
60 - val = GEM_BIT(RGMII);
61 + val = bp->usrio->rgmii;
62 else if (bp->phy_interface == PHY_INTERFACE_MODE_RMII &&
63 (bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII))
64 - val = MACB_BIT(RMII);
65 + val = bp->usrio->rmii;
66 else if (!(bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII))
67 - val = MACB_BIT(MII);
68 + val = bp->usrio->mii;
70 if (bp->caps & MACB_CAPS_USRIO_HAS_CLKEN)
71 - val |= MACB_BIT(CLKEN);
72 + val |= bp->usrio->refclk;
74 macb_or_gem_writel(bp, USRIO, val);
76 @@ -4326,6 +4326,13 @@ static int fu540_c000_init(struct platform_device *pdev)
77 return macb_init(pdev);
80 +static const struct macb_usrio_config macb_default_usrio = {
81 + .mii = MACB_BIT(MII),
82 + .rmii = MACB_BIT(RMII),
83 + .rgmii = GEM_BIT(RGMII),
84 + .refclk = MACB_BIT(CLKEN),
87 static const struct macb_config fu540_c000_config = {
88 .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_JUMBO |
89 MACB_CAPS_GEM_HAS_PTP,
90 @@ -4333,12 +4340,14 @@ static const struct macb_config fu540_c000_config = {
91 .clk_init = fu540_c000_clk_init,
92 .init = fu540_c000_init,
93 .jumbo_max_len = 10240,
94 + .usrio = &macb_default_usrio,
97 static const struct macb_config at91sam9260_config = {
98 .caps = MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII,
99 .clk_init = macb_clk_init,
101 + .usrio = &macb_default_usrio,
104 static const struct macb_config sama5d3macb_config = {
105 @@ -4346,6 +4355,7 @@ static const struct macb_config sama5d3macb_config = {
106 | MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII,
107 .clk_init = macb_clk_init,
109 + .usrio = &macb_default_usrio,
112 static const struct macb_config pc302gem_config = {
113 @@ -4353,6 +4363,7 @@ static const struct macb_config pc302gem_config = {
114 .dma_burst_length = 16,
115 .clk_init = macb_clk_init,
117 + .usrio = &macb_default_usrio,
120 static const struct macb_config sama5d2_config = {
121 @@ -4360,6 +4371,7 @@ static const struct macb_config sama5d2_config = {
122 .dma_burst_length = 16,
123 .clk_init = macb_clk_init,
125 + .usrio = &macb_default_usrio,
128 static const struct macb_config sama5d3_config = {
129 @@ -4369,6 +4381,7 @@ static const struct macb_config sama5d3_config = {
130 .clk_init = macb_clk_init,
132 .jumbo_max_len = 10240,
133 + .usrio = &macb_default_usrio,
136 static const struct macb_config sama5d4_config = {
137 @@ -4376,18 +4389,21 @@ static const struct macb_config sama5d4_config = {
138 .dma_burst_length = 4,
139 .clk_init = macb_clk_init,
141 + .usrio = &macb_default_usrio,
144 static const struct macb_config emac_config = {
145 .caps = MACB_CAPS_NEEDS_RSTONUBR | MACB_CAPS_MACB_IS_EMAC,
146 .clk_init = at91ether_clk_init,
147 .init = at91ether_init,
148 + .usrio = &macb_default_usrio,
151 static const struct macb_config np4_config = {
152 .caps = MACB_CAPS_USRIO_DISABLED,
153 .clk_init = macb_clk_init,
155 + .usrio = &macb_default_usrio,
158 static const struct macb_config zynqmp_config = {
159 @@ -4398,6 +4414,7 @@ static const struct macb_config zynqmp_config = {
160 .clk_init = macb_clk_init,
162 .jumbo_max_len = 10240,
163 + .usrio = &macb_default_usrio,
166 static const struct macb_config zynq_config = {
167 @@ -4406,6 +4423,7 @@ static const struct macb_config zynq_config = {
168 .dma_burst_length = 16,
169 .clk_init = macb_clk_init,
171 + .usrio = &macb_default_usrio,
174 static const struct of_device_id macb_dt_ids[] = {
175 @@ -4527,6 +4545,8 @@ static int macb_probe(struct platform_device *pdev)
176 bp->wol |= MACB_WOL_HAS_MAGIC_PACKET;
177 device_set_wakeup_capable(&pdev->dev, bp->wol & MACB_WOL_HAS_MAGIC_PACKET);
179 + bp->usrio = macb_config->usrio;
181 spin_lock_init(&bp->lock);
183 /* setup capabilities */