a47279154e
Manually rebased patches:
bcm27xx:
patches-5.4/950-0267-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch
bcm53xx:
patches-5.4/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
layerscape:
patches-5.4/802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch
patches-5.4/808-i2c-0002-MLK-10893-i2c-imx-add-irqf_no_suspend.patch
patches-5.4/820-usb-0016-MLK-16735-usb-host-add-XHCI_CDNS_HOST-flag.patch
Removed since could be reverse-applied by quilt:
mediatek:
patches-5.4/0700-arm-dts-mt7623-add-missing-pause-for-switchport.patch
All modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711, x86_64
Run-tested: ipq806x/R7800, x86_64
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Tested-by: Curtis Deptuck <curtdept@me.com> [x86_64]
Rebase of 802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
--- a/drivers/staging/octeon/ethernet.c
|
|
+++ b/drivers/staging/octeon/ethernet.c
|
|
@@ -683,6 +683,7 @@ static int cvm_oct_probe(struct platform
|
|
int interface;
|
|
int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE;
|
|
int qos;
|
|
+ int i;
|
|
struct device_node *pip;
|
|
int mtu_overhead = ETH_HLEN + ETH_FCS_LEN;
|
|
|
|
@@ -806,13 +807,19 @@ static int cvm_oct_probe(struct platform
|
|
}
|
|
|
|
num_interfaces = cvmx_helper_get_number_of_interfaces();
|
|
- for (interface = 0; interface < num_interfaces; interface++) {
|
|
- cvmx_helper_interface_mode_t imode =
|
|
- cvmx_helper_interface_get_mode(interface);
|
|
- int num_ports = cvmx_helper_ports_on_interface(interface);
|
|
+ for (i = 0; i < num_interfaces; i++) {
|
|
+ cvmx_helper_interface_mode_t imode;
|
|
+ int interface;
|
|
+ int num_ports;
|
|
int port;
|
|
int port_index;
|
|
|
|
+ interface = i;
|
|
+ if (cvmx_sysinfo_get()->board_type == CVMX_BOARD_TYPE_UBNT_E200)
|
|
+ interface = num_interfaces - (i + 1);
|
|
+
|
|
+ num_ports = cvmx_helper_ports_on_interface(interface);
|
|
+ imode = cvmx_helper_interface_get_mode(interface);
|
|
for (port_index = 0,
|
|
port = cvmx_helper_get_ipd_port(interface, 0);
|
|
port < cvmx_helper_get_ipd_port(interface, num_ports);
|