kernel: move NXP DPAA2 SFP patches to generic patches
These are used by both the armsr (EFI boot) and
layerscape targets for phylink-controlled SFP
support on NXP DPAA2 platforms (LS1088,LS2088,LX2160).
This is in place of commit a7bd96c98f
("layerscape: add patches for SFP support on DPAA2 platforms")
in the main branch. armsr in main started at kernel 6.1
so there is not an equivalent 5.15 commit to cherry pick.
Signed-off-by: Mathew McBride <matt@traverse.com.au>
			
			
This commit is contained in:
		
				
					committed by
					
						
						Hauke Mehrtens
					
				
			
			
				
	
			
			
			
						parent
						
							6a89cfa418
						
					
				
				
					commit
					21f0ab503c
				
			@@ -52,7 +52,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
 | 
			
		||||
 	dpaa2_eth_dl_traps_unregister(priv);
 | 
			
		||||
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
 | 
			
		||||
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
 | 
			
		||||
@@ -351,7 +351,9 @@ int dpaa2_mac_connect(struct dpaa2_mac *
 | 
			
		||||
@@ -357,7 +357,9 @@ int dpaa2_mac_connect(struct dpaa2_mac *
 | 
			
		||||
 	if (mac->pcs)
 | 
			
		||||
 		phylink_set_pcs(mac->phylink, &mac->pcs->pcs);
 | 
			
		||||
 
 | 
			
		||||
@@ -62,7 +62,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
 | 
			
		||||
 	if (err) {
 | 
			
		||||
 		netdev_err(net_dev, "phylink_fwnode_phy_connect() = %d\n", err);
 | 
			
		||||
 		goto err_phylink_destroy;
 | 
			
		||||
@@ -372,7 +374,9 @@ void dpaa2_mac_disconnect(struct dpaa2_m
 | 
			
		||||
@@ -378,7 +380,9 @@ void dpaa2_mac_disconnect(struct dpaa2_m
 | 
			
		||||
 	if (!mac->phylink)
 | 
			
		||||
 		return;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user