diff options
| author | Laura Abbott <labbott@redhat.com> | 2017-11-16 09:50:37 -0800 |
|---|---|---|
| committer | Laura Abbott <labbott@redhat.com> | 2017-11-16 09:50:37 -0800 |
| commit | 6a1970be527315be0a098097f5685ec6a03b6138 (patch) | |
| tree | 6d54d745f5c4f0ea41c3e5daaceea19efc1abd44 /allwinner-net-emac.patch | |
| parent | 1e02c6bb341c122205456e7814c0536d6af9f8ad (diff) | |
| download | kernel-6a1970be527315be0a098097f5685ec6a03b6138.tar.gz kernel-6a1970be527315be0a098097f5685ec6a03b6138.tar.xz kernel-6a1970be527315be0a098097f5685ec6a03b6138.zip | |
Linux v4.14-9248-ge60e1ee60630
Diffstat (limited to 'allwinner-net-emac.patch')
| -rw-r--r-- | allwinner-net-emac.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/allwinner-net-emac.patch b/allwinner-net-emac.patch index 346c50809..3494b8f57 100644 --- a/allwinner-net-emac.patch +++ b/allwinner-net-emac.patch @@ -1,35 +1,3 @@ -From 83e18f0ad4793ea83e03cb8e608bdd2939e76d78 Mon Sep 17 00:00:00 2001 -From: Peter Robinson <pbrobinson@gmail.com> -Date: Mon, 4 Sep 2017 13:04:34 +0100 -Subject: [PATCH 1/4] Revert "net: stmmac: sun8i: Remove the compatibles" - -This reverts commit ad4540cc5aa3dccb8e1e12458d57f8c40fae5a1c. ---- - 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 39c2122a4f26..fffd6d5fc907 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); --- -2.13.5 - From fa4788d88903c1e535d034c3dd3fcd386685a02c Mon Sep 17 00:00:00 2001 From: Peter Robinson <pbrobinson@gmail.com> Date: Mon, 4 Sep 2017 13:04:41 +0100 |