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/148-net-macb-Add-default-usrio-config-to-default-gem-con.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/148-net-macb-Add-default-usrio-config-to-default-gem-con.patch')
| -rw-r--r-- | target/linux/at91/patches-5.10/148-net-macb-Add-default-usrio-config-to-default-gem-con.patch | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/at91/patches-5.10/148-net-macb-Add-default-usrio-config-to-default-gem-con.patch b/target/linux/at91/patches-5.10/148-net-macb-Add-default-usrio-config-to-default-gem-con.patch index 2e149cefc5..57792a593f 100644 --- a/target/linux/at91/patches-5.10/148-net-macb-Add-default-usrio-config-to-default-gem-con.patch +++ b/target/linux/at91/patches-5.10/148-net-macb-Add-default-usrio-config-to-default-gem-con.patch @@ -18,11 +18,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net> drivers/net/ethernet/cadence/macb_main.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) -diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c -index d5bd640d3fa4..a8d266d72779 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c -@@ -3837,6 +3837,13 @@ static int macb_init(struct platform_device *pdev) +@@ -3837,6 +3837,13 @@ static int macb_init(struct platform_dev return 0; } @@ -36,7 +34,7 @@ index d5bd640d3fa4..a8d266d72779 100644 #if defined(CONFIG_OF) /* 1518 rounded up */ #define AT91ETHER_MAX_RBUFF_SZ 0x600 -@@ -4352,13 +4359,6 @@ static int fu540_c000_init(struct platform_device *pdev) +@@ -4352,13 +4359,6 @@ static int fu540_c000_init(struct platfo return macb_init(pdev); } @@ -50,7 +48,7 @@ index d5bd640d3fa4..a8d266d72779 100644 static const struct macb_usrio_config sama7g5_usrio = { .mii = 0, .rmii = 1, -@@ -4507,6 +4507,7 @@ static const struct macb_config default_gem_config = { +@@ -4507,6 +4507,7 @@ static const struct macb_config default_ .dma_burst_length = 16, .clk_init = macb_clk_init, .init = macb_init, @@ -58,6 +56,3 @@ index d5bd640d3fa4..a8d266d72779 100644 .jumbo_max_len = 10240, }; --- -2.32.0 - |