kernel: bump 5.10 to 5.10.83
Removed upstreamed:
    bcm53xx/patches-5.10/033-v5.16-0024-ARM-dts-BCM5301X-Fix-I2C-controller-interrupt.patch[1]
    bcm53xx/patches-5.10/033-v5.16-0025-ARM-dts-BCM5301X-Add-interrupt-properties-to-GPIO-no.patch[2]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.83&id=b2cd6fdcbe0a5cb44e4610a08cc58261d494a885
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.83&id=9db1d4a3c2700e1cc84c3d61199411d75c2a3ec6
Build system: x86_64*
Build-tested: bcm2711/RPi4B, ipq806x/R7800†
Run-tested: bcm2711/RPi4B, ipq806x/R7800†
* Had to revert 7c99085bd6 in order to build
  (latest bump of ca-certificates)
† Had to revert 7f1edbd412 in order to build
  (binutils 2.37, https://bugs.openwrt.org/index.php?do=details&task_id=4149)
Signed-off-by: John Audia <graysky@archlinux.us>
			
			
This commit is contained in:
		 John Audia
					John Audia
				
			
				
					committed by
					
						 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
			
				
	
			
			
			 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
						parent
						
							a725bdc700
						
					
				
				
					commit
					6c945fa379
				
			| @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL | |||||||
| endif | endif | ||||||
|  |  | ||||||
| LINUX_VERSION-5.4 = .162 | LINUX_VERSION-5.4 = .162 | ||||||
| LINUX_VERSION-5.10 = .82 | LINUX_VERSION-5.10 = .83 | ||||||
|  |  | ||||||
| LINUX_KERNEL_HASH-5.4.162 = c12d72ddaac78189305a5e98825295ecb02282970033b052276035e83189e25b | LINUX_KERNEL_HASH-5.4.162 = c12d72ddaac78189305a5e98825295ecb02282970033b052276035e83189e25b | ||||||
| LINUX_KERNEL_HASH-5.10.82 = d66f7c7eed02f84ae550b3c91a26c70eea13682a6d672432f07bce66ff8ce350 | LINUX_KERNEL_HASH-5.10.83 = ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70 | ||||||
|  |  | ||||||
| remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) | remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) | ||||||
| sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) | sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) | ||||||
|   | |||||||
| @@ -1123,7 +1123,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> | |||||||
|  } |  } | ||||||
| --- a/drivers/usb/core/hub.c
 | --- a/drivers/usb/core/hub.c
 | ||||||
| +++ b/drivers/usb/core/hub.c
 | +++ b/drivers/usb/core/hub.c
 | ||||||
| @@ -5494,7 +5494,7 @@ static void port_event(struct usb_hub *h
 | @@ -5503,7 +5503,7 @@ static void port_event(struct usb_hub *h
 | ||||||
|  		port_dev->over_current_count++; |  		port_dev->over_current_count++; | ||||||
|  		port_over_current_notify(port_dev); |  		port_over_current_notify(port_dev); | ||||||
|   |   | ||||||
|   | |||||||
| @@ -22,7 +22,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> | |||||||
|   |   | ||||||
|  #define MAX_TUNING_LOOP 40 |  #define MAX_TUNING_LOOP 40 | ||||||
|   |   | ||||||
| @@ -3133,7 +3133,7 @@ static void sdhci_timeout_timer(struct t | @@ -3145,7 +3145,7 @@ static void sdhci_timeout_timer(struct t | ||||||
|  	spin_lock_irqsave(&host->lock, flags); |  	spin_lock_irqsave(&host->lock, flags); | ||||||
|   |   | ||||||
|  	if (host->cmd && !sdhci_data_line_cmd(host->cmd)) { |  	if (host->cmd && !sdhci_data_line_cmd(host->cmd)) { | ||||||
| @@ -31,7 +31,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> | |||||||
|  		       mmc_hostname(host->mmc)); |  		       mmc_hostname(host->mmc)); | ||||||
|  		sdhci_dumpregs(host); |  		sdhci_dumpregs(host); | ||||||
|   |   | ||||||
| @@ -3155,7 +3155,7 @@ static void sdhci_timeout_data_timer(str | @@ -3167,7 +3167,7 @@ static void sdhci_timeout_data_timer(str | ||||||
|   |   | ||||||
|  	if (host->data || host->data_cmd || |  	if (host->data || host->data_cmd || | ||||||
|  	    (host->cmd && sdhci_data_line_cmd(host->cmd))) { |  	    (host->cmd && sdhci_data_line_cmd(host->cmd))) { | ||||||
|   | |||||||
| @@ -95,7 +95,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> | |||||||
|   |   | ||||||
|  #include <video/mipi_display.h> |  #include <video/mipi_display.h> | ||||||
|   |   | ||||||
| @@ -1194,6 +1196,7 @@ static struct fbtft_platform_data *fbtft | @@ -1187,6 +1189,7 @@ static struct fbtft_platform_data *fbtft | ||||||
|   * @display: Display properties |   * @display: Display properties | ||||||
|   * @sdev: SPI device |   * @sdev: SPI device | ||||||
|   * @pdev: Platform device |   * @pdev: Platform device | ||||||
| @@ -103,7 +103,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> | |||||||
|   * |   * | ||||||
|   * Allocates, initializes and registers a framebuffer |   * Allocates, initializes and registers a framebuffer | ||||||
|   * |   * | ||||||
| @@ -1203,12 +1206,15 @@ static struct fbtft_platform_data *fbtft | @@ -1196,12 +1199,15 @@ static struct fbtft_platform_data *fbtft | ||||||
|   */ |   */ | ||||||
|  int fbtft_probe_common(struct fbtft_display *display, |  int fbtft_probe_common(struct fbtft_display *display, | ||||||
|  		       struct spi_device *sdev, |  		       struct spi_device *sdev, | ||||||
| @@ -120,7 +120,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> | |||||||
|  	int ret; |  	int ret; | ||||||
|   |   | ||||||
|  	if (sdev) |  	if (sdev) | ||||||
| @@ -1224,6 +1230,14 @@ int fbtft_probe_common(struct fbtft_disp | @@ -1217,6 +1223,14 @@ int fbtft_probe_common(struct fbtft_disp | ||||||
|  		pdata = fbtft_properties_read(dev); |  		pdata = fbtft_properties_read(dev); | ||||||
|  		if (IS_ERR(pdata)) |  		if (IS_ERR(pdata)) | ||||||
|  			return PTR_ERR(pdata); |  			return PTR_ERR(pdata); | ||||||
|   | |||||||
| @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> | |||||||
|  |  | ||||||
| --- a/arch/arm/boot/dts/bcm2711.dtsi | --- a/arch/arm/boot/dts/bcm2711.dtsi | ||||||
| +++ b/arch/arm/boot/dts/bcm2711.dtsi | +++ b/arch/arm/boot/dts/bcm2711.dtsi | ||||||
| @@ -503,8 +503,8 @@ | @@ -509,8 +509,8 @@ | ||||||
|  			msi-controller; |  			msi-controller; | ||||||
|  			msi-parent = <&pcie0>; |  			msi-parent = <&pcie0>; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> | |||||||
|  |  | ||||||
| --- a/arch/arm/boot/dts/bcm2711.dtsi | --- a/arch/arm/boot/dts/bcm2711.dtsi | ||||||
| +++ b/arch/arm/boot/dts/bcm2711.dtsi | +++ b/arch/arm/boot/dts/bcm2711.dtsi | ||||||
| @@ -554,6 +554,7 @@ | @@ -560,6 +560,7 @@ | ||||||
|   |   | ||||||
|  &dsi1 { |  &dsi1 { | ||||||
|  	interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; |  	interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; | ||||||
|   | |||||||
| @@ -23,7 +23,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> | |||||||
|  			status = "disabled"; |  			status = "disabled"; | ||||||
|  		}; |  		}; | ||||||
|   |   | ||||||
| @@ -1106,7 +1106,3 @@ | @@ -1112,7 +1112,3 @@ | ||||||
|  &usb { |  &usb { | ||||||
|  	interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; |  	interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; | ||||||
|  }; |  }; | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | |||||||
|  |  | ||||||
| --- a/arch/arm/boot/dts/bcm5301x.dtsi | --- a/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| +++ b/arch/arm/boot/dts/bcm5301x.dtsi | +++ b/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| @@ -265,7 +265,7 @@ | @@ -267,7 +267,7 @@ | ||||||
|   |   | ||||||
|  			interrupt-parent = <&gic>; |  			interrupt-parent = <&gic>; | ||||||
|   |   | ||||||
| @@ -29,7 +29,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | |||||||
|  				#usb-cells = <0>; |  				#usb-cells = <0>; | ||||||
|   |   | ||||||
|  				compatible = "generic-ehci"; |  				compatible = "generic-ehci"; | ||||||
| @@ -287,7 +287,7 @@ | @@ -289,7 +289,7 @@ | ||||||
|  				}; |  				}; | ||||||
|  			}; |  			}; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | |||||||
|  |  | ||||||
| --- a/arch/arm/boot/dts/bcm5301x.dtsi | --- a/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| +++ b/arch/arm/boot/dts/bcm5301x.dtsi | +++ b/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| @@ -318,7 +318,7 @@ | @@ -320,7 +320,7 @@ | ||||||
|   |   | ||||||
|  			interrupt-parent = <&gic>; |  			interrupt-parent = <&gic>; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -38,7 +38,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | |||||||
|  }; |  }; | ||||||
| --- a/arch/arm/boot/dts/bcm5301x.dtsi | --- a/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| +++ b/arch/arm/boot/dts/bcm5301x.dtsi | +++ b/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| @@ -428,7 +428,7 @@ | @@ -430,7 +430,7 @@ | ||||||
|  			#address-cells = <1>; |  			#address-cells = <1>; | ||||||
|  			#size-cells = <1>; |  			#size-cells = <1>; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -17,7 +17,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | |||||||
|  |  | ||||||
| --- a/arch/arm/boot/dts/bcm5301x.dtsi | --- a/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| +++ b/arch/arm/boot/dts/bcm5301x.dtsi | +++ b/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| @@ -428,6 +428,26 @@ | @@ -430,6 +430,26 @@ | ||||||
|  			#address-cells = <1>; |  			#address-cells = <1>; | ||||||
|  			#size-cells = <1>; |  			#size-cells = <1>; | ||||||
|   |   | ||||||
| @@ -44,7 +44,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | |||||||
|  			pinctrl: pin-controller@1c0 { |  			pinctrl: pin-controller@1c0 { | ||||||
|  				compatible = "brcm,bcm4708-pinmux"; |  				compatible = "brcm,bcm4708-pinmux"; | ||||||
|  				reg = <0x1c0 0x24>; |  				reg = <0x1c0 0x24>; | ||||||
| @@ -454,32 +474,13 @@ | @@ -456,32 +476,13 @@ | ||||||
|  					function = "uart1"; |  					function = "uart1"; | ||||||
|  				}; |  				}; | ||||||
|  			}; |  			}; | ||||||
|   | |||||||
| @@ -21,7 +21,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | |||||||
|  |  | ||||||
| --- a/arch/arm/boot/dts/bcm5301x.dtsi | --- a/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| +++ b/arch/arm/boot/dts/bcm5301x.dtsi | +++ b/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| @@ -483,7 +483,7 @@ | @@ -485,7 +485,7 @@ | ||||||
|  		}; |  		}; | ||||||
|  	}; |  	}; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -71,7 +71,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | |||||||
| +}; | +}; | ||||||
| --- a/arch/arm/boot/dts/bcm5301x.dtsi | --- a/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| +++ b/arch/arm/boot/dts/bcm5301x.dtsi | +++ b/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| @@ -484,7 +484,7 @@ | @@ -486,7 +486,7 @@ | ||||||
|  	}; |  	}; | ||||||
|   |   | ||||||
|  	srab: ethernet-switch@18007000 { |  	srab: ethernet-switch@18007000 { | ||||||
|   | |||||||
| @@ -155,7 +155,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | |||||||
|  			label = "lan4"; |  			label = "lan4"; | ||||||
| --- a/arch/arm/boot/dts/bcm5301x.dtsi | --- a/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| +++ b/arch/arm/boot/dts/bcm5301x.dtsi | +++ b/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| @@ -490,6 +490,10 @@ | @@ -492,6 +492,10 @@ | ||||||
|  		status = "disabled"; |  		status = "disabled"; | ||||||
|   |   | ||||||
|  		/* ports are defined in board DTS */ |  		/* ports are defined in board DTS */ | ||||||
|   | |||||||
| @@ -53,7 +53,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | |||||||
|  			#address-cells = <1>; |  			#address-cells = <1>; | ||||||
| --- a/arch/arm/boot/dts/bcm5301x.dtsi | --- a/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| +++ b/arch/arm/boot/dts/bcm5301x.dtsi | +++ b/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| @@ -501,7 +501,7 @@ | @@ -503,7 +503,7 @@ | ||||||
|  		reg = <0x18004000 0x14>; |  		reg = <0x18004000 0x14>; | ||||||
|  	}; |  	}; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -28,7 +28,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | |||||||
|  	}; |  	}; | ||||||
| --- a/arch/arm/boot/dts/bcm5301x.dtsi | --- a/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| +++ b/arch/arm/boot/dts/bcm5301x.dtsi | +++ b/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| @@ -458,18 +458,18 @@ | @@ -460,18 +460,18 @@ | ||||||
|  					function = "spi"; |  					function = "spi"; | ||||||
|  				}; |  				}; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -50,7 +50,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | |||||||
|  		compatible = "simple-bus"; |  		compatible = "simple-bus"; | ||||||
|  		ranges = <0x00000000 0x19000000 0x00023000>; |  		ranges = <0x00000000 0x19000000 0x00023000>; | ||||||
|  		#address-cells = <1>; |  		#address-cells = <1>; | ||||||
| @@ -369,7 +369,7 @@ | @@ -371,7 +371,7 @@ | ||||||
|  		#address-cells = <1>; |  		#address-cells = <1>; | ||||||
|  	}; |  	}; | ||||||
|   |   | ||||||
| @@ -59,7 +59,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | |||||||
|  		compatible = "mdio-mux-mmioreg"; |  		compatible = "mdio-mux-mmioreg"; | ||||||
|  		mdio-parent-bus = <&mdio>; |  		mdio-parent-bus = <&mdio>; | ||||||
|  		#address-cells = <1>; |  		#address-cells = <1>; | ||||||
| @@ -415,7 +415,7 @@ | @@ -417,7 +417,7 @@ | ||||||
|  		status = "disabled"; |  		status = "disabled"; | ||||||
|  	}; |  	}; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -17,7 +17,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | |||||||
|  |  | ||||||
| --- a/arch/arm/boot/dts/bcm5301x.dtsi | --- a/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| +++ b/arch/arm/boot/dts/bcm5301x.dtsi | +++ b/arch/arm/boot/dts/bcm5301x.dtsi | ||||||
| @@ -370,7 +370,7 @@ | @@ -372,7 +372,7 @@ | ||||||
|  	}; |  	}; | ||||||
|   |   | ||||||
|  	mdio-mux@18003000 { |  	mdio-mux@18003000 { | ||||||
|   | |||||||
| @@ -1,29 +0,0 @@ | |||||||
| From 6e238362b9793bf334c9bed2291b571cbbc75b0b Mon Sep 17 00:00:00 2001 |  | ||||||
| From: Florian Fainelli <f.fainelli@gmail.com> |  | ||||||
| Date: Wed, 27 Oct 2021 12:37:29 -0700 |  | ||||||
| Subject: [PATCH] ARM: dts: BCM5301X: Fix I2C controller interrupt |  | ||||||
|  |  | ||||||
| The I2C interrupt controller line is off by 32 because the datasheet |  | ||||||
| describes interrupt inputs into the GIC which are for Shared Peripheral |  | ||||||
| Interrupts and are starting at offset 32. The ARM GIC binding expects |  | ||||||
| the SPI interrupts to be numbered from 0 relative to the SPI base. |  | ||||||
|  |  | ||||||
| Fixes: bb097e3e0045 ("ARM: dts: BCM5301X: Add I2C support to the DT") |  | ||||||
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> |  | ||||||
| Tested-by: Christian Lamparter <chunkeey@gmail.com> |  | ||||||
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> |  | ||||||
| --- |  | ||||||
|  arch/arm/boot/dts/bcm5301x.dtsi | 2 +- |  | ||||||
|  1 file changed, 1 insertion(+), 1 deletion(-) |  | ||||||
|  |  | ||||||
| --- a/arch/arm/boot/dts/bcm5301x.dtsi |  | ||||||
| +++ b/arch/arm/boot/dts/bcm5301x.dtsi |  | ||||||
| @@ -408,7 +408,7 @@ |  | ||||||
|  	i2c0: i2c@18009000 { |  | ||||||
|  		compatible = "brcm,iproc-i2c"; |  | ||||||
|  		reg = <0x18009000 0x50>; |  | ||||||
| -		interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>; |  | ||||||
| +		interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>; |  | ||||||
|  		#address-cells = <1>; |  | ||||||
|  		#size-cells = <0>; |  | ||||||
|  		clock-frequency = <100000>; |  | ||||||
| @@ -1,26 +0,0 @@ | |||||||
| From acead95bf77a34cae7ff04dd99387046310cca0d Mon Sep 17 00:00:00 2001 |  | ||||||
| From: Florian Fainelli <f.fainelli@gmail.com> |  | ||||||
| Date: Thu, 28 Oct 2021 09:46:53 -0700 |  | ||||||
| Subject: [PATCH] ARM: dts: BCM5301X: Add interrupt properties to GPIO node |  | ||||||
|  |  | ||||||
| The GPIO controller is also an interrupt controller provider and is |  | ||||||
| currently missing the appropriate 'interrupt-controller' and |  | ||||||
| '#interrupt-cells' properties to denote that. |  | ||||||
|  |  | ||||||
| Fixes: fb026d3de33b ("ARM: BCM5301X: Add Broadcom's bus-axi to the DTS file") |  | ||||||
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> |  | ||||||
| --- |  | ||||||
|  arch/arm/boot/dts/bcm5301x.dtsi | 2 ++ |  | ||||||
|  1 file changed, 2 insertions(+) |  | ||||||
|  |  | ||||||
| --- a/arch/arm/boot/dts/bcm5301x.dtsi |  | ||||||
| +++ b/arch/arm/boot/dts/bcm5301x.dtsi |  | ||||||
| @@ -242,6 +242,8 @@ |  | ||||||
|   |  | ||||||
|  			gpio-controller; |  | ||||||
|  			#gpio-cells = <2>; |  | ||||||
| +			interrupt-controller; |  | ||||||
| +			#interrupt-cells = <2>; |  | ||||||
|  		}; |  | ||||||
|   |  | ||||||
|  		pcie0: pcie@12000 { |  | ||||||
| @@ -49,7 +49,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  #define NET_DEVICE_PATH_STACK_MAX	5 |  #define NET_DEVICE_PATH_STACK_MAX	5 | ||||||
| --- a/net/8021q/vlan_dev.c | --- a/net/8021q/vlan_dev.c | ||||||
| +++ b/net/8021q/vlan_dev.c | +++ b/net/8021q/vlan_dev.c | ||||||
| @@ -767,6 +767,20 @@ static int vlan_dev_get_iflink(const str | @@ -770,6 +770,20 @@ static int vlan_dev_get_iflink(const str | ||||||
|  	return real_dev->ifindex; |  	return real_dev->ifindex; | ||||||
|  } |  } | ||||||
|   |   | ||||||
| @@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  static const struct ethtool_ops vlan_ethtool_ops = { |  static const struct ethtool_ops vlan_ethtool_ops = { | ||||||
|  	.get_link_ksettings	= vlan_ethtool_get_link_ksettings, |  	.get_link_ksettings	= vlan_ethtool_get_link_ksettings, | ||||||
|  	.get_drvinfo	        = vlan_ethtool_get_drvinfo, |  	.get_drvinfo	        = vlan_ethtool_get_drvinfo, | ||||||
| @@ -805,6 +819,7 @@ static const struct net_device_ops vlan_ | @@ -808,6 +822,7 @@ static const struct net_device_ops vlan_ | ||||||
|  #endif |  #endif | ||||||
|  	.ndo_fix_features	= vlan_dev_fix_features, |  	.ndo_fix_features	= vlan_dev_fix_features, | ||||||
|  	.ndo_get_iflink		= vlan_dev_get_iflink, |  	.ndo_get_iflink		= vlan_dev_get_iflink, | ||||||
|   | |||||||
| @@ -51,7 +51,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  enum tc_setup_type { |  enum tc_setup_type { | ||||||
| --- a/net/8021q/vlan_dev.c | --- a/net/8021q/vlan_dev.c | ||||||
| +++ b/net/8021q/vlan_dev.c | +++ b/net/8021q/vlan_dev.c | ||||||
| @@ -777,6 +777,12 @@ static int vlan_dev_fill_forward_path(st | @@ -780,6 +780,12 @@ static int vlan_dev_fill_forward_path(st | ||||||
|  	path->encap.proto = vlan->vlan_proto; |  	path->encap.proto = vlan->vlan_proto; | ||||||
|  	path->dev = ctx->dev; |  	path->dev = ctx->dev; | ||||||
|  	ctx->dev = vlan->real_dev; |  	ctx->dev = vlan->real_dev; | ||||||
|   | |||||||
| @@ -933,7 +933,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  	} |  	} | ||||||
| --- a/drivers/net/ethernet/microchip/lan743x_main.c | --- a/drivers/net/ethernet/microchip/lan743x_main.c | ||||||
| +++ b/drivers/net/ethernet/microchip/lan743x_main.c | +++ b/drivers/net/ethernet/microchip/lan743x_main.c | ||||||
| @@ -2837,7 +2837,6 @@ static int lan743x_pcidev_probe(struct p | @@ -2831,7 +2831,6 @@ static int lan743x_pcidev_probe(struct p | ||||||
|  { |  { | ||||||
|  	struct lan743x_adapter *adapter = NULL; |  	struct lan743x_adapter *adapter = NULL; | ||||||
|  	struct net_device *netdev = NULL; |  	struct net_device *netdev = NULL; | ||||||
| @@ -941,7 +941,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  	int ret = -ENODEV; |  	int ret = -ENODEV; | ||||||
|   |   | ||||||
|  	netdev = devm_alloc_etherdev(&pdev->dev, |  	netdev = devm_alloc_etherdev(&pdev->dev, | ||||||
| @@ -2854,9 +2853,7 @@ static int lan743x_pcidev_probe(struct p | @@ -2848,9 +2847,7 @@ static int lan743x_pcidev_probe(struct p | ||||||
|  			      NETIF_MSG_IFDOWN | NETIF_MSG_TX_QUEUED; |  			      NETIF_MSG_IFDOWN | NETIF_MSG_TX_QUEUED; | ||||||
|  	netdev->max_mtu = LAN743X_MAX_FRAME_SIZE; |  	netdev->max_mtu = LAN743X_MAX_FRAME_SIZE; | ||||||
|   |   | ||||||
| @@ -1360,7 +1360,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  	int irq; |  	int irq; | ||||||
| --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | ||||||
| +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | ||||||
| @@ -4957,7 +4957,7 @@ int stmmac_dvr_probe(struct device *devi | @@ -4990,7 +4990,7 @@ int stmmac_dvr_probe(struct device *devi | ||||||
|  	priv->wol_irq = res->wol_irq; |  	priv->wol_irq = res->wol_irq; | ||||||
|  	priv->lpi_irq = res->lpi_irq; |  	priv->lpi_irq = res->lpi_irq; | ||||||
|   |   | ||||||
| @@ -1371,7 +1371,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  	dev_set_drvdata(device, priv->dev); |  	dev_set_drvdata(device, priv->dev); | ||||||
| --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | ||||||
| +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | ||||||
| @@ -394,7 +394,7 @@ static int stmmac_of_get_mac_mode(struct | @@ -395,7 +395,7 @@ static int stmmac_of_get_mac_mode(struct | ||||||
|   * set some private fields that will be used by the main at runtime. |   * set some private fields that will be used by the main at runtime. | ||||||
|   */ |   */ | ||||||
|  struct plat_stmmacenet_data * |  struct plat_stmmacenet_data * | ||||||
| @@ -1380,7 +1380,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  { |  { | ||||||
|  	struct device_node *np = pdev->dev.of_node; |  	struct device_node *np = pdev->dev.of_node; | ||||||
|  	struct plat_stmmacenet_data *plat; |  	struct plat_stmmacenet_data *plat; | ||||||
| @@ -406,12 +406,12 @@ stmmac_probe_config_dt(struct platform_d | @@ -407,12 +407,12 @@ stmmac_probe_config_dt(struct platform_d | ||||||
|  	if (!plat) |  	if (!plat) | ||||||
|  		return ERR_PTR(-ENOMEM); |  		return ERR_PTR(-ENOMEM); | ||||||
|   |   | ||||||
| @@ -1398,7 +1398,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  	} |  	} | ||||||
|   |   | ||||||
|  	phy_mode = device_get_phy_mode(&pdev->dev); |  	phy_mode = device_get_phy_mode(&pdev->dev); | ||||||
| @@ -643,7 +643,7 @@ void stmmac_remove_config_dt(struct plat | @@ -644,7 +644,7 @@ void stmmac_remove_config_dt(struct plat | ||||||
|  } |  } | ||||||
|  #else |  #else | ||||||
|  struct plat_stmmacenet_data * |  struct plat_stmmacenet_data * | ||||||
|   | |||||||
| @@ -158,7 +158,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  				IPC_SEM_IDS, sysvipc_sem_proc_show); |  				IPC_SEM_IDS, sysvipc_sem_proc_show); | ||||||
| --- a/ipc/shm.c | --- a/ipc/shm.c | ||||||
| +++ b/ipc/shm.c | +++ b/ipc/shm.c | ||||||
| @@ -144,6 +144,8 @@ pure_initcall(ipc_ns_init); | @@ -154,6 +154,8 @@ pure_initcall(ipc_ns_init); | ||||||
|   |   | ||||||
|  void __init shm_init(void) |  void __init shm_init(void) | ||||||
|  { |  { | ||||||
|   | |||||||
| @@ -157,7 +157,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  	case RTN_THROW: |  	case RTN_THROW: | ||||||
|  	case RTN_UNREACHABLE: |  	case RTN_UNREACHABLE: | ||||||
|  	default: |  	default: | ||||||
| @@ -4429,6 +4448,17 @@ static int ip6_pkt_prohibit_out(struct n | @@ -4448,6 +4467,17 @@ static int ip6_pkt_prohibit_out(struct n | ||||||
|  	return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES); |  	return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES); | ||||||
|  } |  } | ||||||
|   |   | ||||||
| @@ -175,7 +175,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  /* |  /* | ||||||
|   *	Allocate a dst for local (unicast / anycast) address. |   *	Allocate a dst for local (unicast / anycast) address. | ||||||
|   */ |   */ | ||||||
| @@ -4909,7 +4939,8 @@ static int rtm_to_fib6_config(struct sk_ | @@ -4928,7 +4958,8 @@ static int rtm_to_fib6_config(struct sk_ | ||||||
|  	if (rtm->rtm_type == RTN_UNREACHABLE || |  	if (rtm->rtm_type == RTN_UNREACHABLE || | ||||||
|  	    rtm->rtm_type == RTN_BLACKHOLE || |  	    rtm->rtm_type == RTN_BLACKHOLE || | ||||||
|  	    rtm->rtm_type == RTN_PROHIBIT || |  	    rtm->rtm_type == RTN_PROHIBIT || | ||||||
| @@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  		cfg->fc_flags |= RTF_REJECT; |  		cfg->fc_flags |= RTF_REJECT; | ||||||
|   |   | ||||||
|  	if (rtm->rtm_type == RTN_LOCAL) |  	if (rtm->rtm_type == RTN_LOCAL) | ||||||
| @@ -6080,6 +6111,8 @@ static int ip6_route_dev_notify(struct n | @@ -6099,6 +6130,8 @@ static int ip6_route_dev_notify(struct n | ||||||
|  #ifdef CONFIG_IPV6_MULTIPLE_TABLES |  #ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||||||
|  		net->ipv6.ip6_prohibit_entry->dst.dev = dev; |  		net->ipv6.ip6_prohibit_entry->dst.dev = dev; | ||||||
|  		net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev); |  		net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev); | ||||||
| @@ -194,7 +194,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  		net->ipv6.ip6_blk_hole_entry->dst.dev = dev; |  		net->ipv6.ip6_blk_hole_entry->dst.dev = dev; | ||||||
|  		net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); |  		net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); | ||||||
|  #endif |  #endif | ||||||
| @@ -6091,6 +6124,7 @@ static int ip6_route_dev_notify(struct n | @@ -6110,6 +6143,7 @@ static int ip6_route_dev_notify(struct n | ||||||
|  		in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev); |  		in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev); | ||||||
|  #ifdef CONFIG_IPV6_MULTIPLE_TABLES |  #ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||||||
|  		in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev); |  		in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev); | ||||||
| @@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  		in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev); |  		in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev); | ||||||
|  #endif |  #endif | ||||||
|  	} |  	} | ||||||
| @@ -6282,6 +6316,8 @@ static int __net_init ip6_route_net_init | @@ -6301,6 +6335,8 @@ static int __net_init ip6_route_net_init | ||||||
|   |   | ||||||
|  #ifdef CONFIG_IPV6_MULTIPLE_TABLES |  #ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||||||
|  	net->ipv6.fib6_has_custom_rules = false; |  	net->ipv6.fib6_has_custom_rules = false; | ||||||
| @@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  	net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template, |  	net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template, | ||||||
|  					       sizeof(*net->ipv6.ip6_prohibit_entry), |  					       sizeof(*net->ipv6.ip6_prohibit_entry), | ||||||
|  					       GFP_KERNEL); |  					       GFP_KERNEL); | ||||||
| @@ -6292,11 +6328,21 @@ static int __net_init ip6_route_net_init | @@ -6311,11 +6347,21 @@ static int __net_init ip6_route_net_init | ||||||
|  			 ip6_template_metrics, true); |  			 ip6_template_metrics, true); | ||||||
|  	INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached); |  	INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached); | ||||||
|   |   | ||||||
| @@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  	net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; |  	net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; | ||||||
|  	dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, |  	dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, | ||||||
|  			 ip6_template_metrics, true); |  			 ip6_template_metrics, true); | ||||||
| @@ -6323,6 +6369,8 @@ out: | @@ -6342,6 +6388,8 @@ out: | ||||||
|  	return ret; |  	return ret; | ||||||
|   |   | ||||||
|  #ifdef CONFIG_IPV6_MULTIPLE_TABLES |  #ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||||||
| @@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  out_ip6_prohibit_entry: |  out_ip6_prohibit_entry: | ||||||
|  	kfree(net->ipv6.ip6_prohibit_entry); |  	kfree(net->ipv6.ip6_prohibit_entry); | ||||||
|  out_ip6_null_entry: |  out_ip6_null_entry: | ||||||
| @@ -6342,6 +6390,7 @@ static void __net_exit ip6_route_net_exi | @@ -6361,6 +6409,7 @@ static void __net_exit ip6_route_net_exi | ||||||
|  	kfree(net->ipv6.ip6_null_entry); |  	kfree(net->ipv6.ip6_null_entry); | ||||||
|  #ifdef CONFIG_IPV6_MULTIPLE_TABLES |  #ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||||||
|  	kfree(net->ipv6.ip6_prohibit_entry); |  	kfree(net->ipv6.ip6_prohibit_entry); | ||||||
| @@ -251,7 +251,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  	kfree(net->ipv6.ip6_blk_hole_entry); |  	kfree(net->ipv6.ip6_blk_hole_entry); | ||||||
|  #endif |  #endif | ||||||
|  	dst_entries_destroy(&net->ipv6.ip6_dst_ops); |  	dst_entries_destroy(&net->ipv6.ip6_dst_ops); | ||||||
| @@ -6419,6 +6468,9 @@ void __init ip6_route_init_special_entri | @@ -6438,6 +6487,9 @@ void __init ip6_route_init_special_entri | ||||||
|  	init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); |  	init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); | ||||||
|  	init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev; |  	init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev; | ||||||
|  	init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); |  	init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); | ||||||
|   | |||||||
| @@ -14,7 +14,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com> [just fixed the value] | |||||||
| --- | --- | ||||||
| --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi | --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi | ||||||
| +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi | +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi | ||||||
| @@ -146,7 +146,8 @@ pmu { | @@ -142,7 +142,8 @@ | ||||||
|  	clocks { |  	clocks { | ||||||
|  		sleep_clk: sleep_clk { |  		sleep_clk: sleep_clk { | ||||||
|  			compatible = "fixed-clock"; |  			compatible = "fixed-clock"; | ||||||
|   | |||||||
| @@ -14,7 +14,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com> | |||||||
|  |  | ||||||
| --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi | --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi | ||||||
| +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi | +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi | ||||||
| @@ -616,6 +616,29 @@ | @@ -617,6 +617,29 @@ | ||||||
|  			}; |  			}; | ||||||
|  		}; |  		}; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr> | |||||||
|   |   | ||||||
|  / { |  / { | ||||||
|  	#address-cells = <1>; |  	#address-cells = <1>; | ||||||
| @@ -597,22 +598,39 @@ | @@ -598,22 +599,39 @@ | ||||||
|   |   | ||||||
|  			ethphy0: ethernet-phy@0 { |  			ethphy0: ethernet-phy@0 { | ||||||
|  				reg = <0>; |  				reg = <0>; | ||||||
|   | |||||||
| @@ -25,7 +25,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com> | |||||||
|  	}; |  	}; | ||||||
|   |   | ||||||
|  	cpus { |  	cpus { | ||||||
| @@ -657,6 +659,64 @@ | @@ -658,6 +660,64 @@ | ||||||
|  			status = "disabled"; |  			status = "disabled"; | ||||||
|  		}; |  		}; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -78,9 +78,9 @@ | |||||||
| +			opp-microvolt = <1150000>; | +			opp-microvolt = <1150000>; | ||||||
| +			clock-latency-ns = <100000>; | +			clock-latency-ns = <100000>; | ||||||
| +			opp-level = <2>; | +			opp-level = <2>; | ||||||
|  		}; | +		}; | ||||||
|  	}; | +	}; | ||||||
|   | + | ||||||
| +	opp_table0: opp_table0 { | +	opp_table0: opp_table0 { | ||||||
| +		compatible = "operating-points-v2-kryo-cpu"; | +		compatible = "operating-points-v2-kryo-cpu"; | ||||||
| +		nvmem-cells = <&speedbin_efuse>; | +		nvmem-cells = <&speedbin_efuse>; | ||||||
| @@ -152,9 +152,9 @@ | |||||||
| +			opp-supported-hw = <0x1>; | +			opp-supported-hw = <0x1>; | ||||||
| +			clock-latency-ns = <100000>; | +			clock-latency-ns = <100000>; | ||||||
| +			opp-level = <2>; | +			opp-level = <2>; | ||||||
| +		}; |  		}; | ||||||
| +	}; |  	}; | ||||||
| + |   | ||||||
| +	thermal-zones { | +	thermal-zones { | ||||||
| +		tsens_tz_sensor0 { | +		tsens_tz_sensor0 { | ||||||
| +			polling-delay-passive = <0>; | +			polling-delay-passive = <0>; | ||||||
|   | |||||||
| @@ -29,7 +29,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  |  | ||||||
| --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | ||||||
| +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | ||||||
| @@ -4990,6 +4990,10 @@ int stmmac_dvr_probe(struct device *devi | @@ -5023,6 +5023,10 @@ int stmmac_dvr_probe(struct device *devi | ||||||
|  			reset_control_reset(priv->plat->stmmac_rst); |  			reset_control_reset(priv->plat->stmmac_rst); | ||||||
|  	} |  	} | ||||||
|   |   | ||||||
| @@ -40,7 +40,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  	/* Init MAC and get the capabilities */ |  	/* Init MAC and get the capabilities */ | ||||||
|  	ret = stmmac_hw_init(priv); |  	ret = stmmac_hw_init(priv); | ||||||
|  	if (ret) |  	if (ret) | ||||||
| @@ -5214,6 +5218,7 @@ int stmmac_dvr_remove(struct device *dev | @@ -5247,6 +5251,7 @@ int stmmac_dvr_remove(struct device *dev | ||||||
|  	phylink_destroy(priv->phylink); |  	phylink_destroy(priv->phylink); | ||||||
|  	if (priv->plat->stmmac_rst) |  	if (priv->plat->stmmac_rst) | ||||||
|  		reset_control_assert(priv->plat->stmmac_rst); |  		reset_control_assert(priv->plat->stmmac_rst); | ||||||
| @@ -50,7 +50,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  	if (priv->hw->pcs != STMMAC_PCS_TBI && |  	if (priv->hw->pcs != STMMAC_PCS_TBI && | ||||||
| --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | ||||||
| +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | ||||||
| @@ -616,6 +616,12 @@ stmmac_probe_config_dt(struct platform_d | @@ -617,6 +617,12 @@ stmmac_probe_config_dt(struct platform_d | ||||||
|  		plat->stmmac_rst = NULL; |  		plat->stmmac_rst = NULL; | ||||||
|  	} |  	} | ||||||
|   |   | ||||||
|   | |||||||
| @@ -95,7 +95,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c | |||||||
|  		phydev->mii_ts->link_state(phydev->mii_ts, phydev); |  		phydev->mii_ts->link_state(phydev->mii_ts, phydev); | ||||||
| --- a/drivers/net/phy/phylink.c | --- a/drivers/net/phy/phylink.c | ||||||
| +++ b/drivers/net/phy/phylink.c | +++ b/drivers/net/phy/phylink.c | ||||||
| @@ -907,7 +907,8 @@ void phylink_destroy(struct phylink *pl) | @@ -931,7 +931,8 @@ void phylink_destroy(struct phylink *pl) | ||||||
|  } |  } | ||||||
|  EXPORT_SYMBOL_GPL(phylink_destroy); |  EXPORT_SYMBOL_GPL(phylink_destroy); | ||||||
|   |   | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| --- a/drivers/net/phy/phylink.c | --- a/drivers/net/phy/phylink.c | ||||||
| +++ b/drivers/net/phy/phylink.c | +++ b/drivers/net/phy/phylink.c | ||||||
| @@ -1425,6 +1425,11 @@ int phylink_ethtool_ksettings_set(struct | @@ -1449,6 +1449,11 @@ int phylink_ethtool_ksettings_set(struct | ||||||
|  		 *   the presence of a PHY, this should not be changed as that |  		 *   the presence of a PHY, this should not be changed as that | ||||||
|  		 *   should be determined from the media side advertisement. |  		 *   should be determined from the media side advertisement. | ||||||
|  		 */ |  		 */ | ||||||
| @@ -12,7 +12,7 @@ | |||||||
|  		return phy_ethtool_ksettings_set(pl->phydev, kset); |  		return phy_ethtool_ksettings_set(pl->phydev, kset); | ||||||
|  	} |  	} | ||||||
|   |   | ||||||
| @@ -1726,8 +1731,11 @@ int phylink_ethtool_get_eee(struct phyli | @@ -1750,8 +1755,11 @@ int phylink_ethtool_get_eee(struct phyli | ||||||
|   |   | ||||||
|  	ASSERT_RTNL(); |  	ASSERT_RTNL(); | ||||||
|   |   | ||||||
| @@ -25,7 +25,7 @@ | |||||||
|   |   | ||||||
|  	return ret; |  	return ret; | ||||||
|  } |  } | ||||||
| @@ -1744,8 +1752,11 @@ int phylink_ethtool_set_eee(struct phyli | @@ -1768,8 +1776,11 @@ int phylink_ethtool_set_eee(struct phyli | ||||||
|   |   | ||||||
|  	ASSERT_RTNL(); |  	ASSERT_RTNL(); | ||||||
|   |   | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user