aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/cns3xxx
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-11-10 15:33:17 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-11-16 09:35:05 +0100
commitac5297340e647c63f98278eadc2f189608d4cd62 (patch)
treeab0ca9c4b4c1f962d790b2bd9d8055b2e041e80e /target/linux/cns3xxx
parent589c3cf4e08731e4971d2db6c83e16b5ab959878 (diff)
downloadupstream-ac5297340e647c63f98278eadc2f189608d4cd62.tar.gz
upstream-ac5297340e647c63f98278eadc2f189608d4cd62.tar.bz2
upstream-ac5297340e647c63f98278eadc2f189608d4cd62.zip
kernel: bump 4.14 to 4.14.206
Refreshed all patches. Altered patches: - 210-dwc2_defaults.patch - 708-mc-bus-support-layerscape.patch Fixes: - CVE-2020-25656 Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/cns3xxx')
-rw-r--r--target/linux/cns3xxx/patches-4.14/210-dwc2_defaults.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/cns3xxx/patches-4.14/210-dwc2_defaults.patch b/target/linux/cns3xxx/patches-4.14/210-dwc2_defaults.patch
index 67f152f43d..36c7fe0fe9 100644
--- a/target/linux/cns3xxx/patches-4.14/210-dwc2_defaults.patch
+++ b/target/linux/cns3xxx/patches-4.14/210-dwc2_defaults.patch
@@ -37,13 +37,13 @@
const struct of_device_id dwc2_of_match_table[] = {
{ .compatible = "brcm,bcm2835-usb", .data = dwc2_set_bcm_params },
{ .compatible = "hisilicon,hi6220-usb", .data = dwc2_set_his_params },
-@@ -710,17 +740,23 @@ int dwc2_get_hwparams(struct dwc2_hsotg
+@@ -710,18 +740,23 @@ int dwc2_get_hwparams(struct dwc2_hsotg
int dwc2_init_params(struct dwc2_hsotg *hsotg)
{
+ /*
const struct of_device_id *match;
- void (*set_params)(void *data);
+ void (*set_params)(struct dwc2_hsotg *data);
+ */
dwc2_set_default_params(hsotg);
@@ -56,8 +56,8 @@
set_params(hsotg);
}
+ */
-+
-+ dwc2_set_cns3xxx_params(hsotg);
++ dwc2_set_cns3xxx_params(hsotg);
dwc2_check_params(hsotg);
+ return 0;