mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-10-31 05:54:26 -04:00 
			
		
		
		
	Two patches declared as accepted in v6.13 were already accepted for
v6.12. Fix filenames and order of patches applied.
Reported-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Fixes: 8cc049cec2 ("generic: phy: aquantia: move accepted patches to backport-6.6")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
		
	
			
		
			
				
	
	
		
			73 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			73 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| From patchwork Tue Sep 17 13:49:55 2024
 | |
| Content-Type: text/plain; charset="utf-8"
 | |
| MIME-Version: 1.0
 | |
| Content-Transfer-Encoding: 7bit
 | |
| X-Patchwork-Submitter: Daniel Golle <daniel@makrotopia.org>
 | |
| X-Patchwork-Id: 13806177
 | |
| X-Patchwork-Delegate: kuba@kernel.org
 | |
| Date: Tue, 17 Sep 2024 14:49:55 +0100
 | |
| From: Daniel Golle <daniel@makrotopia.org>
 | |
| To: Andrew Lunn <andrew@lunn.ch>, Heiner Kallweit <hkallweit1@gmail.com>,
 | |
| 	Russell King <linux@armlinux.org.uk>,
 | |
| 	"David S. Miller" <davem@davemloft.net>,
 | |
| 	Eric Dumazet <edumazet@google.com>,
 | |
| 	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
 | |
| 	Daniel Golle <daniel@makrotopia.org>,
 | |
| 	Christian Marangi <ansuelsmth@gmail.com>,
 | |
| 	Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
 | |
| 	Robert Marko <robimarko@gmail.com>,
 | |
| 	Russell King <rmk+kernel@armlinux.org.uk>, netdev@vger.kernel.org,
 | |
| 	linux-kernel@vger.kernel.org
 | |
| Subject: [PATCH net 2/2] net: phy: aquantia: fix applying active_low bit
 | |
|  after reset
 | |
| Message-ID: 
 | |
|  <9b1f0cd91f4cda54c8be56b4fe780480baf4aa0f.1726580902.git.daniel@makrotopia.org>
 | |
| References: 
 | |
|  <ab963584b0a7e3b4dac39472a4b82ca264d79630.1726580902.git.daniel@makrotopia.org>
 | |
| Precedence: bulk
 | |
| X-Mailing-List: netdev@vger.kernel.org
 | |
| List-Id: <netdev.vger.kernel.org>
 | |
| List-Subscribe: <mailto:netdev+subscribe@vger.kernel.org>
 | |
| List-Unsubscribe: <mailto:netdev+unsubscribe@vger.kernel.org>
 | |
| MIME-Version: 1.0
 | |
| Content-Disposition: inline
 | |
| In-Reply-To: 
 | |
|  <ab963584b0a7e3b4dac39472a4b82ca264d79630.1726580902.git.daniel@makrotopia.org>
 | |
| X-Patchwork-Delegate: kuba@kernel.org
 | |
| 
 | |
| for_each_set_bit was used wrongly in aqr107_config_init() when iterating
 | |
| over LEDs. Drop misleading 'index' variable and call
 | |
| aqr_phy_led_active_low_set() for each set bit representing an LED which
 | |
| is driven by VDD instead of GND pin.
 | |
| 
 | |
| Fixes: 61578f679378 ("net: phy: aquantia: add support for PHY LEDs")
 | |
| Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 | |
| Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
 | |
| ---
 | |
|  drivers/net/phy/aquantia/aquantia_main.c | 5 ++---
 | |
|  1 file changed, 2 insertions(+), 3 deletions(-)
 | |
| 
 | |
| --- a/drivers/net/phy/aquantia/aquantia_main.c
 | |
| +++ b/drivers/net/phy/aquantia/aquantia_main.c
 | |
| @@ -501,7 +501,7 @@ static int aqr107_config_init(struct phy
 | |
|  {
 | |
|  	struct aqr107_priv *priv = phydev->priv;
 | |
|  	u32 led_active_low;
 | |
| -	int ret, index = 0;
 | |
| +	int ret;
 | |
|  
 | |
|  	/* Check that the PHY interface type is compatible */
 | |
|  	if (phydev->interface != PHY_INTERFACE_MODE_SGMII &&
 | |
| @@ -537,10 +537,9 @@ static int aqr107_config_init(struct phy
 | |
|  
 | |
|  	/* Restore LED polarity state after reset */
 | |
|  	for_each_set_bit(led_active_low, &priv->leds_active_low, AQR_MAX_LEDS) {
 | |
| -		ret = aqr_phy_led_active_low_set(phydev, index, led_active_low);
 | |
| +		ret = aqr_phy_led_active_low_set(phydev, led_active_low, true);
 | |
|  		if (ret)
 | |
|  			return ret;
 | |
| -		index++;
 | |
|  	}
 | |
|  
 | |
|  	return 0;
 |