From 57293f51c48f1f7c4e8f1ab6fe2220761487bd65 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Mon, 31 Jan 2022 11:52:40 +0100 Subject: [PATCH] kernel: bump 4.14 to 4.14.264 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit All patches refreshed automagically without conflicts. Run tested on ipq40xx/glinet-b1300 and mvebu/turris-omnia. Signed-off-by: Petr Å tetiar --- include/kernel-version.mk | 4 +- ...cks-early-during-the-boot-process-so.patch | 4 +- ...Mark-used-PLLs-and-dividers-CRITICAL.patch | 2 +- ...lk-bcm2835-Add-claim-clocks-property.patch | 14 +++--- ...35-Read-max-core-clock-from-firmware.patch | 8 ++-- ...-GPIO-clocks-enabled-at-boot-as-crit.patch | 2 +- .../950-0037-Add-dwc_otg-driver.patch | 2 +- ...1-Don-t-use-DT-aliases-for-numbering.patch | 2 +- ...0093-amba_pl011-Round-input-clock-up.patch | 6 +-- ...Add-cts-event-workaround-DT-property.patch | 2 +- ...PS-BCM63XX-add-clkdev-lookup-support.patch | 4 +- ...vide-periph-clock-as-refclk-for-uart.patch | 16 +++---- ...e-the-HSSPI-PLL-HZ-into-its-own-cloc.patch | 8 ++-- ...vide-enet-clocks-as-enet-to-the-ethe.patch | 10 ++-- ...M63XX-split-out-swpkt_sar-usb-clocks.patch | 2 +- ...IPS-BCM63XX-add-support-for-BCM63268.patch | 4 +- ...MIPS-BCM63XX-add-support-for-BCM6318.patch | 6 +-- ...X-add-clkdev-lookups-for-device-tree.patch | 20 ++++---- ...e-size-of-hook-entry-point-locations.patch | 2 +- ...-support-hardware-flow-table-offload.patch | 2 +- ...707-dpaa-ethernet-support-layerscape.patch | 48 +++++++++---------- 21 files changed, 84 insertions(+), 84 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index ec35588b45..1f5896cf64 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.14 = .262 +LINUX_VERSION-4.14 = .264 -LINUX_KERNEL_HASH-4.14.262 = 4cfd785381edbfcd86dfb1cd8d264d872643d71afd2b832fa2090f5b7228d417 +LINUX_KERNEL_HASH-4.14.264 = 55b04bc00df0282d5e7d23028d12f7d1d29aaadbf52199661b09e70f1c4225b4 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/brcm2708/patches-4.14/950-0022-Register-the-clocks-early-during-the-boot-process-so.patch b/target/linux/brcm2708/patches-4.14/950-0022-Register-the-clocks-early-during-the-boot-process-so.patch index 3e3ae9b715..821ff74882 100644 --- a/target/linux/brcm2708/patches-4.14/950-0022-Register-the-clocks-early-during-the-boot-process-so.patch +++ b/target/linux/brcm2708/patches-4.14/950-0022-Register-the-clocks-early-during-the-boot-process-so.patch @@ -13,7 +13,7 @@ Signed-off-by: Martin Sperl --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -2222,8 +2222,15 @@ static int bcm2835_clk_probe(struct plat +@@ -2217,8 +2217,15 @@ static int bcm2835_clk_probe(struct plat if (ret) return ret; @@ -30,7 +30,7 @@ Signed-off-by: Martin Sperl } static const struct of_device_id bcm2835_clk_of_match[] = { -@@ -2240,7 +2247,11 @@ static struct platform_driver bcm2835_cl +@@ -2235,7 +2242,11 @@ static struct platform_driver bcm2835_cl .probe = bcm2835_clk_probe, }; diff --git a/target/linux/brcm2708/patches-4.14/950-0026-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch b/target/linux/brcm2708/patches-4.14/950-0026-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch index 22a404361a..bb49141a50 100644 --- a/target/linux/brcm2708/patches-4.14/950-0026-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch +++ b/target/linux/brcm2708/patches-4.14/950-0026-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch @@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -1399,6 +1399,11 @@ bcm2835_register_pll_divider(struct bcm2 +@@ -1394,6 +1394,11 @@ bcm2835_register_pll_divider(struct bcm2 divider->div.hw.init = &init; divider->div.table = NULL; diff --git a/target/linux/brcm2708/patches-4.14/950-0027-clk-bcm2835-Add-claim-clocks-property.patch b/target/linux/brcm2708/patches-4.14/950-0027-clk-bcm2835-Add-claim-clocks-property.patch index fb79013eea..4c87cc090a 100644 --- a/target/linux/brcm2708/patches-4.14/950-0027-clk-bcm2835-Add-claim-clocks-property.patch +++ b/target/linux/brcm2708/patches-4.14/950-0027-clk-bcm2835-Add-claim-clocks-property.patch @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -1329,6 +1329,8 @@ static const struct clk_ops bcm2835_vpu_ +@@ -1324,6 +1324,8 @@ static const struct clk_ops bcm2835_vpu_ .debug_init = bcm2835_clock_debug_init, }; @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman, const struct bcm2835_pll_data *data) { -@@ -1345,6 +1347,9 @@ static struct clk_hw *bcm2835_register_p +@@ -1340,6 +1342,9 @@ static struct clk_hw *bcm2835_register_p init.ops = &bcm2835_pll_clk_ops; init.flags = CLK_IGNORE_UNUSED; @@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell pll = kzalloc(sizeof(*pll), GFP_KERNEL); if (!pll) return NULL; -@@ -1400,8 +1405,10 @@ bcm2835_register_pll_divider(struct bcm2 +@@ -1395,8 +1400,10 @@ bcm2835_register_pll_divider(struct bcm2 divider->div.table = NULL; if (!(cprman_read(cprman, data->cm_reg) & data->hold_mask)) { @@ -49,7 +49,7 @@ Signed-off-by: Phil Elwell } divider->cprman = cprman; -@@ -2154,6 +2161,8 @@ static const struct bcm2835_clk_desc clk +@@ -2149,6 +2156,8 @@ static const struct bcm2835_clk_desc clk .ctl_reg = CM_PERIICTL), }; @@ -58,7 +58,7 @@ Signed-off-by: Phil Elwell /* * Permanently take a reference on the parent of the SDRAM clock. * -@@ -2173,6 +2182,19 @@ static int bcm2835_mark_sdc_parent_criti +@@ -2168,6 +2177,19 @@ static int bcm2835_mark_sdc_parent_criti return clk_prepare_enable(parent); } @@ -78,7 +78,7 @@ Signed-off-by: Phil Elwell static int bcm2835_clk_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; -@@ -2182,6 +2204,7 @@ static int bcm2835_clk_probe(struct plat +@@ -2177,6 +2199,7 @@ static int bcm2835_clk_probe(struct plat const struct bcm2835_clk_desc *desc; const size_t asize = ARRAY_SIZE(clk_desc_array); size_t i; @@ -86,7 +86,7 @@ Signed-off-by: Phil Elwell int ret; cprman = devm_kzalloc(dev, sizeof(*cprman) + -@@ -2197,6 +2220,13 @@ static int bcm2835_clk_probe(struct plat +@@ -2192,6 +2215,13 @@ static int bcm2835_clk_probe(struct plat if (IS_ERR(cprman->regs)) return PTR_ERR(cprman->regs); diff --git a/target/linux/brcm2708/patches-4.14/950-0028-clk-bcm2835-Read-max-core-clock-from-firmware.patch b/target/linux/brcm2708/patches-4.14/950-0028-clk-bcm2835-Read-max-core-clock-from-firmware.patch index fe81dc2d41..eef746bf7e 100644 --- a/target/linux/brcm2708/patches-4.14/950-0028-clk-bcm2835-Read-max-core-clock-from-firmware.patch +++ b/target/linux/brcm2708/patches-4.14/950-0028-clk-bcm2835-Read-max-core-clock-from-firmware.patch @@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell spinlock_t regs_lock; /* spinlock for all clocks */ /* -@@ -1032,6 +1036,30 @@ static unsigned long bcm2835_clock_get_r +@@ -1027,6 +1031,30 @@ static unsigned long bcm2835_clock_get_r return bcm2835_clock_rate_from_divisor(clock, parent_rate, div); } @@ -81,7 +81,7 @@ Signed-off-by: Phil Elwell static void bcm2835_clock_wait_busy(struct bcm2835_clock *clock) { struct bcm2835_cprman *cprman = clock->cprman; -@@ -1321,7 +1349,7 @@ static int bcm2835_vpu_clock_is_on(struc +@@ -1316,7 +1344,7 @@ static int bcm2835_vpu_clock_is_on(struc */ static const struct clk_ops bcm2835_vpu_clock_clk_ops = { .is_prepared = bcm2835_vpu_clock_is_on, @@ -90,7 +90,7 @@ Signed-off-by: Phil Elwell .set_rate = bcm2835_clock_set_rate, .determine_rate = bcm2835_clock_determine_rate, .set_parent = bcm2835_clock_set_parent, -@@ -2203,6 +2231,7 @@ static int bcm2835_clk_probe(struct plat +@@ -2198,6 +2226,7 @@ static int bcm2835_clk_probe(struct plat struct resource *res; const struct bcm2835_clk_desc *desc; const size_t asize = ARRAY_SIZE(clk_desc_array); @@ -98,7 +98,7 @@ Signed-off-by: Phil Elwell size_t i; u32 clk_id; int ret; -@@ -2220,6 +2249,14 @@ static int bcm2835_clk_probe(struct plat +@@ -2215,6 +2244,14 @@ static int bcm2835_clk_probe(struct plat if (IS_ERR(cprman->regs)) return PTR_ERR(cprman->regs); diff --git a/target/linux/brcm2708/patches-4.14/950-0029-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch b/target/linux/brcm2708/patches-4.14/950-0029-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch index 1a120ac077..3832cf92a7 100644 --- a/target/linux/brcm2708/patches-4.14/950-0029-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch +++ b/target/linux/brcm2708/patches-4.14/950-0029-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch @@ -20,7 +20,7 @@ Signed-off-by: Eric Anholt --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -1492,6 +1492,15 @@ static struct clk_hw *bcm2835_register_c +@@ -1487,6 +1487,15 @@ static struct clk_hw *bcm2835_register_c init.flags = data->flags | CLK_IGNORE_UNUSED; /* diff --git a/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch b/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch index ba94cb8a76..dc3bc436f8 100644 --- a/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch +++ b/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch @@ -841,7 +841,7 @@ Signed-off-by: Malik Olivier Boussejra } --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5187,7 +5187,7 @@ static void port_event(struct usb_hub *h +@@ -5190,7 +5190,7 @@ static void port_event(struct usb_hub *h if (portchange & USB_PORT_STAT_C_OVERCURRENT) { u16 status = 0, unused; diff --git a/target/linux/brcm2708/patches-4.14/950-0092-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch b/target/linux/brcm2708/patches-4.14/950-0092-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch index d9cd2e268b..b7aa023a96 100644 --- a/target/linux/brcm2708/patches-4.14/950-0092-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch +++ b/target/linux/brcm2708/patches-4.14/950-0092-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch @@ -14,7 +14,7 @@ use the same logic. --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -2595,7 +2595,12 @@ static int pl011_setup_port(struct devic +@@ -2574,7 +2574,12 @@ static int pl011_setup_port(struct devic if (IS_ERR(base)) return PTR_ERR(base); diff --git a/target/linux/brcm2708/patches-4.14/950-0093-amba_pl011-Round-input-clock-up.patch b/target/linux/brcm2708/patches-4.14/950-0093-amba_pl011-Round-input-clock-up.patch index e7d0eeb287..65e302b219 100644 --- a/target/linux/brcm2708/patches-4.14/950-0093-amba_pl011-Round-input-clock-up.patch +++ b/target/linux/brcm2708/patches-4.14/950-0093-amba_pl011-Round-input-clock-up.patch @@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell /* Clear pending error and receive interrupts */ pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS | -@@ -2341,7 +2358,7 @@ static int pl011_console_setup(struct co +@@ -2320,7 +2337,7 @@ static int pl011_console_setup(struct co plat->init(); } @@ -68,7 +68,7 @@ Signed-off-by: Phil Elwell if (uap->vendor->fixed_options) { baud = uap->fixed_baud; -@@ -2526,6 +2543,7 @@ static struct uart_driver amba_reg = { +@@ -2505,6 +2522,7 @@ static struct uart_driver amba_reg = { .cons = AMBA_CONSOLE, }; @@ -76,7 +76,7 @@ Signed-off-by: Phil Elwell static int pl011_probe_dt_alias(int index, struct device *dev) { struct device_node *np; -@@ -2557,6 +2575,7 @@ static int pl011_probe_dt_alias(int inde +@@ -2536,6 +2554,7 @@ static int pl011_probe_dt_alias(int inde return ret; } diff --git a/target/linux/brcm2708/patches-4.14/950-0122-amba_pl011-Add-cts-event-workaround-DT-property.patch b/target/linux/brcm2708/patches-4.14/950-0122-amba_pl011-Add-cts-event-workaround-DT-property.patch index c90f140658..240c174936 100644 --- a/target/linux/brcm2708/patches-4.14/950-0122-amba_pl011-Add-cts-event-workaround-DT-property.patch +++ b/target/linux/brcm2708/patches-4.14/950-0122-amba_pl011-Add-cts-event-workaround-DT-property.patch @@ -33,7 +33,7 @@ Signed-off-by: Phil Elwell --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -2682,6 +2682,11 @@ static int pl011_probe(struct amba_devic +@@ -2661,6 +2661,11 @@ static int pl011_probe(struct amba_devic if (IS_ERR(uap->clk)) return PTR_ERR(uap->clk); diff --git a/target/linux/brcm63xx/patches-4.14/001-4.15-01-MIPS-BCM63XX-add-clkdev-lookup-support.patch b/target/linux/brcm63xx/patches-4.14/001-4.15-01-MIPS-BCM63XX-add-clkdev-lookup-support.patch index a20b9f1c9d..094eabdd68 100644 --- a/target/linux/brcm63xx/patches-4.14/001-4.15-01-MIPS-BCM63XX-add-clkdev-lookup-support.patch +++ b/target/linux/brcm63xx/patches-4.14/001-4.15-01-MIPS-BCM63XX-add-clkdev-lookup-support.patch @@ -34,7 +34,7 @@ Signed-off-by: Jonas Gorski #include #include #include -@@ -365,44 +366,103 @@ long clk_round_rate(struct clk *clk, uns +@@ -371,44 +372,103 @@ long clk_round_rate(struct clk *clk, uns } EXPORT_SYMBOL_GPL(clk_round_rate); @@ -176,7 +176,7 @@ Signed-off-by: Jonas Gorski #define HSSPI_PLL_HZ_6328 133333333 #define HSSPI_PLL_HZ_6362 400000000 -@@ -410,11 +470,31 @@ EXPORT_SYMBOL(clk_put); +@@ -416,11 +476,31 @@ EXPORT_SYMBOL(clk_put); static int __init bcm63xx_clk_init(void) { switch (bcm63xx_get_cpu_id()) { diff --git a/target/linux/brcm63xx/patches-4.14/001-4.15-02-MIPS-BCM63XX-provide-periph-clock-as-refclk-for-uart.patch b/target/linux/brcm63xx/patches-4.14/001-4.15-02-MIPS-BCM63XX-provide-periph-clock-as-refclk-for-uart.patch index fa2b91180e..68a5704ff5 100644 --- a/target/linux/brcm63xx/patches-4.14/001-4.15-02-MIPS-BCM63XX-provide-periph-clock-as-refclk-for-uart.patch +++ b/target/linux/brcm63xx/patches-4.14/001-4.15-02-MIPS-BCM63XX-provide-periph-clock-as-refclk-for-uart.patch @@ -13,7 +13,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/clk.c +++ b/arch/mips/bcm63xx/clk.c -@@ -369,6 +369,8 @@ EXPORT_SYMBOL_GPL(clk_round_rate); +@@ -375,6 +375,8 @@ EXPORT_SYMBOL_GPL(clk_round_rate); static struct clk_lookup bcm3368_clks[] = { /* fixed rate clocks */ CLKDEV_INIT(NULL, "periph", &clk_periph), @@ -22,7 +22,7 @@ Signed-off-by: Jonas Gorski /* gated clocks */ CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -382,6 +384,8 @@ static struct clk_lookup bcm3368_clks[] +@@ -388,6 +390,8 @@ static struct clk_lookup bcm3368_clks[] static struct clk_lookup bcm6328_clks[] = { /* fixed rate clocks */ CLKDEV_INIT(NULL, "periph", &clk_periph), @@ -31,7 +31,7 @@ Signed-off-by: Jonas Gorski /* gated clocks */ CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "usbh", &clk_usbh), -@@ -393,6 +397,7 @@ static struct clk_lookup bcm6328_clks[] +@@ -399,6 +403,7 @@ static struct clk_lookup bcm6328_clks[] static struct clk_lookup bcm6338_clks[] = { /* fixed rate clocks */ CLKDEV_INIT(NULL, "periph", &clk_periph), @@ -39,7 +39,7 @@ Signed-off-by: Jonas Gorski /* gated clocks */ CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -405,6 +410,7 @@ static struct clk_lookup bcm6338_clks[] +@@ -411,6 +416,7 @@ static struct clk_lookup bcm6338_clks[] static struct clk_lookup bcm6345_clks[] = { /* fixed rate clocks */ CLKDEV_INIT(NULL, "periph", &clk_periph), @@ -47,7 +47,7 @@ Signed-off-by: Jonas Gorski /* gated clocks */ CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -417,6 +423,7 @@ static struct clk_lookup bcm6345_clks[] +@@ -423,6 +429,7 @@ static struct clk_lookup bcm6345_clks[] static struct clk_lookup bcm6348_clks[] = { /* fixed rate clocks */ CLKDEV_INIT(NULL, "periph", &clk_periph), @@ -55,7 +55,7 @@ Signed-off-by: Jonas Gorski /* gated clocks */ CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -429,6 +436,8 @@ static struct clk_lookup bcm6348_clks[] +@@ -435,6 +442,8 @@ static struct clk_lookup bcm6348_clks[] static struct clk_lookup bcm6358_clks[] = { /* fixed rate clocks */ CLKDEV_INIT(NULL, "periph", &clk_periph), @@ -64,7 +64,7 @@ Signed-off-by: Jonas Gorski /* gated clocks */ CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -442,6 +451,8 @@ static struct clk_lookup bcm6358_clks[] +@@ -448,6 +457,8 @@ static struct clk_lookup bcm6358_clks[] static struct clk_lookup bcm6362_clks[] = { /* fixed rate clocks */ CLKDEV_INIT(NULL, "periph", &clk_periph), @@ -73,7 +73,7 @@ Signed-off-by: Jonas Gorski /* gated clocks */ CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "usbh", &clk_usbh), -@@ -455,6 +466,8 @@ static struct clk_lookup bcm6362_clks[] +@@ -461,6 +472,8 @@ static struct clk_lookup bcm6362_clks[] static struct clk_lookup bcm6368_clks[] = { /* fixed rate clocks */ CLKDEV_INIT(NULL, "periph", &clk_periph), diff --git a/target/linux/brcm63xx/patches-4.14/001-4.15-05-MIPS-BCM63XX-move-the-HSSPI-PLL-HZ-into-its-own-cloc.patch b/target/linux/brcm63xx/patches-4.14/001-4.15-05-MIPS-BCM63XX-move-the-HSSPI-PLL-HZ-into-its-own-cloc.patch index 734fd7e500..582b91307b 100644 --- a/target/linux/brcm63xx/patches-4.14/001-4.15-05-MIPS-BCM63XX-move-the-HSSPI-PLL-HZ-into-its-own-cloc.patch +++ b/target/linux/brcm63xx/patches-4.14/001-4.15-05-MIPS-BCM63XX-move-the-HSSPI-PLL-HZ-into-its-own-cloc.patch @@ -26,7 +26,7 @@ Signed-off-by: Jonas Gorski /* * XTM clock -@@ -386,6 +390,7 @@ static struct clk_lookup bcm6328_clks[] +@@ -392,6 +396,7 @@ static struct clk_lookup bcm6328_clks[] CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), @@ -34,7 +34,7 @@ Signed-off-by: Jonas Gorski /* gated clocks */ CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "usbh", &clk_usbh), -@@ -453,6 +458,7 @@ static struct clk_lookup bcm6362_clks[] +@@ -459,6 +464,7 @@ static struct clk_lookup bcm6362_clks[] CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), @@ -42,7 +42,7 @@ Signed-off-by: Jonas Gorski /* gated clocks */ CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "usbh", &clk_usbh), -@@ -487,7 +493,7 @@ static int __init bcm63xx_clk_init(void) +@@ -493,7 +499,7 @@ static int __init bcm63xx_clk_init(void) clkdev_add_table(bcm3368_clks, ARRAY_SIZE(bcm3368_clks)); break; case BCM6328_CPU_ID: @@ -51,7 +51,7 @@ Signed-off-by: Jonas Gorski clkdev_add_table(bcm6328_clks, ARRAY_SIZE(bcm6328_clks)); break; case BCM6338_CPU_ID: -@@ -503,7 +509,7 @@ static int __init bcm63xx_clk_init(void) +@@ -509,7 +515,7 @@ static int __init bcm63xx_clk_init(void) clkdev_add_table(bcm6358_clks, ARRAY_SIZE(bcm6358_clks)); break; case BCM6362_CPU_ID: diff --git a/target/linux/brcm63xx/patches-4.14/001-4.15-06-MIPS-BCM63XX-provide-enet-clocks-as-enet-to-the-ethe.patch b/target/linux/brcm63xx/patches-4.14/001-4.15-06-MIPS-BCM63XX-provide-enet-clocks-as-enet-to-the-ethe.patch index 39ce045f7c..339e9fa263 100644 --- a/target/linux/brcm63xx/patches-4.14/001-4.15-06-MIPS-BCM63XX-provide-enet-clocks-as-enet-to-the-ethe.patch +++ b/target/linux/brcm63xx/patches-4.14/001-4.15-06-MIPS-BCM63XX-provide-enet-clocks-as-enet-to-the-ethe.patch @@ -15,7 +15,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/clk.c +++ b/arch/mips/bcm63xx/clk.c -@@ -383,6 +383,8 @@ static struct clk_lookup bcm3368_clks[] +@@ -389,6 +389,8 @@ static struct clk_lookup bcm3368_clks[] CLKDEV_INIT(NULL, "usbd", &clk_usbd), CLKDEV_INIT(NULL, "spi", &clk_spi), CLKDEV_INIT(NULL, "pcm", &clk_pcm), @@ -24,7 +24,7 @@ Signed-off-by: Jonas Gorski }; static struct clk_lookup bcm6328_clks[] = { -@@ -410,6 +412,7 @@ static struct clk_lookup bcm6338_clks[] +@@ -416,6 +418,7 @@ static struct clk_lookup bcm6338_clks[] CLKDEV_INIT(NULL, "usbh", &clk_usbh), CLKDEV_INIT(NULL, "usbd", &clk_usbd), CLKDEV_INIT(NULL, "spi", &clk_spi), @@ -32,7 +32,7 @@ Signed-off-by: Jonas Gorski }; static struct clk_lookup bcm6345_clks[] = { -@@ -423,6 +426,7 @@ static struct clk_lookup bcm6345_clks[] +@@ -429,6 +432,7 @@ static struct clk_lookup bcm6345_clks[] CLKDEV_INIT(NULL, "usbh", &clk_usbh), CLKDEV_INIT(NULL, "usbd", &clk_usbd), CLKDEV_INIT(NULL, "spi", &clk_spi), @@ -40,7 +40,7 @@ Signed-off-by: Jonas Gorski }; static struct clk_lookup bcm6348_clks[] = { -@@ -436,6 +440,8 @@ static struct clk_lookup bcm6348_clks[] +@@ -442,6 +446,8 @@ static struct clk_lookup bcm6348_clks[] CLKDEV_INIT(NULL, "usbh", &clk_usbh), CLKDEV_INIT(NULL, "usbd", &clk_usbd), CLKDEV_INIT(NULL, "spi", &clk_spi), @@ -49,7 +49,7 @@ Signed-off-by: Jonas Gorski }; static struct clk_lookup bcm6358_clks[] = { -@@ -451,6 +457,8 @@ static struct clk_lookup bcm6358_clks[] +@@ -457,6 +463,8 @@ static struct clk_lookup bcm6358_clks[] CLKDEV_INIT(NULL, "usbd", &clk_usbd), CLKDEV_INIT(NULL, "spi", &clk_spi), CLKDEV_INIT(NULL, "pcm", &clk_pcm), diff --git a/target/linux/brcm63xx/patches-4.14/001-4.15-07-MIPS-BCM63XX-split-out-swpkt_sar-usb-clocks.patch b/target/linux/brcm63xx/patches-4.14/001-4.15-07-MIPS-BCM63XX-split-out-swpkt_sar-usb-clocks.patch index a59aedaf66..0b95e18814 100644 --- a/target/linux/brcm63xx/patches-4.14/001-4.15-07-MIPS-BCM63XX-split-out-swpkt_sar-usb-clocks.patch +++ b/target/linux/brcm63xx/patches-4.14/001-4.15-07-MIPS-BCM63XX-split-out-swpkt_sar-usb-clocks.patch @@ -94,7 +94,7 @@ Signed-off-by: Jonas Gorski if (enable) { /* reset sar core afer clock change */ -@@ -457,6 +496,8 @@ static struct clk_lookup bcm6358_clks[] +@@ -463,6 +502,8 @@ static struct clk_lookup bcm6358_clks[] CLKDEV_INIT(NULL, "usbd", &clk_usbd), CLKDEV_INIT(NULL, "spi", &clk_spi), CLKDEV_INIT(NULL, "pcm", &clk_pcm), diff --git a/target/linux/brcm63xx/patches-4.14/339-MIPS-BCM63XX-add-support-for-BCM63268.patch b/target/linux/brcm63xx/patches-4.14/339-MIPS-BCM63XX-add-support-for-BCM63268.patch index 8554976b6f..6a73e96a1d 100644 --- a/target/linux/brcm63xx/patches-4.14/339-MIPS-BCM63XX-add-support-for-BCM63268.patch +++ b/target/linux/brcm63xx/patches-4.14/339-MIPS-BCM63XX-add-support-for-BCM63268.patch @@ -107,7 +107,7 @@ Signed-off-by: Jonas Gorski } static struct clk clk_pcie = { -@@ -542,6 +556,21 @@ static struct clk_lookup bcm6368_clks[] +@@ -548,6 +562,21 @@ static struct clk_lookup bcm6368_clks[] CLKDEV_INIT(NULL, "ipsec", &clk_ipsec), }; @@ -129,7 +129,7 @@ Signed-off-by: Jonas Gorski #define HSSPI_PLL_HZ_6328 133333333 #define HSSPI_PLL_HZ_6362 400000000 -@@ -574,6 +603,10 @@ static int __init bcm63xx_clk_init(void) +@@ -580,6 +609,10 @@ static int __init bcm63xx_clk_init(void) case BCM6368_CPU_ID: clkdev_add_table(bcm6368_clks, ARRAY_SIZE(bcm6368_clks)); break; diff --git a/target/linux/brcm63xx/patches-4.14/341-MIPS-BCM63XX-add-support-for-BCM6318.patch b/target/linux/brcm63xx/patches-4.14/341-MIPS-BCM63XX-add-support-for-BCM6318.patch index 9d235f03f1..d155d91785 100644 --- a/target/linux/brcm63xx/patches-4.14/341-MIPS-BCM63XX-add-support-for-BCM6318.patch +++ b/target/linux/brcm63xx/patches-4.14/341-MIPS-BCM63XX-add-support-for-BCM6318.patch @@ -57,7 +57,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 mask = CKCTL_6328_HSSPI_EN; else if (BCMCPU_IS_6362()) mask = CKCTL_6362_HSSPI_EN; -@@ -450,6 +452,19 @@ static struct clk_lookup bcm3368_clks[] +@@ -456,6 +458,19 @@ static struct clk_lookup bcm3368_clks[] CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet1), }; @@ -77,7 +77,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 static struct clk_lookup bcm6328_clks[] = { /* fixed rate clocks */ CLKDEV_INIT(NULL, "periph", &clk_periph), -@@ -571,6 +586,7 @@ static struct clk_lookup bcm63268_clks[] +@@ -577,6 +592,7 @@ static struct clk_lookup bcm63268_clks[] CLKDEV_INIT(NULL, "pcie", &clk_pcie), }; @@ -85,7 +85,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 #define HSSPI_PLL_HZ_6328 133333333 #define HSSPI_PLL_HZ_6362 400000000 -@@ -580,6 +596,10 @@ static int __init bcm63xx_clk_init(void) +@@ -586,6 +602,10 @@ static int __init bcm63xx_clk_init(void) case BCM3368_CPU_ID: clkdev_add_table(bcm3368_clks, ARRAY_SIZE(bcm3368_clks)); break; diff --git a/target/linux/brcm63xx/patches-4.14/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch b/target/linux/brcm63xx/patches-4.14/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch index 45d4b8487c..d6b1190b9d 100644 --- a/target/linux/brcm63xx/patches-4.14/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch +++ b/target/linux/brcm63xx/patches-4.14/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch @@ -9,7 +9,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree --- a/arch/mips/bcm63xx/clk.c +++ b/arch/mips/bcm63xx/clk.c -@@ -495,6 +495,8 @@ static struct clk_lookup bcm3368_clks[] +@@ -501,6 +501,8 @@ static struct clk_lookup bcm3368_clks[] CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), @@ -18,7 +18,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree /* gated clocks */ CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -511,7 +513,9 @@ static struct clk_lookup bcm6318_clks[] +@@ -517,7 +519,9 @@ static struct clk_lookup bcm6318_clks[] /* fixed rate clocks */ CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), @@ -28,7 +28,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree /* gated clocks */ CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "usbh", &clk_usbh), -@@ -525,7 +529,10 @@ static struct clk_lookup bcm6328_clks[] +@@ -531,7 +535,10 @@ static struct clk_lookup bcm6328_clks[] CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), @@ -39,7 +39,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree /* gated clocks */ CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "usbh", &clk_usbh), -@@ -538,6 +545,7 @@ static struct clk_lookup bcm6338_clks[] +@@ -544,6 +551,7 @@ static struct clk_lookup bcm6338_clks[] /* fixed rate clocks */ CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), @@ -47,7 +47,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree /* gated clocks */ CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -552,6 +560,7 @@ static struct clk_lookup bcm6345_clks[] +@@ -558,6 +566,7 @@ static struct clk_lookup bcm6345_clks[] /* fixed rate clocks */ CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), @@ -55,7 +55,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree /* gated clocks */ CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -566,6 +575,7 @@ static struct clk_lookup bcm6348_clks[] +@@ -572,6 +581,7 @@ static struct clk_lookup bcm6348_clks[] /* fixed rate clocks */ CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), @@ -63,7 +63,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree /* gated clocks */ CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -582,6 +592,8 @@ static struct clk_lookup bcm6358_clks[] +@@ -588,6 +598,8 @@ static struct clk_lookup bcm6358_clks[] CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), @@ -72,7 +72,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree /* gated clocks */ CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -601,7 +613,10 @@ static struct clk_lookup bcm6362_clks[] +@@ -607,7 +619,10 @@ static struct clk_lookup bcm6362_clks[] CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), @@ -83,7 +83,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree /* gated clocks */ CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "usbh", &clk_usbh), -@@ -617,6 +632,8 @@ static struct clk_lookup bcm6368_clks[] +@@ -623,6 +638,8 @@ static struct clk_lookup bcm6368_clks[] CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), @@ -92,7 +92,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree /* gated clocks */ CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "usbh", &clk_usbh), -@@ -631,7 +648,10 @@ static struct clk_lookup bcm63268_clks[] +@@ -637,7 +654,10 @@ static struct clk_lookup bcm63268_clks[] CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), diff --git a/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch b/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch index ed532a0ee0..90e3500f0e 100644 --- a/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch +++ b/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch @@ -92,7 +92,7 @@ Signed-off-by: Pablo Neira Ayuso #endif --- a/net/bridge/br_netfilter_hooks.c +++ b/net/bridge/br_netfilter_hooks.c -@@ -994,7 +994,7 @@ int br_nf_hook_thresh(unsigned int hook, +@@ -993,7 +993,7 @@ int br_nf_hook_thresh(unsigned int hook, unsigned int i; int ret; diff --git a/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch index c7aa998517..40a539be9d 100644 --- a/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch +++ b/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch @@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau #define PPP_VERSION "2.4.2" /* -@@ -1393,12 +1398,37 @@ static void ppp_dev_priv_destructor(stru +@@ -1398,12 +1403,37 @@ static void ppp_dev_priv_destructor(stru ppp_destroy_interface(ppp); } diff --git a/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch b/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch index f4893afb7a..96ab448a86 100644 --- a/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch @@ -2131,8 +2131,8 @@ Signed-off-by: Zhao Qiang struct device_node *internal_phy_node; /* List of multicast addresses */ struct list_head mc_addr_list; -@@ -106,7 +104,7 @@ static void set_fman_mac_params(struct m - resource_size(mac_dev->res)); +@@ -109,7 +107,7 @@ static int set_fman_mac_params(struct ma + memcpy(¶ms->addr, mac_dev->addr, sizeof(mac_dev->addr)); params->max_speed = priv->max_speed; - params->phy_if = priv->phy_if; @@ -2140,7 +2140,7 @@ Signed-off-by: Zhao Qiang params->basex_if = false; params->mac_id = priv->cell_index; params->fm = (void *)priv->fman; -@@ -419,15 +417,12 @@ void fman_get_pause_cfg(struct mac_devic +@@ -430,15 +428,12 @@ void fman_get_pause_cfg(struct mac_devic } EXPORT_SYMBOL(fman_get_pause_cfg); @@ -2158,7 +2158,7 @@ Signed-off-by: Zhao Qiang struct phy_device *phy_dev = mac_dev->phy_dev; struct fman_mac *fman_mac; bool rx_pause, tx_pause; -@@ -444,14 +439,12 @@ static void adjust_link_dtsec(struct net +@@ -455,14 +450,12 @@ static void adjust_link_dtsec(struct net fman_get_pause_cfg(mac_dev, &rx_pause, &tx_pause); err = fman_set_mac_active_pause(mac_dev, rx_pause, tx_pause); if (err < 0) @@ -2176,7 +2176,7 @@ Signed-off-by: Zhao Qiang struct phy_device *phy_dev = mac_dev->phy_dev; struct fman_mac *fman_mac; bool rx_pause, tx_pause; -@@ -463,60 +456,12 @@ static void adjust_link_memac(struct net +@@ -474,60 +467,12 @@ static void adjust_link_memac(struct net fman_get_pause_cfg(mac_dev, &rx_pause, &tx_pause); err = fman_set_mac_active_pause(mac_dev, rx_pause, tx_pause); if (err < 0) @@ -2239,7 +2239,7 @@ Signed-off-by: Zhao Qiang mac_dev->init = dtsec_initialization; mac_dev->set_promisc = dtsec_set_promiscuous; mac_dev->change_addr = dtsec_modify_mac_address; -@@ -525,17 +470,18 @@ static void setup_dtsec(struct mac_devic +@@ -536,17 +481,18 @@ static void setup_dtsec(struct mac_devic mac_dev->set_tx_pause = dtsec_set_tx_pause_frames; mac_dev->set_rx_pause = dtsec_accept_rx_pause_frames; mac_dev->set_exception = dtsec_set_exception; @@ -2260,7 +2260,7 @@ Signed-off-by: Zhao Qiang mac_dev->init = tgec_initialization; mac_dev->set_promisc = tgec_set_promiscuous; mac_dev->change_addr = tgec_modify_mac_address; -@@ -544,17 +490,18 @@ static void setup_tgec(struct mac_device +@@ -555,17 +501,18 @@ static void setup_tgec(struct mac_device mac_dev->set_tx_pause = tgec_set_tx_pause_frames; mac_dev->set_rx_pause = tgec_accept_rx_pause_frames; mac_dev->set_exception = tgec_set_exception; @@ -2281,7 +2281,7 @@ Signed-off-by: Zhao Qiang mac_dev->init = memac_initialization; mac_dev->set_promisc = memac_set_promiscuous; mac_dev->change_addr = memac_modify_mac_address; -@@ -563,10 +510,12 @@ static void setup_memac(struct mac_devic +@@ -574,10 +521,12 @@ static void setup_memac(struct mac_devic mac_dev->set_tx_pause = memac_set_tx_pause_frames; mac_dev->set_rx_pause = memac_accept_rx_pause_frames; mac_dev->set_exception = memac_set_exception; @@ -2295,7 +2295,7 @@ Signed-off-by: Zhao Qiang mac_dev->priv->enable = memac_enable; mac_dev->priv->disable = memac_disable; } -@@ -599,8 +548,7 @@ static const u16 phy2speed[] = { +@@ -610,8 +559,7 @@ static const u16 phy2speed[] = { }; static struct platform_device *dpaa_eth_add_device(int fman_id, @@ -2305,7 +2305,7 @@ Signed-off-by: Zhao Qiang { struct platform_device *pdev; struct dpaa_eth_data data; -@@ -613,19 +561,15 @@ static struct platform_device *dpaa_eth_ +@@ -624,19 +572,15 @@ static struct platform_device *dpaa_eth_ data.mac_dev = mac_dev; data.mac_hw_id = priv->cell_index; data.fman_hw_id = fman_id; @@ -2325,7 +2325,7 @@ Signed-off-by: Zhao Qiang ret = platform_device_add_data(pdev, &data, sizeof(data)); if (ret) -@@ -676,7 +620,6 @@ static int mac_probe(struct platform_dev +@@ -687,7 +631,6 @@ static int mac_probe(struct platform_dev mac_dev = devm_kzalloc(dev, sizeof(*mac_dev), GFP_KERNEL); if (!mac_dev) { err = -ENOMEM; @@ -2333,7 +2333,7 @@ Signed-off-by: Zhao Qiang goto _return; } priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); -@@ -706,9 +649,6 @@ static int mac_probe(struct platform_dev +@@ -717,9 +660,6 @@ static int mac_probe(struct platform_dev goto _return; } @@ -2343,7 +2343,7 @@ Signed-off-by: Zhao Qiang INIT_LIST_HEAD(&priv->mc_addr_list); /* Get the FM node */ -@@ -717,7 +657,7 @@ static int mac_probe(struct platform_dev +@@ -728,7 +668,7 @@ static int mac_probe(struct platform_dev dev_err(dev, "of_get_parent(%pOF) failed\n", mac_node); err = -EINVAL; @@ -2352,7 +2352,7 @@ Signed-off-by: Zhao Qiang } of_dev = of_find_device_by_node(dev_node); -@@ -751,7 +691,7 @@ static int mac_probe(struct platform_dev +@@ -762,7 +702,7 @@ static int mac_probe(struct platform_dev if (err < 0) { dev_err(dev, "of_address_to_resource(%pOF) = %d\n", mac_node, err); @@ -2361,7 +2361,7 @@ Signed-off-by: Zhao Qiang } mac_dev->res = __devm_request_region(dev, -@@ -761,7 +701,7 @@ static int mac_probe(struct platform_dev +@@ -772,7 +712,7 @@ static int mac_probe(struct platform_dev if (!mac_dev->res) { dev_err(dev, "__devm_request_mem_region(mac) failed\n"); err = -EBUSY; @@ -2370,7 +2370,7 @@ Signed-off-by: Zhao Qiang } priv->vaddr = devm_ioremap(dev, mac_dev->res->start, -@@ -769,16 +709,12 @@ static int mac_probe(struct platform_dev +@@ -780,16 +720,12 @@ static int mac_probe(struct platform_dev if (!priv->vaddr) { dev_err(dev, "devm_ioremap() failed\n"); err = -EIO; @@ -2390,7 +2390,7 @@ Signed-off-by: Zhao Qiang } /* Get the cell-index */ -@@ -786,7 +722,7 @@ static int mac_probe(struct platform_dev +@@ -797,7 +733,7 @@ static int mac_probe(struct platform_dev if (err) { dev_err(dev, "failed to read cell-index for %pOF\n", mac_node); err = -EINVAL; @@ -2399,7 +2399,7 @@ Signed-off-by: Zhao Qiang } priv->cell_index = (u8)val; -@@ -795,7 +731,7 @@ static int mac_probe(struct platform_dev +@@ -806,7 +742,7 @@ static int mac_probe(struct platform_dev if (!mac_addr) { dev_err(dev, "of_get_mac_address(%pOF) failed\n", mac_node); err = -EINVAL; @@ -2408,7 +2408,7 @@ Signed-off-by: Zhao Qiang } memcpy(mac_dev->addr, mac_addr, sizeof(mac_dev->addr)); -@@ -805,14 +741,14 @@ static int mac_probe(struct platform_dev +@@ -816,14 +752,14 @@ static int mac_probe(struct platform_dev dev_err(dev, "of_count_phandle_with_args(%pOF, fsl,fman-ports) failed\n", mac_node); err = nph; @@ -2425,7 +2425,7 @@ Signed-off-by: Zhao Qiang } for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) { -@@ -851,13 +787,13 @@ static int mac_probe(struct platform_dev +@@ -862,13 +798,13 @@ static int mac_probe(struct platform_dev mac_node); phy_if = PHY_INTERFACE_MODE_SGMII; } @@ -2442,7 +2442,7 @@ Signed-off-by: Zhao Qiang mac_dev->if_support &= ~(SUPPORTED_10baseT_Half | SUPPORTED_100baseT_Half); -@@ -866,30 +802,31 @@ static int mac_probe(struct platform_dev +@@ -877,30 +813,31 @@ static int mac_probe(struct platform_dev mac_dev->if_support |= SUPPORTED_1000baseT_Full; /* The 10G interface only supports one mode */ @@ -2482,7 +2482,7 @@ Signed-off-by: Zhao Qiang } priv->fixed_link->link = phy->link; -@@ -904,8 +841,8 @@ static int mac_probe(struct platform_dev +@@ -915,8 +852,8 @@ static int mac_probe(struct platform_dev err = mac_dev->init(mac_dev); if (err < 0) { dev_err(dev, "mac_dev->init() = %d\n", err); @@ -2493,7 +2493,7 @@ Signed-off-by: Zhao Qiang } /* pause frame autonegotiation enabled */ -@@ -926,7 +863,7 @@ static int mac_probe(struct platform_dev +@@ -937,7 +874,7 @@ static int mac_probe(struct platform_dev mac_dev->addr[0], mac_dev->addr[1], mac_dev->addr[2], mac_dev->addr[3], mac_dev->addr[4], mac_dev->addr[5]); @@ -2502,7 +2502,7 @@ Signed-off-by: Zhao Qiang if (IS_ERR(priv->eth_dev)) { dev_err(dev, "failed to add Ethernet platform device for MAC %d\n", priv->cell_index); -@@ -937,9 +874,8 @@ static int mac_probe(struct platform_dev +@@ -948,9 +885,8 @@ static int mac_probe(struct platform_dev _return_of_node_put: of_node_put(dev_node); -- 2.30.2