[openwrt/openwrt] ath79: Refresh kernel patches

LEDE Commits lede-commits at lists.infradead.org
Sat Sep 21 02:26:06 PDT 2024


hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/df12b9864c364d43d23562296133bfacfff78ae5

commit df12b9864c364d43d23562296133bfacfff78ae5
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Sat Sep 21 11:24:40 2024 +0200

    ath79: Refresh kernel patches
    
    Make the patches apply cleanly again.
    
    Fixes: 3660ddb8ab6e ("generic: ar8216: remove support for Linux before version 6.1")
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 .../linux/ath79/patches-6.6/730-ar8216-make-reg-access-atomic.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/target/linux/ath79/patches-6.6/730-ar8216-make-reg-access-atomic.patch b/target/linux/ath79/patches-6.6/730-ar8216-make-reg-access-atomic.patch
index 02f763534e..16d9005699 100644
--- a/target/linux/ath79/patches-6.6/730-ar8216-make-reg-access-atomic.patch
+++ b/target/linux/ath79/patches-6.6/730-ar8216-make-reg-access-atomic.patch
@@ -14,7 +14,7 @@ with interrupts used.
 ---
 --- a/drivers/net/phy/ar8216.c
 +++ b/drivers/net/phy/ar8216.c
-@@ -252,6 +252,7 @@ ar8xxx_mii_write32(struct ar8xxx_priv *p
+@@ -251,6 +251,7 @@ ar8xxx_mii_write32(struct ar8xxx_priv *p
  u32
  ar8xxx_read(struct ar8xxx_priv *priv, int reg)
  {
@@ -22,7 +22,7 @@ with interrupts used.
  	struct mii_bus *bus = priv->mii_bus;
  	u16 r1, r2, page;
  	u32 val;
-@@ -259,11 +260,13 @@ ar8xxx_read(struct ar8xxx_priv *priv, in
+@@ -258,11 +259,13 @@ ar8xxx_read(struct ar8xxx_priv *priv, in
  	split_addr((u32) reg, &r1, &r2, &page);
  
  	mutex_lock(&bus->mdio_lock);
@@ -36,7 +36,7 @@ with interrupts used.
  	mutex_unlock(&bus->mdio_lock);
  
  	return val;
-@@ -272,17 +275,20 @@ ar8xxx_read(struct ar8xxx_priv *priv, in
+@@ -271,17 +274,20 @@ ar8xxx_read(struct ar8xxx_priv *priv, in
  void
  ar8xxx_write(struct ar8xxx_priv *priv, int reg, u32 val)
  {




More information about the lede-commits mailing list