diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2021-07-20 16:24:50 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2021-07-20 18:38:23 +0100 |
| commit | f7ab41acc98682d818a9da997ee5a888b8076656 (patch) | |
| tree | 4922ce854f3db522f26d94042c7b8178ea9863d6 /target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch | |
| parent | 27deb35af3cfa1dda5a635016fa852c8d201e81f (diff) | |
| download | upstream-f7ab41acc98682d818a9da997ee5a888b8076656.tar.gz upstream-f7ab41acc98682d818a9da997ee5a888b8076656.tar.bz2 upstream-f7ab41acc98682d818a9da997ee5a888b8076656.zip | |
linux/rockchip: update the USB 3.0 controller node patch
This has been added in Linux 5.10.51 [1], but it's broken/incomplete. Update our
patch and refresh the remaining patches.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.51&id=421aff50af5e4cdc56b3ac8d6b670e09697bc8ac
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch')
| -rw-r--r-- | target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch b/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch index 1c08e23699..0776d7bccc 100644 --- a/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch +++ b/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch @@ -18,11 +18,9 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> drivers/of/of_net.c | 59 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 14 deletions(-) -diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c -index f072e2509cc9..0dbd1f7ef396 100644 --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c -@@ -55,31 +55,36 @@ static void *of_get_mac_addr(struct device_node *np, const char *name) +@@ -55,31 +55,36 @@ static void *of_get_mac_addr(struct devi return NULL; } @@ -67,7 +65,7 @@ index f072e2509cc9..0dbd1f7ef396 100644 { #ifdef CONFIG_MTD struct device_node *mtd_np = NULL; -@@ -167,28 +172,54 @@ static const void *of_get_mac_address_mtd(struct device_node *np) +@@ -167,28 +172,54 @@ free: * If a mtd-mac-address property exists, try to fetch the MAC address from the * specified mtd device, and store it as a 'mac-address' property * @@ -128,6 +126,3 @@ index f072e2509cc9..0dbd1f7ef396 100644 + return addr; } EXPORT_SYMBOL(of_get_mac_address); --- -2.30.2 - |