diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2021-08-09 22:05:05 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2021-08-14 16:32:34 +0100 |
| commit | ce2f31254ad6af35c8cba7e71b708e11d8af5249 (patch) | |
| tree | 799b90cd114a3c1f9e21921d547b4cb3c30b7592 /target/linux/octeon | |
| parent | 4d81f087715524994448ecaefd3ca87c8ba7e0a3 (diff) | |
| download | upstream-ce2f31254ad6af35c8cba7e71b708e11d8af5249.tar.gz upstream-ce2f31254ad6af35c8cba7e71b708e11d8af5249.tar.bz2 upstream-ce2f31254ad6af35c8cba7e71b708e11d8af5249.zip | |
kernel: bump 5.10 to 5.10.57
No deleted or manually refreshed patches.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/octeon')
3 files changed, 9 insertions, 8 deletions
diff --git a/target/linux/octeon/patches-5.10/110-er200-ethernet_probe_order.patch b/target/linux/octeon/patches-5.10/110-er200-ethernet_probe_order.patch index 58312f0c45..b816e9c430 100644 --- a/target/linux/octeon/patches-5.10/110-er200-ethernet_probe_order.patch +++ b/target/linux/octeon/patches-5.10/110-er200-ethernet_probe_order.patch @@ -1,6 +1,6 @@ --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c -@@ -683,6 +683,7 @@ static int cvm_oct_probe(struct platform +@@ -679,6 +679,7 @@ static int cvm_oct_probe(struct platform int interface; int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE; int qos; @@ -8,7 +8,7 @@ struct device_node *pip; int mtu_overhead = ETH_HLEN + ETH_FCS_LEN; -@@ -804,13 +805,19 @@ static int cvm_oct_probe(struct platform +@@ -800,13 +801,19 @@ static int cvm_oct_probe(struct platform } num_interfaces = cvmx_helper_get_number_of_interfaces(); diff --git a/target/linux/octeon/patches-5.10/700-allocate_interface_by_label.patch b/target/linux/octeon/patches-5.10/700-allocate_interface_by_label.patch index 4ee6f84660..e4dc3f96e5 100644 --- a/target/linux/octeon/patches-5.10/700-allocate_interface_by_label.patch +++ b/target/linux/octeon/patches-5.10/700-allocate_interface_by_label.patch @@ -12,19 +12,20 @@ Tested-by: Johannes Kimmel <fff@bareminimum.eu> Signed-off-by: Roman Kuzmitskii <damex.pp@icloud.com> --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c -@@ -408,7 +408,11 @@ int cvm_oct_common_init(struct net_devic +@@ -407,8 +407,12 @@ static int cvm_oct_common_set_mac_addres int cvm_oct_common_init(struct net_device *dev) { struct octeon_ethernet *priv = netdev_priv(dev); + const u8 *label = NULL; - int ret; -+ + int ret; + + if (priv->of_node) + label = of_get_property(priv->of_node, "label", NULL); - ++ ret = of_get_mac_address(priv->of_node, dev->dev_addr); if (ret) -@@ -445,6 +448,9 @@ int cvm_oct_common_init(struct net_devic + eth_hw_addr_random(dev); +@@ -441,6 +445,9 @@ int cvm_oct_common_init(struct net_devic if (dev->netdev_ops->ndo_stop) dev->netdev_ops->ndo_stop(dev); diff --git a/target/linux/octeon/patches-5.10/701-honor_sgmii_node_device_tree_status.patch b/target/linux/octeon/patches-5.10/701-honor_sgmii_node_device_tree_status.patch index d11503c2c1..4185fcba70 100644 --- a/target/linux/octeon/patches-5.10/701-honor_sgmii_node_device_tree_status.patch +++ b/target/linux/octeon/patches-5.10/701-honor_sgmii_node_device_tree_status.patch @@ -12,7 +12,7 @@ Tested-by: Johannes Kimmel <fff@bareminimum.eu> Signed-off-by: Roman Kuzmitskii <damex.pp@icloud.com> --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c -@@ -883,8 +883,10 @@ static int cvm_oct_probe(struct platform +@@ -880,8 +880,10 @@ static int cvm_oct_probe(struct platform case CVMX_HELPER_INTERFACE_MODE_SGMII: priv->phy_mode = PHY_INTERFACE_MODE_SGMII; |