mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
e35805c6ea
* kernel: bump 5.10 to 5.10.52 Add the new CONFIG_BATTERY_RT5033 to the generic configuration, as reported by Paul Blazejowski. Resort the kconfig while at it. No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> * kernel/generic: add a missing symbol to the 5.10 kconfig Add CONFIG_HAVE_ARM_ARCH_TIMER (disabled). A make kernel_oldconfig on cortexa9 will otherwise prompt for its selection. The 5.4 configuration already contains the same symbol. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> * kernel/generic: sort the 5.10 kconfig symbols Sort the kernel configuration using scripts/kconfig.pl. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> * kernel: bump 5.10 to 5.10.53 No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> * kernel: bump 5.10 to 5.10.54 Deleted (upstreamed) patches: mediatek/patches-5.10/000-spi-fix-fifo.patch Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> * kernel: bump 5.10 to 5.10.55 No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> * kernel: bump 5.10 to 5.10.56 No patches needed refreshing Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Co-authored-by: Rui Salvaterra <rsalvaterra@gmail.com>
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From bd0f89de5476ca25e73fae829ba3e1dafae1d90d Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ren=C3=A9=20van=20Dorst?= <opensource@vdorst.com>
|
|
Date: Fri, 21 Jun 2019 10:04:05 +0200
|
|
Subject: [PATCH] net: ethernet: mediatek: support net-labels
|
|
|
|
With this patch, device name can be set within dts file in the same way as dsa
|
|
port can.
|
|
Add: label = "wan"; to GMAC node.
|
|
|
|
Signed-off-by: René van Dorst <opensource@vdorst.com>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -2914,6 +2914,7 @@ static const struct net_device_ops mtk_n
|
|
|
|
static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
|
|
{
|
|
+ const char *name = of_get_property(np, "label", NULL);
|
|
const __be32 *_id = of_get_property(np, "reg", NULL);
|
|
phy_interface_t phy_mode;
|
|
struct phylink *phylink;
|
|
@@ -3008,6 +3009,9 @@ static int mtk_add_mac(struct mtk_eth *e
|
|
|
|
of_platform_device_create(np, NULL, NULL);
|
|
|
|
+ if (name)
|
|
+ strlcpy(eth->netdev[id]->name, name, IFNAMSIZ);
|
|
+
|
|
return 0;
|
|
|
|
free_netdev:
|