kernel: bump 5.10 to 5.10.103

[openwrt/staging/dangole.git] / target / linux / at91 / patches-5.10 / 116-net-macb-add-capability-to-not-set-the-clock-rate.patch

diff --git a/target/linux/at91/patches-5.10/116-net-macb-add-capability-to-not-set-the-clock-rate.patch b/target/linux/at91/patches-5.10/116-net-macb-add-capability-to-not-set-the-clock-rate.patch
index 9b904785fc6c240d68706b56105eddb5963249b4..87dde7ef60c4b05937c49e4586461a8a7039055c 100644 (file)
--- a/target/linux/at91/patches-5.10/116-net-macb-add-capability-to-not-set-the-clock-rate.patch
+++ b/target/linux/at91/patches-5.10/116-net-macb-add-capability-to-not-set-the-clock-rate.patch
@@ -18,8 +18,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  drivers/net/ethernet/cadence/macb_main.c | 18 +++++++++---------
  2 files changed, 10 insertions(+), 9 deletions(-)
 
-diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
-index e9385a1390a9..23d294748779 100644
 --- a/drivers/net/ethernet/cadence/macb.h
 +++ b/drivers/net/ethernet/cadence/macb.h
 @@ -658,6 +658,7 @@
@@ -30,11 +28,9 @@ index e9385a1390a9..23d294748779 100644
  #define MACB_CAPS_MACB_IS_EMAC                        0x08000000
  #define MACB_CAPS_FIFO_MODE                   0x10000000
  #define MACB_CAPS_GIGABIT_MODE_AVAILABLE      0x20000000
-diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
-index a8326b75eca8..5d0d11eb6711 100644
 --- a/drivers/net/ethernet/cadence/macb_main.c
 +++ b/drivers/net/ethernet/cadence/macb_main.c
-@@ -457,15 +457,14 @@ static void macb_init_buffers(struct macb *bp)
+@@ -457,15 +457,14 @@ static void macb_init_buffers(struct mac
  
  /**
   * macb_set_tx_clk() - Set a clock to a new frequency
@@ -53,7 +49,7 @@ index a8326b75eca8..5d0d11eb6711 100644
                return;
  
        switch (speed) {
-@@ -482,7 +481,7 @@ static void macb_set_tx_clk(struct clk *clk, int speed, struct net_device *dev)
+@@ -482,7 +481,7 @@ static void macb_set_tx_clk(struct clk *
                return;
        }
  
@@ -62,7 +58,7 @@ index a8326b75eca8..5d0d11eb6711 100644
        if (rate_rounded < 0)
                return;
  
-@@ -492,11 +491,12 @@ static void macb_set_tx_clk(struct clk *clk, int speed, struct net_device *dev)
+@@ -492,11 +491,12 @@ static void macb_set_tx_clk(struct clk *
        ferr = abs(rate_rounded - rate);
        ferr = DIV_ROUND_UP(ferr, rate / 100000);
        if (ferr > 5)
@@ -78,7 +74,7 @@ index a8326b75eca8..5d0d11eb6711 100644
  }
  
  static void macb_validate(struct phylink_config *config,
-@@ -649,7 +649,7 @@ static void macb_mac_link_up(struct phylink_config *config,
+@@ -649,7 +649,7 @@ static void macb_mac_link_up(struct phyl
                if (rx_pause)
                        ctrl |= MACB_BIT(PAE);
  
@@ -87,6 +83,3 @@ index a8326b75eca8..5d0d11eb6711 100644
  
                /* Initialize rings & buffers as clearing MACB_BIT(TE) in link down
                 * cleared the pipeline and control registers.
--- 
-2.32.0
-