diff options
author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-03-02 13:11:44 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-03-05 21:05:45 +0100 |
commit | 05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5 (patch) | |
tree | 68e66de94e62af2e06719bd8e6b56f88ce80993a /target/linux/at91/patches-5.10/116-net-macb-add-capability-to-not-set-the-clock-rate.patch | |
parent | ef4bf8b403205062ddb38ebe7b8c4951be346368 (diff) | |
download | upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.tar.gz upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.tar.bz2 upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.zip |
kernel: bump 5.10 to 5.10.103
Patches automatically rebased.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/at91/patches-5.10/116-net-macb-add-capability-to-not-set-the-clock-rate.patch')
-rw-r--r-- | target/linux/at91/patches-5.10/116-net-macb-add-capability-to-not-set-the-clock-rate.patch | 15 |
1 files changed, 4 insertions, 11 deletions
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 9b904785fc..87dde7ef60 100644 --- 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 - |