| 
					
				 | 
			
			
				@@ -1,34 +0,0 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-From bd0f89de5476ca25e73fae829ba3e1dafae1d90d Mon Sep 17 00:00:00 2001 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-From: =?UTF-8?q?Ren=C3=A9=20van=20Dorst?= <[email protected]> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-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 <[email protected]> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				---- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 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 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-@@ -4662,6 +4662,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); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 	struct device_node *pcs_np; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 	phy_interface_t phy_mode; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-@@ -4875,6 +4876,9 @@ static int mtk_add_mac(struct mtk_eth *e 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 						NETDEV_XDP_ACT_NDO_XMIT | 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 						NETDEV_XDP_ACT_NDO_XMIT_SG; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-+	if (name) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-+		strlcpy(eth->netdev[id]->name, name, IFNAMSIZ); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 	return 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- free_netdev: 
			 |