a57ce78b37
* Bump to 4.18, removing the obvious, fixing build problems, put some on waiting. * Pin 4.18 to DEV, rollback 4.14 to NEXT, adjust configs, remove one deprecated patch from NEXT and add board-h3-address-some-stability-issues.patch * Adjust few boards in development to new reality, removing it from NEXT for now * Adjust few board configs * Board config adjustement * Adjust few boards configs * Port NeoCore2 and Neo21.1 to 4.14.y * Adjust board config * Adjust board config
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From c2245f2ff7a5b41b9d5916097fbace8067e9ee65 Mon Sep 17 00:00:00 2001
|
|
From: Icenowy Zheng <icenowy@aosc.io>
|
|
Date: Sun, 3 Sep 2017 17:29:56 +0800
|
|
Subject: [PATCH] Revert "net: stmmac: sun8i: Remove the compatibles"
|
|
|
|
This reverts commit ad4540cc5aa3dccb8e1e12458d57f8c40fae5a1c.
|
|
|
|
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
|
|
---
|
|
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
|
|
index 39c2122a4f269..fffd6d5fc907b 100644
|
|
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
|
|
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
|
|
@@ -979,6 +979,14 @@ static int sun8i_dwmac_probe(struct platform_device *pdev)
|
|
}
|
|
|
|
static const struct of_device_id sun8i_dwmac_match[] = {
|
|
+ { .compatible = "allwinner,sun8i-h3-emac",
|
|
+ .data = &emac_variant_h3 },
|
|
+ { .compatible = "allwinner,sun8i-v3s-emac",
|
|
+ .data = &emac_variant_v3s },
|
|
+ { .compatible = "allwinner,sun8i-a83t-emac",
|
|
+ .data = &emac_variant_a83t },
|
|
+ { .compatible = "allwinner,sun50i-a64-emac",
|
|
+ .data = &emac_variant_a64 },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, sun8i_dwmac_match);
|