fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: bump to 4.9.303, 4.14.268, 4.19.231

Browse Source 
Added new Kconfig.

Manually rebased:
- generic/backport-4.19/716-v5.4-net-sfp-move-fwnode-parsing-into-sfp-bus-layer.patch

Refreshed all patches.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2022-02-25 05:03:08 +08:00
parent 8c0a0ad598
commit 3ade45c5fa
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
90 changed files with 350 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/kernel-version.mk
View File

@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif
LINUX_VERSION-4.9 = .297
LINUX_VERSION-4.14 = .262
LINUX_VERSION-4.19 = .225
LINUX_VERSION-4.9 = .303
LINUX_VERSION-4.14 = .268
LINUX_VERSION-4.19 = .231
LINUX_KERNEL_HASH-4.9.297 = e43ba8cde809b3126a5192f5a8a83f47134a138955ce6811672f5f704db6d89f
LINUX_KERNEL_HASH-4.14.262 = 4cfd785381edbfcd86dfb1cd8d264d872643d71afd2b832fa2090f5b7228d417
LINUX_KERNEL_HASH-4.19.225 = 4b9ab3979541cd436b7b7e8905c77ffcf594a9cf4ea3fb9474ef95fe09586796
LINUX_KERNEL_HASH-4.9.303 = 45e9050fc13df0fe2fe291512d261a07a7649b82a00c134eda0abc3a19121ae5
LINUX_KERNEL_HASH-4.14.268 = cf62422aaa7f5a888ed3e5baeb89b90ba697cb712e653e52fd7dd8220f11b6f5
LINUX_KERNEL_HASH-4.19.231 = 673123b3b3b05e2d8586c82a342ff2556e0b1f2caaadd643fefb9d91d58d8131
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

4
target/linux/bcm27xx/patches-4.19/950-0019-Register-the-clocks-early-during-the-boot-process-so.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -2186,8 +2186,15 @@ static int bcm2835_clk_probe(struct plat
@@ -2181,8 +2181,15 @@ static int bcm2835_clk_probe(struct plat
if (ret)
return ret;
@ -30,7 +30,7 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
}
static const struct of_device_id bcm2835_clk_of_match[] = {
@@ -2204,7 +2211,11 @@ static struct platform_driver bcm2835_cl
@@ -2199,7 +2206,11 @@ static struct platform_driver bcm2835_cl
.probe = bcm2835_clk_probe,
};

2
target/linux/bcm27xx/patches-4.19/950-0022-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1364,6 +1364,11 @@ bcm2835_register_pll_divider(struct bcm2
@@ -1359,6 +1359,11 @@ bcm2835_register_pll_divider(struct bcm2
divider->div.hw.init = &init;
divider->div.table = NULL;

14
target/linux/bcm27xx/patches-4.19/950-0023-clk-bcm2835-Add-claim-clocks-property.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1294,6 +1294,8 @@ static const struct clk_ops bcm2835_vpu_
@@ -1289,6 +1289,8 @@ static const struct clk_ops bcm2835_vpu_
.debug_init = bcm2835_clock_debug_init,
};
@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman,
const struct bcm2835_pll_data *data)
{
@@ -1310,6 +1312,9 @@ static struct clk_hw *bcm2835_register_p
@@ -1305,6 +1307,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 <phil@raspberrypi.org>
pll = kzalloc(sizeof(*pll), GFP_KERNEL);
if (!pll)
return NULL;
@@ -1365,8 +1370,10 @@ bcm2835_register_pll_divider(struct bcm2
@@ -1360,8 +1365,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 <phil@raspberrypi.org>
}
divider->cprman = cprman;
@@ -2118,6 +2125,8 @@ static const struct bcm2835_clk_desc clk
@@ -2113,6 +2120,8 @@ static const struct bcm2835_clk_desc clk
.ctl_reg = CM_PERIICTL),
};
@ -58,7 +58,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/*
* Permanently take a reference on the parent of the SDRAM clock.
*
@@ -2137,6 +2146,19 @@ static int bcm2835_mark_sdc_parent_criti
@@ -2132,6 +2141,19 @@ static int bcm2835_mark_sdc_parent_criti
return clk_prepare_enable(parent);
}
@ -78,7 +78,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static int bcm2835_clk_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -2146,6 +2168,7 @@ static int bcm2835_clk_probe(struct plat
@@ -2141,6 +2163,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 <phil@raspberrypi.org>
int ret;
cprman = devm_kzalloc(dev,
@@ -2161,6 +2184,13 @@ static int bcm2835_clk_probe(struct plat
@@ -2156,6 +2179,13 @@ static int bcm2835_clk_probe(struct plat
if (IS_ERR(cprman->regs))
return PTR_ERR(cprman->regs);

8
target/linux/bcm27xx/patches-4.19/950-0024-clk-bcm2835-Read-max-core-clock-from-firmware.patch
View File

@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
spinlock_t regs_lock; /* spinlock for all clocks */
/*
@@ -998,6 +1002,30 @@ static unsigned long bcm2835_clock_get_r
@@ -993,6 +997,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 <phil@raspberrypi.org>
static void bcm2835_clock_wait_busy(struct bcm2835_clock *clock)
{
struct bcm2835_cprman *cprman = clock->cprman;
@@ -1286,7 +1314,7 @@ static int bcm2835_vpu_clock_is_on(struc
@@ -1281,7 +1309,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 <phil@raspberrypi.org>
.set_rate = bcm2835_clock_set_rate,
.determine_rate = bcm2835_clock_determine_rate,
.set_parent = bcm2835_clock_set_parent,
@@ -2167,6 +2195,7 @@ static int bcm2835_clk_probe(struct plat
@@ -2162,6 +2190,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 <phil@raspberrypi.org>
size_t i;
u32 clk_id;
int ret;
@@ -2184,6 +2213,14 @@ static int bcm2835_clk_probe(struct plat
@@ -2179,6 +2208,14 @@ static int bcm2835_clk_probe(struct plat
if (IS_ERR(cprman->regs))
return PTR_ERR(cprman->regs);

2
target/linux/bcm27xx/patches-4.19/950-0025-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch
View File

@ -20,7 +20,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1456,6 +1456,15 @@ static struct clk_hw *bcm2835_register_c
@@ -1451,6 +1451,15 @@ static struct clk_hw *bcm2835_register_c
init.flags = data->flags | CLK_IGNORE_UNUSED;
/*

2
target/linux/bcm27xx/patches-4.19/950-0033-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch
View File

@ -14,7 +14,7 @@ use the same logic.
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -2578,7 +2578,12 @@ static int pl011_setup_port(struct devic
@@ -2557,7 +2557,12 @@ static int pl011_setup_port(struct devic
if (IS_ERR(base))
return PTR_ERR(base);

6
target/linux/bcm27xx/patches-4.19/950-0034-amba_pl011-Round-input-clock-up.patch
View File

@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/* Clear pending error and receive interrupts */
pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS |
@@ -2324,7 +2341,7 @@ static int pl011_console_setup(struct co
@@ -2303,7 +2320,7 @@ static int pl011_console_setup(struct co
plat->init();
}
@ -68,7 +68,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
if (uap->vendor->fixed_options) {
baud = uap->fixed_baud;
@@ -2509,6 +2526,7 @@ static struct uart_driver amba_reg = {
@@ -2488,6 +2505,7 @@ static struct uart_driver amba_reg = {
.cons = AMBA_CONSOLE,
};
@ -76,7 +76,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static int pl011_probe_dt_alias(int index, struct device *dev)
{
struct device_node *np;
@@ -2540,6 +2558,7 @@ static int pl011_probe_dt_alias(int inde
@@ -2519,6 +2537,7 @@ static int pl011_probe_dt_alias(int inde
return ret;
}

2
target/linux/bcm27xx/patches-4.19/950-0036-amba_pl011-Add-cts-event-workaround-DT-property.patch
View File

@ -33,7 +33,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -2665,6 +2665,11 @@ static int pl011_probe(struct amba_devic
@@ -2644,6 +2644,11 @@ static int pl011_probe(struct amba_devic
if (IS_ERR(uap->clk))
return PTR_ERR(uap->clk);

2
target/linux/bcm27xx/patches-4.19/950-0039-Add-dwc_otg-driver.patch
View File

@ -917,7 +917,7 @@ Fixes https://github.com/raspberrypi/linux/issues/2408
}
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -5307,7 +5307,7 @@ static void port_event(struct usb_hub *h
@@ -5310,7 +5310,7 @@ static void port_event(struct usb_hub *h
u16 status = 0, unused;
port_dev->over_current_count++;

2
target/linux/bcm27xx/patches-4.19/950-0276-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -2273,7 +2273,7 @@ static int bcm2835_clk_probe(struct plat
@@ -2268,7 +2268,7 @@ static int bcm2835_clk_probe(struct plat
return ret;
/* note that we have registered all the clocks */

2
target/linux/bcm27xx/patches-4.19/950-0470-bcmgenet-Better-coalescing-parameter-defaults.patch
View File

@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/* Disable rate control for now */
bcmgenet_tdma_ring_writel(priv, index, flow_period_val,
TDMA_FLOW_PERIOD);
@@ -3583,9 +3583,12 @@ static int bcmgenet_probe(struct platfor
@@ -3585,9 +3585,12 @@ static int bcmgenet_probe(struct platfor
netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1);
/* Set default coalescing parameters */

4
target/linux/bcm27xx/patches-4.19/950-0533-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1097,15 +1097,19 @@ static int bcm2835_clock_set_rate(struct
@@ -1092,15 +1092,19 @@ static int bcm2835_clock_set_rate(struct
spin_lock(&cprman->regs_lock);
@ -42,7 +42,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0;
cprman_write(cprman, data->ctl_reg, ctl);
@@ -1477,7 +1481,7 @@ static struct clk_hw *bcm2835_register_c
@@ -1472,7 +1476,7 @@ static struct clk_hw *bcm2835_register_c
init.ops = &bcm2835_vpu_clock_clk_ops;
} else {
init.ops = &bcm2835_clock_clk_ops;

10
target/linux/bcm27xx/patches-4.19/950-0534-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1086,8 +1086,10 @@ static int bcm2835_clock_on(struct clk_h
@@ -1081,8 +1081,10 @@ static int bcm2835_clock_on(struct clk_h
return 0;
}
@ -28,7 +28,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
{
struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);
struct bcm2835_cprman *cprman = clock->cprman;
@@ -1109,6 +1111,11 @@ static int bcm2835_clock_set_rate(struct
@@ -1104,6 +1106,11 @@ static int bcm2835_clock_set_rate(struct
bcm2835_clock_wait_busy(clock);
}
@ -40,7 +40,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
ctl &= ~CM_FRAC;
ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0;
cprman_write(cprman, data->ctl_reg, ctl);
@@ -1120,6 +1127,12 @@ static int bcm2835_clock_set_rate(struct
@@ -1115,6 +1122,12 @@ static int bcm2835_clock_set_rate(struct
return 0;
}
@ -53,7 +53,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
static bool
bcm2835_clk_is_pllc(struct clk_hw *hw)
{
@@ -1303,6 +1316,7 @@ static const struct clk_ops bcm2835_cloc
@@ -1298,6 +1311,7 @@ static const struct clk_ops bcm2835_cloc
.unprepare = bcm2835_clock_off,
.recalc_rate = bcm2835_clock_get_rate,
.set_rate = bcm2835_clock_set_rate,
@ -61,7 +61,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
.determine_rate = bcm2835_clock_determine_rate,
.set_parent = bcm2835_clock_set_parent,
.get_parent = bcm2835_clock_get_parent,
@@ -1481,7 +1495,6 @@ static struct clk_hw *bcm2835_register_c
@@ -1476,7 +1490,6 @@ static struct clk_hw *bcm2835_register_c
init.ops = &bcm2835_vpu_clock_clk_ops;
} else {
init.ops = &bcm2835_clock_clk_ops;

2
target/linux/bcm27xx/patches-4.19/950-0572-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch
View File

@ -27,7 +27,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2071,6 +2071,16 @@ reset:
@@ -2092,6 +2092,16 @@ reset:
return ret;
}

116
target/linux/bcm27xx/patches-4.19/950-0714-clk-bcm2835-Introduce-SoC-specific-clock-registratio.patch
View File

@ -52,7 +52,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
static inline void cprman_write(struct bcm2835_cprman *cprman, u32 reg, u32 val)
{
writel(CM_PASSWORD | val, cprman->regs + reg);
@@ -1530,22 +1537,28 @@ typedef struct clk_hw *(*bcm2835_clk_reg
@@ -1525,22 +1532,28 @@ typedef struct clk_hw *(*bcm2835_clk_reg
const void *data);
struct bcm2835_clk_desc {
bcm2835_clk_register clk_register;
@ -89,7 +89,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
&(struct bcm2835_gate_data) \
{__VA_ARGS__})
@@ -1559,7 +1572,8 @@ static const char *const bcm2835_clock_o
@@ -1554,7 +1567,8 @@ static const char *const bcm2835_clock_o
"testdebug1"
};
@ -99,7 +99,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.num_mux_parents = ARRAY_SIZE(bcm2835_clock_osc_parents), \
.parents = bcm2835_clock_osc_parents, \
__VA_ARGS__)
@@ -1576,7 +1590,8 @@ static const char *const bcm2835_clock_p
@@ -1571,7 +1585,8 @@ static const char *const bcm2835_clock_p
"pllh_aux",
};
@ -109,7 +109,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.num_mux_parents = ARRAY_SIZE(bcm2835_clock_per_parents), \
.parents = bcm2835_clock_per_parents, \
__VA_ARGS__)
@@ -1601,7 +1616,8 @@ static const char *const bcm2835_pcm_per
@@ -1596,7 +1611,8 @@ static const char *const bcm2835_pcm_per
"-",
};
@ -119,7 +119,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.num_mux_parents = ARRAY_SIZE(bcm2835_pcm_per_parents), \
.parents = bcm2835_pcm_per_parents, \
__VA_ARGS__)
@@ -1620,7 +1636,8 @@ static const char *const bcm2835_clock_v
@@ -1615,7 +1631,8 @@ static const char *const bcm2835_clock_v
"pllc_core2",
};
@ -129,7 +129,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.num_mux_parents = ARRAY_SIZE(bcm2835_clock_vpu_parents), \
.parents = bcm2835_clock_vpu_parents, \
__VA_ARGS__)
@@ -1656,12 +1673,14 @@ static const char *const bcm2835_clock_d
@@ -1651,12 +1668,14 @@ static const char *const bcm2835_clock_d
"dsi1_byte_inv",
};
@ -146,7 +146,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.num_mux_parents = ARRAY_SIZE(bcm2835_clock_dsi1_parents), \
.parents = bcm2835_clock_dsi1_parents, \
__VA_ARGS__)
@@ -1681,6 +1700,7 @@ static const struct bcm2835_clk_desc clk
@@ -1676,6 +1695,7 @@ static const struct bcm2835_clk_desc clk
* AUDIO domain is on.
*/
[BCM2835_PLLA] = REGISTER_PLL(
@ -154,7 +154,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "plla",
.cm_ctrl_reg = CM_PLLA,
.a2w_ctrl_reg = A2W_PLLA_CTRL,
@@ -1695,6 +1715,7 @@ static const struct bcm2835_clk_desc clk
@@ -1690,6 +1710,7 @@ static const struct bcm2835_clk_desc clk
.max_rate = 2400000000u,
.max_fb_rate = BCM2835_MAX_FB_RATE),
[BCM2835_PLLA_CORE] = REGISTER_PLL_DIV(
@ -162,7 +162,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "plla_core",
.source_pll = "plla",
.cm_reg = CM_PLLA,
@@ -1704,6 +1725,7 @@ static const struct bcm2835_clk_desc clk
@@ -1699,6 +1720,7 @@ static const struct bcm2835_clk_desc clk
.fixed_divider = 1,
.flags = CLK_SET_RATE_PARENT),
[BCM2835_PLLA_PER] = REGISTER_PLL_DIV(
@ -170,7 +170,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "plla_per",
.source_pll = "plla",
.cm_reg = CM_PLLA,
@@ -1713,6 +1735,7 @@ static const struct bcm2835_clk_desc clk
@@ -1708,6 +1730,7 @@ static const struct bcm2835_clk_desc clk
.fixed_divider = 1,
.flags = CLK_SET_RATE_PARENT),
[BCM2835_PLLA_DSI0] = REGISTER_PLL_DIV(
@ -178,7 +178,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "plla_dsi0",
.source_pll = "plla",
.cm_reg = CM_PLLA,
@@ -1721,6 +1744,7 @@ static const struct bcm2835_clk_desc clk
@@ -1716,6 +1739,7 @@ static const struct bcm2835_clk_desc clk
.hold_mask = CM_PLLA_HOLDDSI0,
.fixed_divider = 1),
[BCM2835_PLLA_CCP2] = REGISTER_PLL_DIV(
@ -186,7 +186,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "plla_ccp2",
.source_pll = "plla",
.cm_reg = CM_PLLA,
@@ -1732,6 +1756,7 @@ static const struct bcm2835_clk_desc clk
@@ -1727,6 +1751,7 @@ static const struct bcm2835_clk_desc clk
/* PLLB is used for the ARM's clock. */
[BCM2835_PLLB] = REGISTER_PLL(
@ -194,7 +194,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "pllb",
.cm_ctrl_reg = CM_PLLB,
.a2w_ctrl_reg = A2W_PLLB_CTRL,
@@ -1746,6 +1771,7 @@ static const struct bcm2835_clk_desc clk
@@ -1741,6 +1766,7 @@ static const struct bcm2835_clk_desc clk
.max_rate = 3000000000u,
.max_fb_rate = BCM2835_MAX_FB_RATE),
[BCM2835_PLLB_ARM] = REGISTER_PLL_DIV(
@ -202,7 +202,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "pllb_arm",
.source_pll = "pllb",
.cm_reg = CM_PLLB,
@@ -1762,6 +1788,7 @@ static const struct bcm2835_clk_desc clk
@@ -1757,6 +1783,7 @@ static const struct bcm2835_clk_desc clk
* AUDIO domain is on.
*/
[BCM2835_PLLC] = REGISTER_PLL(
@ -210,7 +210,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "pllc",
.cm_ctrl_reg = CM_PLLC,
.a2w_ctrl_reg = A2W_PLLC_CTRL,
@@ -1776,6 +1803,7 @@ static const struct bcm2835_clk_desc clk
@@ -1771,6 +1798,7 @@ static const struct bcm2835_clk_desc clk
.max_rate = 3000000000u,
.max_fb_rate = BCM2835_MAX_FB_RATE),
[BCM2835_PLLC_CORE0] = REGISTER_PLL_DIV(
@ -218,7 +218,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "pllc_core0",
.source_pll = "pllc",
.cm_reg = CM_PLLC,
@@ -1785,6 +1813,7 @@ static const struct bcm2835_clk_desc clk
@@ -1780,6 +1808,7 @@ static const struct bcm2835_clk_desc clk
.fixed_divider = 1,
.flags = CLK_SET_RATE_PARENT),
[BCM2835_PLLC_CORE1] = REGISTER_PLL_DIV(
@ -226,7 +226,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "pllc_core1",
.source_pll = "pllc",
.cm_reg = CM_PLLC,
@@ -1794,6 +1823,7 @@ static const struct bcm2835_clk_desc clk
@@ -1789,6 +1818,7 @@ static const struct bcm2835_clk_desc clk
.fixed_divider = 1,
.flags = CLK_SET_RATE_PARENT),
[BCM2835_PLLC_CORE2] = REGISTER_PLL_DIV(
@ -234,7 +234,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "pllc_core2",
.source_pll = "pllc",
.cm_reg = CM_PLLC,
@@ -1803,6 +1833,7 @@ static const struct bcm2835_clk_desc clk
@@ -1798,6 +1828,7 @@ static const struct bcm2835_clk_desc clk
.fixed_divider = 1,
.flags = CLK_SET_RATE_PARENT),
[BCM2835_PLLC_PER] = REGISTER_PLL_DIV(
@ -242,7 +242,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "pllc_per",
.source_pll = "pllc",
.cm_reg = CM_PLLC,
@@ -1819,6 +1850,7 @@ static const struct bcm2835_clk_desc clk
@@ -1814,6 +1845,7 @@ static const struct bcm2835_clk_desc clk
* AUDIO domain is on.
*/
[BCM2835_PLLD] = REGISTER_PLL(
@ -250,7 +250,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "plld",
.cm_ctrl_reg = CM_PLLD,
.a2w_ctrl_reg = A2W_PLLD_CTRL,
@@ -1833,6 +1865,7 @@ static const struct bcm2835_clk_desc clk
@@ -1828,6 +1860,7 @@ static const struct bcm2835_clk_desc clk
.max_rate = 2400000000u,
.max_fb_rate = BCM2835_MAX_FB_RATE),
[BCM2835_PLLD_CORE] = REGISTER_PLL_DIV(
@ -258,7 +258,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "plld_core",
.source_pll = "plld",
.cm_reg = CM_PLLD,
@@ -1842,6 +1875,7 @@ static const struct bcm2835_clk_desc clk
@@ -1837,6 +1870,7 @@ static const struct bcm2835_clk_desc clk
.fixed_divider = 1,
.flags = CLK_SET_RATE_PARENT),
[BCM2835_PLLD_PER] = REGISTER_PLL_DIV(
@ -266,7 +266,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "plld_per",
.source_pll = "plld",
.cm_reg = CM_PLLD,
@@ -1851,6 +1885,7 @@ static const struct bcm2835_clk_desc clk
@@ -1846,6 +1880,7 @@ static const struct bcm2835_clk_desc clk
.fixed_divider = 1,
.flags = CLK_SET_RATE_PARENT),
[BCM2835_PLLD_DSI0] = REGISTER_PLL_DIV(
@ -274,7 +274,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "plld_dsi0",
.source_pll = "plld",
.cm_reg = CM_PLLD,
@@ -1859,6 +1894,7 @@ static const struct bcm2835_clk_desc clk
@@ -1854,6 +1889,7 @@ static const struct bcm2835_clk_desc clk
.hold_mask = CM_PLLD_HOLDDSI0,
.fixed_divider = 1),
[BCM2835_PLLD_DSI1] = REGISTER_PLL_DIV(
@ -282,7 +282,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "plld_dsi1",
.source_pll = "plld",
.cm_reg = CM_PLLD,
@@ -1874,6 +1910,7 @@ static const struct bcm2835_clk_desc clk
@@ -1869,6 +1905,7 @@ static const struct bcm2835_clk_desc clk
* It is in the HDMI power domain.
*/
[BCM2835_PLLH] = REGISTER_PLL(
@ -290,7 +290,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
"pllh",
.cm_ctrl_reg = CM_PLLH,
.a2w_ctrl_reg = A2W_PLLH_CTRL,
@@ -1888,6 +1925,7 @@ static const struct bcm2835_clk_desc clk
@@ -1883,6 +1920,7 @@ static const struct bcm2835_clk_desc clk
.max_rate = 3000000000u,
.max_fb_rate = BCM2835_MAX_FB_RATE),
[BCM2835_PLLH_RCAL] = REGISTER_PLL_DIV(
@ -298,7 +298,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "pllh_rcal",
.source_pll = "pllh",
.cm_reg = CM_PLLH,
@@ -1897,6 +1935,7 @@ static const struct bcm2835_clk_desc clk
@@ -1892,6 +1930,7 @@ static const struct bcm2835_clk_desc clk
.fixed_divider = 10,
.flags = CLK_SET_RATE_PARENT),
[BCM2835_PLLH_AUX] = REGISTER_PLL_DIV(
@ -306,7 +306,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "pllh_aux",
.source_pll = "pllh",
.cm_reg = CM_PLLH,
@@ -1906,6 +1945,7 @@ static const struct bcm2835_clk_desc clk
@@ -1901,6 +1940,7 @@ static const struct bcm2835_clk_desc clk
.fixed_divider = 1,
.flags = CLK_SET_RATE_PARENT),
[BCM2835_PLLH_PIX] = REGISTER_PLL_DIV(
@ -314,7 +314,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "pllh_pix",
.source_pll = "pllh",
.cm_reg = CM_PLLH,
@@ -1921,6 +1961,7 @@ static const struct bcm2835_clk_desc clk
@@ -1916,6 +1956,7 @@ static const struct bcm2835_clk_desc clk
/* One Time Programmable Memory clock. Maximum 10Mhz. */
[BCM2835_CLOCK_OTP] = REGISTER_OSC_CLK(
@ -322,7 +322,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "otp",
.ctl_reg = CM_OTPCTL,
.div_reg = CM_OTPDIV,
@@ -1932,6 +1973,7 @@ static const struct bcm2835_clk_desc clk
@@ -1927,6 +1968,7 @@ static const struct bcm2835_clk_desc clk
* bythe watchdog timer and the camera pulse generator.
*/
[BCM2835_CLOCK_TIMER] = REGISTER_OSC_CLK(
@ -330,7 +330,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "timer",
.ctl_reg = CM_TIMERCTL,
.div_reg = CM_TIMERDIV,
@@ -1942,12 +1984,14 @@ static const struct bcm2835_clk_desc clk
@@ -1937,12 +1979,14 @@ static const struct bcm2835_clk_desc clk
* Generally run at 2Mhz, max 5Mhz.
*/
[BCM2835_CLOCK_TSENS] = REGISTER_OSC_CLK(
@ -345,7 +345,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "tec",
.ctl_reg = CM_TECCTL,
.div_reg = CM_TECDIV,
@@ -1956,6 +2000,7 @@ static const struct bcm2835_clk_desc clk
@@ -1951,6 +1995,7 @@ static const struct bcm2835_clk_desc clk
/* clocks with vpu parent mux */
[BCM2835_CLOCK_H264] = REGISTER_VPU_CLK(
@ -353,7 +353,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "h264",
.ctl_reg = CM_H264CTL,
.div_reg = CM_H264DIV,
@@ -1963,6 +2008,7 @@ static const struct bcm2835_clk_desc clk
@@ -1958,6 +2003,7 @@ static const struct bcm2835_clk_desc clk
.frac_bits = 8,
.tcnt_mux = 1),
[BCM2835_CLOCK_ISP] = REGISTER_VPU_CLK(
@ -361,7 +361,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "isp",
.ctl_reg = CM_ISPCTL,
.div_reg = CM_ISPDIV,
@@ -1975,6 +2021,7 @@ static const struct bcm2835_clk_desc clk
@@ -1970,6 +2016,7 @@ static const struct bcm2835_clk_desc clk
* in the SDRAM controller can't be used.
*/
[BCM2835_CLOCK_SDRAM] = REGISTER_VPU_CLK(
@ -369,7 +369,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "sdram",
.ctl_reg = CM_SDCCTL,
.div_reg = CM_SDCDIV,
@@ -1982,6 +2029,7 @@ static const struct bcm2835_clk_desc clk
@@ -1977,6 +2024,7 @@ static const struct bcm2835_clk_desc clk
.frac_bits = 0,
.tcnt_mux = 3),
[BCM2835_CLOCK_V3D] = REGISTER_VPU_CLK(
@ -377,7 +377,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "v3d",
.ctl_reg = CM_V3DCTL,
.div_reg = CM_V3DDIV,
@@ -1995,6 +2043,7 @@ static const struct bcm2835_clk_desc clk
@@ -1990,6 +2038,7 @@ static const struct bcm2835_clk_desc clk
* in various hardware documentation.
*/
[BCM2835_CLOCK_VPU] = REGISTER_VPU_CLK(
@ -385,7 +385,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "vpu",
.ctl_reg = CM_VPUCTL,
.div_reg = CM_VPUDIV,
@@ -2006,6 +2055,7 @@ static const struct bcm2835_clk_desc clk
@@ -2001,6 +2050,7 @@ static const struct bcm2835_clk_desc clk
/* clocks with per parent mux */
[BCM2835_CLOCK_AVEO] = REGISTER_PER_CLK(
@ -393,7 +393,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "aveo",
.ctl_reg = CM_AVEOCTL,
.div_reg = CM_AVEODIV,
@@ -2013,6 +2063,7 @@ static const struct bcm2835_clk_desc clk
@@ -2008,6 +2058,7 @@ static const struct bcm2835_clk_desc clk
.frac_bits = 0,
.tcnt_mux = 38),
[BCM2835_CLOCK_CAM0] = REGISTER_PER_CLK(
@ -401,7 +401,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "cam0",
.ctl_reg = CM_CAM0CTL,
.div_reg = CM_CAM0DIV,
@@ -2020,6 +2071,7 @@ static const struct bcm2835_clk_desc clk
@@ -2015,6 +2066,7 @@ static const struct bcm2835_clk_desc clk
.frac_bits = 8,
.tcnt_mux = 14),
[BCM2835_CLOCK_CAM1] = REGISTER_PER_CLK(
@ -409,7 +409,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "cam1",
.ctl_reg = CM_CAM1CTL,
.div_reg = CM_CAM1DIV,
@@ -2027,12 +2079,14 @@ static const struct bcm2835_clk_desc clk
@@ -2022,12 +2074,14 @@ static const struct bcm2835_clk_desc clk
.frac_bits = 8,
.tcnt_mux = 15),
[BCM2835_CLOCK_DFT] = REGISTER_PER_CLK(
@ -424,7 +424,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "dpi",
.ctl_reg = CM_DPICTL,
.div_reg = CM_DPIDIV,
@@ -2042,6 +2096,7 @@ static const struct bcm2835_clk_desc clk
@@ -2037,6 +2091,7 @@ static const struct bcm2835_clk_desc clk
/* Arasan EMMC clock */
[BCM2835_CLOCK_EMMC] = REGISTER_PER_CLK(
@ -432,7 +432,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "emmc",
.ctl_reg = CM_EMMCCTL,
.div_reg = CM_EMMCDIV,
@@ -2051,6 +2106,7 @@ static const struct bcm2835_clk_desc clk
@@ -2046,6 +2101,7 @@ static const struct bcm2835_clk_desc clk
/* General purpose (GPIO) clocks */
[BCM2835_CLOCK_GP0] = REGISTER_PER_CLK(
@ -440,7 +440,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "gp0",
.ctl_reg = CM_GP0CTL,
.div_reg = CM_GP0DIV,
@@ -2059,6 +2115,7 @@ static const struct bcm2835_clk_desc clk
@@ -2054,6 +2110,7 @@ static const struct bcm2835_clk_desc clk
.is_mash_clock = true,
.tcnt_mux = 20),
[BCM2835_CLOCK_GP1] = REGISTER_PER_CLK(
@ -448,7 +448,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "gp1",
.ctl_reg = CM_GP1CTL,
.div_reg = CM_GP1DIV,
@@ -2068,6 +2125,7 @@ static const struct bcm2835_clk_desc clk
@@ -2063,6 +2120,7 @@ static const struct bcm2835_clk_desc clk
.is_mash_clock = true,
.tcnt_mux = 21),
[BCM2835_CLOCK_GP2] = REGISTER_PER_CLK(
@ -456,7 +456,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "gp2",
.ctl_reg = CM_GP2CTL,
.div_reg = CM_GP2DIV,
@@ -2077,6 +2135,7 @@ static const struct bcm2835_clk_desc clk
@@ -2072,6 +2130,7 @@ static const struct bcm2835_clk_desc clk
/* HDMI state machine */
[BCM2835_CLOCK_HSM] = REGISTER_PER_CLK(
@ -464,7 +464,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "hsm",
.ctl_reg = CM_HSMCTL,
.div_reg = CM_HSMDIV,
@@ -2084,6 +2143,7 @@ static const struct bcm2835_clk_desc clk
@@ -2079,6 +2138,7 @@ static const struct bcm2835_clk_desc clk
.frac_bits = 8,
.tcnt_mux = 22),
[BCM2835_CLOCK_PCM] = REGISTER_PCM_CLK(
@ -472,7 +472,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "pcm",
.ctl_reg = CM_PCMCTL,
.div_reg = CM_PCMDIV,
@@ -2093,6 +2153,7 @@ static const struct bcm2835_clk_desc clk
@@ -2088,6 +2148,7 @@ static const struct bcm2835_clk_desc clk
.low_jitter = true,
.tcnt_mux = 23),
[BCM2835_CLOCK_PWM] = REGISTER_PER_CLK(
@ -480,7 +480,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "pwm",
.ctl_reg = CM_PWMCTL,
.div_reg = CM_PWMDIV,
@@ -2101,6 +2162,7 @@ static const struct bcm2835_clk_desc clk
@@ -2096,6 +2157,7 @@ static const struct bcm2835_clk_desc clk
.is_mash_clock = true,
.tcnt_mux = 24),
[BCM2835_CLOCK_SLIM] = REGISTER_PER_CLK(
@ -488,7 +488,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "slim",
.ctl_reg = CM_SLIMCTL,
.div_reg = CM_SLIMDIV,
@@ -2109,6 +2171,7 @@ static const struct bcm2835_clk_desc clk
@@ -2104,6 +2166,7 @@ static const struct bcm2835_clk_desc clk
.is_mash_clock = true,
.tcnt_mux = 25),
[BCM2835_CLOCK_SMI] = REGISTER_PER_CLK(
@ -496,7 +496,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "smi",
.ctl_reg = CM_SMICTL,
.div_reg = CM_SMIDIV,
@@ -2116,6 +2179,7 @@ static const struct bcm2835_clk_desc clk
@@ -2111,6 +2174,7 @@ static const struct bcm2835_clk_desc clk
.frac_bits = 8,
.tcnt_mux = 27),
[BCM2835_CLOCK_UART] = REGISTER_PER_CLK(
@ -504,7 +504,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "uart",
.ctl_reg = CM_UARTCTL,
.div_reg = CM_UARTDIV,
@@ -2125,6 +2189,7 @@ static const struct bcm2835_clk_desc clk
@@ -2120,6 +2184,7 @@ static const struct bcm2835_clk_desc clk
/* TV encoder clock. Only operating frequency is 108Mhz. */
[BCM2835_CLOCK_VEC] = REGISTER_PER_CLK(
@ -512,7 +512,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "vec",
.ctl_reg = CM_VECCTL,
.div_reg = CM_VECDIV,
@@ -2139,6 +2204,7 @@ static const struct bcm2835_clk_desc clk
@@ -2134,6 +2199,7 @@ static const struct bcm2835_clk_desc clk
/* dsi clocks */
[BCM2835_CLOCK_DSI0E] = REGISTER_PER_CLK(
@ -520,7 +520,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "dsi0e",
.ctl_reg = CM_DSI0ECTL,
.div_reg = CM_DSI0EDIV,
@@ -2146,6 +2212,7 @@ static const struct bcm2835_clk_desc clk
@@ -2141,6 +2207,7 @@ static const struct bcm2835_clk_desc clk
.frac_bits = 8,
.tcnt_mux = 18),
[BCM2835_CLOCK_DSI1E] = REGISTER_PER_CLK(
@ -528,7 +528,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "dsi1e",
.ctl_reg = CM_DSI1ECTL,
.div_reg = CM_DSI1EDIV,
@@ -2153,6 +2220,7 @@ static const struct bcm2835_clk_desc clk
@@ -2148,6 +2215,7 @@ static const struct bcm2835_clk_desc clk
.frac_bits = 8,
.tcnt_mux = 19),
[BCM2835_CLOCK_DSI0P] = REGISTER_DSI0_CLK(
@ -536,7 +536,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "dsi0p",
.ctl_reg = CM_DSI0PCTL,
.div_reg = CM_DSI0PDIV,
@@ -2160,6 +2228,7 @@ static const struct bcm2835_clk_desc clk
@@ -2155,6 +2223,7 @@ static const struct bcm2835_clk_desc clk
.frac_bits = 0,
.tcnt_mux = 12),
[BCM2835_CLOCK_DSI1P] = REGISTER_DSI1_CLK(
@ -544,7 +544,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "dsi1p",
.ctl_reg = CM_DSI1PCTL,
.div_reg = CM_DSI1PDIV,
@@ -2176,6 +2245,7 @@ static const struct bcm2835_clk_desc clk
@@ -2171,6 +2240,7 @@ static const struct bcm2835_clk_desc clk
* non-stop vpu clock.
*/
[BCM2835_CLOCK_PERI_IMAGE] = REGISTER_GATE(
@ -552,7 +552,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
.name = "peri_image",
.parent = "vpu",
.ctl_reg = CM_PERIICTL),
@@ -2223,11 +2293,16 @@ static int bcm2835_clk_probe(struct plat
@@ -2218,11 +2288,16 @@ 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);
@ -569,7 +569,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
cprman = devm_kzalloc(dev,
struct_size(cprman, onecell.hws, asize),
GFP_KERNEL);
@@ -2278,8 +2353,10 @@ static int bcm2835_clk_probe(struct plat
@@ -2273,8 +2348,10 @@ static int bcm2835_clk_probe(struct plat
for (i = 0; i < asize; i++) {
desc = &clk_desc_array[i];
@ -581,7 +581,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
}
ret = bcm2835_mark_sdc_parent_critical(hws[BCM2835_CLOCK_SDRAM]->clk);
@@ -2297,8 +2374,12 @@ static int bcm2835_clk_probe(struct plat
@@ -2292,8 +2369,12 @@ static int bcm2835_clk_probe(struct plat
return 0;
}

4
target/linux/bcm27xx/patches-4.19/950-0715-clk-bcm2835-Add-BCM2711_CLOCK_EMMC2-support.patch
View File

@ -50,7 +50,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
/*
* Names of clocks used within the driver that need to be replaced
@@ -2104,6 +2107,16 @@ static const struct bcm2835_clk_desc clk
@@ -2099,6 +2102,16 @@ static const struct bcm2835_clk_desc clk
.frac_bits = 8,
.tcnt_mux = 39),
@ -67,7 +67,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
/* General purpose (GPIO) clocks */
[BCM2835_CLOCK_GP0] = REGISTER_PER_CLK(
SOC_ALL,
@@ -2378,8 +2391,13 @@ static const struct cprman_plat_data cpr
@@ -2373,8 +2386,13 @@ static const struct cprman_plat_data cpr
.soc = SOC_BCM2835,
};

2
target/linux/bcm27xx/patches-4.19/950-0725-bcm2711-Retain-support-for-old-dtbs.patch
View File

@ -30,7 +30,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
};
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -2398,6 +2398,8 @@ static const struct cprman_plat_data cpr
@@ -2393,6 +2393,8 @@ static const struct cprman_plat_data cpr
static const struct of_device_id bcm2835_clk_of_match[] = {
{ .compatible = "brcm,bcm2835-cprman", .data = &cprman_bcm2835_plat_data },
{ .compatible = "brcm,bcm2711-cprman", .data = &cprman_bcm2711_plat_data },

2
target/linux/bcm27xx/patches-4.19/950-0755-clk-bcm2835-Avoid-null-pointer-exception.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -2290,9 +2290,11 @@ static bool bcm2835_clk_is_claimed(const
@@ -2285,9 +2285,11 @@ static bool bcm2835_clk_is_claimed(const
int i;
for (i = 0; i < ARRAY_SIZE(clk_desc_array); i++) {

2
target/linux/bcm27xx/patches-4.19/950-0762-clk-bcm2835-remove-pllb.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1757,32 +1757,10 @@ static const struct bcm2835_clk_desc clk
@@ -1752,32 +1752,10 @@ static const struct bcm2835_clk_desc clk
.fixed_divider = 1,
.flags = CLK_SET_RATE_PARENT),

4
target/linux/bcm27xx/patches-4.19/950-0767-clk-bcm2835-Disable-v3d-clock.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1727,16 +1727,12 @@ static const struct bcm2835_clk_desc clk
@@ -1722,16 +1722,12 @@ static const struct bcm2835_clk_desc clk
.hold_mask = CM_PLLA_HOLDCORE,
.fixed_divider = 1,
.flags = CLK_SET_RATE_PARENT),
@ -35,7 +35,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
[BCM2835_PLLA_DSI0] = REGISTER_PLL_DIV(
SOC_ALL,
.name = "plla_dsi0",
@@ -2009,14 +2005,12 @@ static const struct bcm2835_clk_desc clk
@@ -2004,14 +2000,12 @@ static const struct bcm2835_clk_desc clk
.int_bits = 6,
.frac_bits = 0,
.tcnt_mux = 3),

2
target/linux/bcm27xx/patches-4.19/950-0792-Initialise-rpi-firmware-before-clk-bcm2835.patch
View File

@ -25,7 +25,7 @@ Co-authored-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -2390,7 +2390,7 @@ static int __init __bcm2835_clk_driver_i
@@ -2385,7 +2385,7 @@ static int __init __bcm2835_clk_driver_i
{
return platform_driver_register(&bcm2835_clk_driver);
}

2
target/linux/bcm27xx/patches-4.19/950-0795-tty-amba-pl011-Add-un-throttle-support.patch
View File

@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static void pl011_stop_rx(struct uart_port *port)
{
struct uart_amba_port *uap =
@@ -2168,6 +2194,8 @@ static const struct uart_ops amba_pl011_
@@ -2151,6 +2177,8 @@ static const struct uart_ops amba_pl011_
.stop_tx = pl011_stop_tx,
.start_tx = pl011_start_tx,
.stop_rx = pl011_stop_rx,

4
target/linux/brcm63xx/patches-4.14/001-4.15-01-MIPS-BCM63XX-add-clkdev-lookup-support.patch
View File

@ -34,7 +34,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
#include <linux/delay.h>
#include <bcm63xx_cpu.h>
#include <bcm63xx_io.h>
@@ -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 <jonas.gorski@gmail.com>
#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()) {

16
target/linux/brcm63xx/patches-4.14/001-4.15-02-MIPS-BCM63XX-provide-periph-clock-as-refclk-for-uart.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
--- 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 <jonas.gorski@gmail.com>
/* 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 <jonas.gorski@gmail.com>
/* 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 <jonas.gorski@gmail.com>
/* 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 <jonas.gorski@gmail.com>
/* 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 <jonas.gorski@gmail.com>
/* 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 <jonas.gorski@gmail.com>
/* 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 <jonas.gorski@gmail.com>
/* 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),

8
target/linux/brcm63xx/patches-4.14/001-4.15-05-MIPS-BCM63XX-move-the-HSSPI-PLL-HZ-into-its-own-cloc.patch
View File

@ -26,7 +26,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
/*
* 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 <jonas.gorski@gmail.com>
/* 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 <jonas.gorski@gmail.com>
/* 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 <jonas.gorski@gmail.com>
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:

10
target/linux/brcm63xx/patches-4.14/001-4.15-06-MIPS-BCM63XX-provide-enet-clocks-as-enet-to-the-ethe.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
--- 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 <jonas.gorski@gmail.com>
};
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 <jonas.gorski@gmail.com>
};
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 <jonas.gorski@gmail.com>
};
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 <jonas.gorski@gmail.com>
};
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),

2
target/linux/brcm63xx/patches-4.14/001-4.15-07-MIPS-BCM63XX-split-out-swpkt_sar-usb-clocks.patch
View File

@ -94,7 +94,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
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),

4
target/linux/brcm63xx/patches-4.14/339-MIPS-BCM63XX-add-support-for-BCM63268.patch
View File

@ -107,7 +107,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
}
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 <jogo@openwrt.org>
#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;

6
target/linux/brcm63xx/patches-4.14/341-MIPS-BCM63XX-add-support-for-BCM6318.patch
View File

@ -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;

20
target/linux/brcm63xx/patches-4.14/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch
View File

@ -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),

4
target/linux/brcm63xx/patches-4.19/339-MIPS-BCM63XX-add-support-for-BCM63268.patch
View File

@ -107,7 +107,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
}
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 <jogo@openwrt.org>
#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;

6
target/linux/brcm63xx/patches-4.19/341-MIPS-BCM63XX-add-support-for-BCM6318.patch
View File

@ -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;

20
target/linux/brcm63xx/patches-4.19/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch
View File

@ -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),

2
target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
View File

@ -30,7 +30,7 @@ Signed-off-by: Johan Hovold <johan@kernel.org>
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -2058,7 +2058,8 @@ static const struct usb_device_id option
@@ -2060,7 +2060,8 @@ static const struct usb_device_id option
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) }, /* D-Link DWM-156 (variant) */
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) },
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) },

2
target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch
View File

@ -92,7 +92,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
#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;

8
target/linux/generic/backport-4.19/708-v5.3-net-phylink-remove-netdev-from-phylink-mii-ioctl-emu.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1360,8 +1360,8 @@ EXPORT_SYMBOL_GPL(phylink_ethtool_set_ee
@@ -1365,8 +1365,8 @@ EXPORT_SYMBOL_GPL(phylink_ethtool_set_ee
*
* FIXME: should deal with negotiation state too.
*/
@ -28,7 +28,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
{
struct fixed_phy_status fs;
int val;
@@ -1376,8 +1376,6 @@ static int phylink_mii_emul_read(struct
@@ -1381,8 +1381,6 @@ static int phylink_mii_emul_read(struct
if (reg == MII_BMSR) {
if (!state->an_complete)
val &= ~BMSR_ANEGCOMPLETE;
@ -37,7 +37,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
}
return val;
}
@@ -1473,8 +1471,7 @@ static int phylink_mii_read(struct phyli
@@ -1478,8 +1476,7 @@ static int phylink_mii_read(struct phyli
case MLO_AN_FIXED:
if (phy_id == 0) {
phylink_get_fixed_state(pl, &state);
@ -47,7 +47,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
}
break;
@@ -1487,8 +1484,7 @@ static int phylink_mii_read(struct phyli
@@ -1492,8 +1489,7 @@ static int phylink_mii_read(struct phyli
if (val < 0)
return val;

8
target/linux/generic/backport-4.19/709-v5.3-net-phylink-support-for-link-gpio-interrupt.patch
View File

@ -25,7 +25,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
struct timer_list link_poll;
void (*get_fixed_state)(struct net_device *dev,
struct phylink_link_state *s);
@@ -645,7 +646,7 @@ void phylink_destroy(struct phylink *pl)
@@ -650,7 +651,7 @@ void phylink_destroy(struct phylink *pl)
{
if (pl->sfp_bus)
sfp_unregister_upstream(pl->sfp_bus);
@ -34,7 +34,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
gpiod_put(pl->link_gpio);
cancel_work_sync(&pl->resolve);
@@ -912,6 +913,15 @@ void phylink_mac_change(struct phylink *
@@ -917,6 +918,15 @@ void phylink_mac_change(struct phylink *
}
EXPORT_SYMBOL_GPL(phylink_mac_change);
@ -50,7 +50,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
/**
* phylink_start() - start a phylink instance
* @pl: a pointer to a &struct phylink returned from phylink_create()
@@ -947,7 +957,22 @@ void phylink_start(struct phylink *pl)
@@ -952,7 +962,22 @@ void phylink_start(struct phylink *pl)
clear_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state);
phylink_run_resolve(pl);
@ -74,7 +74,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
mod_timer(&pl->link_poll, jiffies + HZ);
if (pl->sfp_bus)
sfp_upstream_start(pl->sfp_bus);
@@ -973,8 +998,11 @@ void phylink_stop(struct phylink *pl)
@@ -978,8 +1003,11 @@ void phylink_stop(struct phylink *pl)
phy_stop(pl->phydev);
if (pl->sfp_bus)
sfp_upstream_stop(pl->sfp_bus);

4
target/linux/generic/backport-4.19/711-v5.3-net-sfp-add-mandatory-attach-detach-methods-for-sfp-.patch
View File

@ -19,7 +19,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1615,6 +1615,20 @@ int phylink_mii_ioctl(struct phylink *pl
@@ -1620,6 +1620,20 @@ int phylink_mii_ioctl(struct phylink *pl
}
EXPORT_SYMBOL_GPL(phylink_mii_ioctl);
@ -40,7 +40,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
static int phylink_sfp_module_insert(void *upstream,
const struct sfp_eeprom_id *id)
{
@@ -1733,6 +1747,8 @@ static void phylink_sfp_disconnect_phy(v
@@ -1738,6 +1752,8 @@ static void phylink_sfp_disconnect_phy(v
}
static const struct sfp_upstream_ops sfp_phylink_ops = {

4
target/linux/generic/backport-4.19/712-v5.3-net-sfp-remove-sfp-bus-use-of-netdevs.patch
View File

@ -18,8 +18,8 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -555,8 +555,7 @@ static int phylink_register_sfp(struct p
return ret;
@@ -560,8 +560,7 @@ static int phylink_register_sfp(struct p
return 0;
}
- pl->sfp_bus = sfp_register_upstream(ref.fwnode, pl->netdev, pl,

14
target/linux/generic/backport-4.19/713-v5.2-net-phylink-avoid-reducing-support-mask.patch
View File

@ -16,7 +16,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1137,6 +1137,7 @@ EXPORT_SYMBOL_GPL(phylink_ethtool_ksetti
@@ -1142,6 +1142,7 @@ EXPORT_SYMBOL_GPL(phylink_ethtool_ksetti
int phylink_ethtool_ksettings_set(struct phylink *pl,
const struct ethtool_link_ksettings *kset)
{
@ -24,7 +24,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
struct ethtool_link_ksettings our_kset;
struct phylink_link_state config;
int ret;
@@ -1147,11 +1148,12 @@ int phylink_ethtool_ksettings_set(struct
@@ -1152,11 +1153,12 @@ int phylink_ethtool_ksettings_set(struct
kset->base.autoneg != AUTONEG_ENABLE)
return -EINVAL;
@ -38,7 +38,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* FIXME: should we reject autoneg if phy/mac does not support it? */
if (kset->base.autoneg == AUTONEG_DISABLE) {
@@ -1161,7 +1163,7 @@ int phylink_ethtool_ksettings_set(struct
@@ -1166,7 +1168,7 @@ int phylink_ethtool_ksettings_set(struct
* duplex.
*/
s = phy_lookup_setting(kset->base.speed, kset->base.duplex,
@ -47,7 +47,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
__ETHTOOL_LINK_MODE_MASK_NBITS, false);
if (!s)
return -EINVAL;
@@ -1191,7 +1193,7 @@ int phylink_ethtool_ksettings_set(struct
@@ -1196,7 +1198,7 @@ int phylink_ethtool_ksettings_set(struct
__set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, config.advertising);
}
@ -56,7 +56,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
return -EINVAL;
/* If autonegotiation is enabled, we must have an advertisement */
@@ -1633,6 +1635,7 @@ static int phylink_sfp_module_insert(voi
@@ -1638,6 +1640,7 @@ static int phylink_sfp_module_insert(voi
{
struct phylink *pl = upstream;
__ETHTOOL_DECLARE_LINK_MODE_MASK(support) = { 0, };
@ -64,7 +64,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
struct phylink_link_state config;
phy_interface_t iface;
int ret = 0;
@@ -1660,6 +1663,8 @@ static int phylink_sfp_module_insert(voi
@@ -1665,6 +1668,8 @@ static int phylink_sfp_module_insert(voi
return ret;
}
@ -73,7 +73,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
iface = sfp_select_interface(pl->sfp_bus, id, config.advertising);
if (iface == PHY_INTERFACE_MODE_NA) {
netdev_err(pl->netdev,
@@ -1669,7 +1674,7 @@ static int phylink_sfp_module_insert(voi
@@ -1674,7 +1679,7 @@ static int phylink_sfp_module_insert(voi
}
config.interface = iface;

4
target/linux/generic/backport-4.19/715-v5.3-net-phylink-don-t-start-and-stop-SGMII-PHYs-in-SFP-m.patch
View File

@ -113,7 +113,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -973,10 +973,10 @@ void phylink_start(struct phylink *pl)
@@ -978,10 +978,10 @@ void phylink_start(struct phylink *pl)
}
if (pl->link_an_mode == MLO_AN_FIXED && pl->get_fixed_state)
mod_timer(&pl->link_poll, jiffies + HZ);
@ -126,7 +126,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
EXPORT_SYMBOL_GPL(phylink_start);
@@ -993,10 +993,10 @@ void phylink_stop(struct phylink *pl)
@@ -998,10 +998,10 @@ void phylink_stop(struct phylink *pl)
{
ASSERT_RTNL();

6
target/linux/generic/backport-4.19/716-v5.4-net-sfp-move-fwnode-parsing-into-sfp-bus-layer.patch
View File

@ -16,7 +16,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -538,26 +538,17 @@ static const struct sfp_upstream_ops sfp
@@ -538,20 +538,13 @@ static const struct sfp_upstream_ops sfp
static int phylink_register_sfp(struct phylink *pl,
struct fwnode_handle *fwnode)
{
@ -42,6 +42,10 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
return ret;
}
@@ -560,9 +553,7 @@ static int phylink_register_sfp(struct p
return 0;
}
- pl->sfp_bus = sfp_register_upstream(ref.fwnode, pl, &sfp_phylink_ops);
- if (!pl->sfp_bus)
- return -ENOMEM;

4
target/linux/generic/backport-4.19/717-v5.5-net-sfp-rework-upstream-interface.patch
View File

@ -29,7 +29,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
if (IS_ERR(bus)) {
ret = PTR_ERR(bus);
netdev_err(pl->netdev, "unable to attach SFP bus: %d\n", ret);
@@ -550,7 +550,10 @@ static int phylink_register_sfp(struct p
@@ -555,7 +555,10 @@ static int phylink_register_sfp(struct p
pl->sfp_bus = bus;
@ -41,7 +41,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
}
/**
@@ -634,8 +637,7 @@ EXPORT_SYMBOL_GPL(phylink_create);
@@ -639,8 +642,7 @@ EXPORT_SYMBOL_GPL(phylink_create);
*/
void phylink_destroy(struct phylink *pl)
{

4
target/linux/generic/backport-4.19/739-v5.5-net-phylink-update-to-use-phy_support_asym_pause.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -678,12 +678,6 @@ static int phylink_bringup_phy(struct ph
@@ -683,12 +683,6 @@ static int phylink_bringup_phy(struct ph
u32 advertising;
int ret;
@ -25,7 +25,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
/*
* This is the new way of dealing with flow control for PHYs,
* as described by Timur Tabi in commit 529ed1275263 ("net: phy:
@@ -691,10 +685,13 @@ static int phylink_bringup_phy(struct ph
@@ -696,10 +690,13 @@ static int phylink_bringup_phy(struct ph
* using our validate call to the MAC, we rely upon the MAC
* clearing the bits from both supported and advertising fields.
*/

4
target/linux/generic/backport-4.19/741-v5.5-net-phylink-fix-link-mode-modification-in-PHY-mode.patch
View File

@ -25,7 +25,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1210,7 +1210,13 @@ int phylink_ethtool_ksettings_set(struct
@@ -1215,7 +1215,13 @@ int phylink_ethtool_ksettings_set(struct
pl->link_config.duplex = our_kset.base.duplex;
pl->link_config.an_enabled = our_kset.base.autoneg != AUTONEG_DISABLE;
@ -40,7 +40,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
phylink_mac_config(pl, &pl->link_config);
phylink_mac_an_restart(pl);
}
@@ -1290,14 +1296,16 @@ int phylink_ethtool_set_pauseparam(struc
@@ -1295,14 +1301,16 @@ int phylink_ethtool_set_pauseparam(struc
if (pause->tx_pause)
config->pause |= MLO_PAUSE_TX;

4
target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
View File

@ -637,7 +637,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
return received;
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -3199,7 +3199,7 @@ static int gfar_poll_rx_sq(struct napi_s
@@ -3205,7 +3205,7 @@ static int gfar_poll_rx_sq(struct napi_s
if (work_done < budget) {
u32 imask;
@ -646,7 +646,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Clear the halt bit in RSTAT */
gfar_write(&regs->rstat, gfargrp->rstat);
@@ -3288,7 +3288,7 @@ static int gfar_poll_rx(struct napi_stru
@@ -3294,7 +3294,7 @@ static int gfar_poll_rx(struct napi_stru
if (!num_act_queues) {
u32 imask;

1
target/linux/generic/config-4.14
View File

@ -604,6 +604,7 @@ CONFIG_BPF=y
# CONFIG_BPF_JIT_ALWAYS_ON is not set
# CONFIG_BPF_STREAM_PARSER is not set
CONFIG_BPF_SYSCALL=y
# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
# CONFIG_BPQETHER is not set
CONFIG_BQL=y
CONFIG_BRANCH_PROFILE_NONE=y

1
target/linux/generic/config-4.19
View File

@ -629,6 +629,7 @@ CONFIG_BPF_JIT=y
# CONFIG_BPF_JIT_ALWAYS_ON is not set
# CONFIG_BPF_STREAM_PARSER is not set
CONFIG_BPF_SYSCALL=y
# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
# CONFIG_BPQETHER is not set
CONFIG_BQL=y
CONFIG_BRANCH_PROFILE_NONE=y

1
target/linux/generic/config-4.9
View File

@ -569,6 +569,7 @@ CONFIG_BOOT_RAW=y
CONFIG_BPF=y
# CONFIG_BPF_JIT is not set
CONFIG_BPF_SYSCALL=y
# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
# CONFIG_BPQETHER is not set
CONFIG_BQL=y
CONFIG_BRANCH_PROFILE_NONE=y

2
target/linux/generic/hack-4.14/204-module_strip.patch
View File

@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1903,6 +1903,13 @@ config TRIM_UNUSED_KSYMS
@@ -1913,6 +1913,13 @@ config TRIM_UNUSED_KSYMS
If unsure, or if you need to build out-of-tree modules, say N.

6
target/linux/generic/hack-4.14/902-debloat_proc.patch
View File

@ -283,7 +283,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
goto err;
--- a/net/core/net-procfs.c
+++ b/net/core/net-procfs.c
@@ -320,10 +320,12 @@ static int __net_init dev_proc_net_init(
@@ -350,10 +350,12 @@ static int __net_init dev_proc_net_init(
if (!proc_create("dev", S_IRUGO, net->proc_net, &dev_seq_fops))
goto out;
@ -298,7 +298,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
goto out_softnet;
if (wext_proc_init(net))
@@ -332,9 +334,11 @@ static int __net_init dev_proc_net_init(
@@ -362,9 +364,11 @@ static int __net_init dev_proc_net_init(
out:
return rc;
out_ptype:
@ -312,7 +312,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
out_dev:
remove_proc_entry("dev", net->proc_net);
goto out;
@@ -344,8 +348,10 @@ static void __net_exit dev_proc_net_exit
@@ -374,8 +378,10 @@ static void __net_exit dev_proc_net_exit
{
wext_proc_exit(net);

2
target/linux/generic/hack-4.14/998-usb-serial-option-add-u9300.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -1351,6 +1351,7 @@ static const struct usb_device_id produc
@@ -1353,6 +1353,7 @@ static const struct usb_device_id produc
{QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */
{QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */
{QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */

2
target/linux/generic/hack-4.19/204-module_strip.patch
View File

@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1997,6 +1997,13 @@ config TRIM_UNUSED_KSYMS
@@ -2007,6 +2007,13 @@ config TRIM_UNUSED_KSYMS
If unsure, or if you need to build out-of-tree modules, say N.

6
target/linux/generic/hack-4.19/902-debloat_proc.patch
View File

@ -283,7 +283,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
goto err;
--- a/net/core/net-procfs.c
+++ b/net/core/net-procfs.c
@@ -279,10 +279,12 @@ static int __net_init dev_proc_net_init(
@@ -309,10 +309,12 @@ static int __net_init dev_proc_net_init(
if (!proc_create_net("dev", 0444, net->proc_net, &dev_seq_ops,
sizeof(struct seq_net_private)))
goto out;
@ -298,7 +298,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
sizeof(struct seq_net_private)))
goto out_softnet;
@@ -292,9 +294,11 @@ static int __net_init dev_proc_net_init(
@@ -322,9 +324,11 @@ static int __net_init dev_proc_net_init(
out:
return rc;
out_ptype:
@ -312,7 +312,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
out_dev:
remove_proc_entry("dev", net->proc_net);
goto out;
@@ -304,8 +308,10 @@ static void __net_exit dev_proc_net_exit
@@ -334,8 +338,10 @@ static void __net_exit dev_proc_net_exit
{
wext_proc_exit(net);

2
target/linux/generic/hack-4.19/998-usb-serial-option-add-u9300.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -1362,6 +1362,7 @@ static const struct usb_device_id produc
@@ -1364,6 +1364,7 @@ static const struct usb_device_id produc
{QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */
{QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */
{QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */

2
target/linux/generic/hack-4.9/204-module_strip.patch
View File

@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -2122,6 +2122,13 @@ config TRIM_UNUSED_KSYMS
@@ -2132,6 +2132,13 @@ config TRIM_UNUSED_KSYMS
If unsure, or if you need to build out-of-tree modules, say N.

6
target/linux/generic/hack-4.9/902-debloat_proc.patch
View File

@ -284,7 +284,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
goto err;
--- a/net/core/net-procfs.c
+++ b/net/core/net-procfs.c
@@ -319,10 +319,12 @@ static int __net_init dev_proc_net_init(
@@ -349,10 +349,12 @@ static int __net_init dev_proc_net_init(
if (!proc_create("dev", S_IRUGO, net->proc_net, &dev_seq_fops))
goto out;
@ -299,7 +299,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
goto out_softnet;
if (wext_proc_init(net))
@@ -331,9 +333,11 @@ static int __net_init dev_proc_net_init(
@@ -361,9 +363,11 @@ static int __net_init dev_proc_net_init(
out:
return rc;
out_ptype:
@ -313,7 +313,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
out_dev:
remove_proc_entry("dev", net->proc_net);
goto out;
@@ -343,8 +347,10 @@ static void __net_exit dev_proc_net_exit
@@ -373,8 +377,10 @@ static void __net_exit dev_proc_net_exit
{
wext_proc_exit(net);

2
target/linux/generic/pending-4.14/601-add-kernel-imq-support.patch
View File

@ -1437,7 +1437,7 @@
/* Interface address info used in eth_type_trans() */
unsigned char *dev_addr;
@@ -3677,6 +3682,19 @@ static inline void netif_tx_unlock_bh(st
@@ -3678,6 +3683,19 @@ static inline void netif_tx_unlock_bh(st
} \
}

16
target/linux/generic/pending-4.14/630-packet_socket_type.patch
View File

@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#define PACKET_FANOUT_LB 1
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1838,6 +1838,7 @@ static int packet_rcv_spkt(struct sk_buf
@@ -1842,6 +1842,7 @@ static int packet_rcv_spkt(struct sk_buf
{
struct sock *sk;
struct sockaddr_pkt *spkt;
@ -38,7 +38,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/*
* When we registered the protocol we saved the socket in the data
@@ -1845,6 +1846,7 @@ static int packet_rcv_spkt(struct sk_buf
@@ -1849,6 +1850,7 @@ static int packet_rcv_spkt(struct sk_buf
*/
sk = pt->af_packet_priv;
@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/*
* Yank back the headers [hope the device set this
@@ -1857,7 +1859,7 @@ static int packet_rcv_spkt(struct sk_buf
@@ -1861,7 +1863,7 @@ static int packet_rcv_spkt(struct sk_buf
* so that this procedure is noop.
*/
@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
goto out;
if (!net_eq(dev_net(dev), sock_net(sk)))
@@ -2084,12 +2086,12 @@ static int packet_rcv(struct sk_buff *sk
@@ -2088,12 +2090,12 @@ static int packet_rcv(struct sk_buff *sk
unsigned int snaplen, res;
bool is_drop_n_account = false;
@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
@@ -2217,12 +2219,12 @@ static int tpacket_rcv(struct sk_buff *s
@@ -2221,12 +2223,12 @@ static int tpacket_rcv(struct sk_buff *s
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32);
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48);
@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
@@ -3325,6 +3327,7 @@ static int packet_create(struct net *net
@@ -3329,6 +3331,7 @@ static int packet_create(struct net *net
mutex_init(&po->pg_vec_lock);
po->rollover = NULL;
po->prot_hook.func = packet_rcv;
@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
@@ -3949,6 +3952,16 @@ packet_setsockopt(struct socket *sock, i
@@ -3955,6 +3958,16 @@ packet_setsockopt(struct socket *sock, i
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
return 0;
}
@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
default:
return -ENOPROTOOPT;
}
@@ -4001,6 +4014,13 @@ static int packet_getsockopt(struct sock
@@ -4007,6 +4020,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;

2
target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch
View File

@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#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);
}

8
target/linux/generic/pending-4.14/834-ledtrig-libata.patch
View File

@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile
@@ -5159,6 +5172,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
@@ -5160,6 +5173,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (tag < 0)
return NULL;
}
@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
qc = __ata_qc_from_tag(ap, tag);
qc->tag = tag;
@@ -6062,6 +6078,9 @@ struct ata_port *ata_port_alloc(struct a
@@ -6063,6 +6079,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap);
return ap;
@@ -6083,6 +6102,12 @@ static void ata_host_release(struct devi
@@ -6084,6 +6103,12 @@ static void ata_host_release(struct devi
kfree(ap->pmp_link);
kfree(ap->slave_link);
@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
kfree(ap);
host->ports[i] = NULL;
}
@@ -6529,7 +6554,23 @@ int ata_host_register(struct ata_host *h
@@ -6530,7 +6555,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1;
}

2
target/linux/generic/pending-4.14/920-mangle_bootargs.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1427,6 +1427,15 @@ config EMBEDDED
@@ -1437,6 +1437,15 @@ config EMBEDDED
an embedded system so certain expert options are available
for configuration.

2
target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch
View File

@ -1132,7 +1132,7 @@
/* Interface address info used in eth_type_trans() */
unsigned char *dev_addr;
@@ -3980,6 +3985,19 @@ static inline void netif_tx_unlock_bh(st
@@ -3981,6 +3986,19 @@ static inline void netif_tx_unlock_bh(st
} \
}

16
target/linux/generic/pending-4.19/630-packet_socket_type.patch
View File

@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#define PACKET_FANOUT_LB 1
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1798,6 +1798,7 @@ static int packet_rcv_spkt(struct sk_buf
@@ -1802,6 +1802,7 @@ static int packet_rcv_spkt(struct sk_buf
{
struct sock *sk;
struct sockaddr_pkt *spkt;
@ -38,7 +38,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/*
* When we registered the protocol we saved the socket in the data
@@ -1805,6 +1806,7 @@ static int packet_rcv_spkt(struct sk_buf
@@ -1809,6 +1810,7 @@ static int packet_rcv_spkt(struct sk_buf
*/
sk = pt->af_packet_priv;
@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/*
* Yank back the headers [hope the device set this
@@ -1817,7 +1819,7 @@ static int packet_rcv_spkt(struct sk_buf
@@ -1821,7 +1823,7 @@ static int packet_rcv_spkt(struct sk_buf
* so that this procedure is noop.
*/
@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
goto out;
if (!net_eq(dev_net(dev), sock_net(sk)))
@@ -2045,12 +2047,12 @@ static int packet_rcv(struct sk_buff *sk
@@ -2049,12 +2051,12 @@ static int packet_rcv(struct sk_buff *sk
unsigned int snaplen, res;
bool is_drop_n_account = false;
@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
@@ -2178,12 +2180,12 @@ static int tpacket_rcv(struct sk_buff *s
@@ -2182,12 +2184,12 @@ static int tpacket_rcv(struct sk_buff *s
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32);
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48);
@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
@@ -3289,6 +3291,7 @@ static int packet_create(struct net *net
@@ -3293,6 +3295,7 @@ static int packet_create(struct net *net
mutex_init(&po->pg_vec_lock);
po->rollover = NULL;
po->prot_hook.func = packet_rcv;
@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
@@ -3911,6 +3914,16 @@ packet_setsockopt(struct socket *sock, i
@@ -3917,6 +3920,16 @@ packet_setsockopt(struct socket *sock, i
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
return 0;
}
@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
default:
return -ENOPROTOOPT;
}
@@ -3963,6 +3976,13 @@ static int packet_getsockopt(struct sock
@@ -3969,6 +3982,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;

2
target/linux/generic/pending-4.19/644-net-pppoe-support-hardware-flow-table-offload.patch
View File

@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#define PPP_VERSION "2.4.2"
/*
@@ -1379,12 +1384,37 @@ static void ppp_dev_priv_destructor(stru
@@ -1384,12 +1389,37 @@ static void ppp_dev_priv_destructor(stru
ppp_destroy_interface(ppp);
}

2
target/linux/generic/pending-4.19/741-net-sfp-derive-interface-mode-from-ethtool-link-mode.patch
View File

@ -29,7 +29,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
dev_err(&phydev->mdio.dev, "incompatible SFP module inserted\n");
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1663,7 +1663,7 @@ static int phylink_sfp_module_insert(voi
@@ -1668,7 +1668,7 @@ static int phylink_sfp_module_insert(voi
linkmode_copy(support1, support);

4
target/linux/generic/pending-4.19/744-net-sfp-move-phy_start-phy_stop-to-phylink.patch
View File

@ -16,7 +16,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1717,6 +1717,26 @@ static int phylink_sfp_module_insert(voi
@@ -1722,6 +1722,26 @@ static int phylink_sfp_module_insert(voi
return ret;
}
@ -43,7 +43,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
static void phylink_sfp_link_down(void *upstream)
{
struct phylink *pl = upstream;
@@ -1752,6 +1772,8 @@ static const struct sfp_upstream_ops sfp
@@ -1757,6 +1777,8 @@ static const struct sfp_upstream_ops sfp
.attach = phylink_sfp_attach,
.detach = phylink_sfp_detach,
.module_insert = phylink_sfp_module_insert,

8
target/linux/generic/pending-4.19/746-net-phylink-re-split-__phylink_connect_phy.patch
View File

@ -16,7 +16,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -728,11 +728,9 @@ static int phylink_bringup_phy(struct ph
@@ -733,11 +733,9 @@ static int phylink_bringup_phy(struct ph
return 0;
}
@ -30,7 +30,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
if (WARN_ON(pl->link_an_mode == MLO_AN_FIXED ||
(pl->link_an_mode == MLO_AN_INBAND &&
phy_interface_mode_is_8023z(interface))))
@@ -741,15 +739,7 @@ static int __phylink_connect_phy(struct
@@ -746,15 +744,7 @@ static int __phylink_connect_phy(struct
if (pl->phydev)
return -EBUSY;
@ -47,7 +47,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
}
/**
@@ -769,13 +759,23 @@ static int __phylink_connect_phy(struct
@@ -774,13 +764,23 @@ static int __phylink_connect_phy(struct
*/
int phylink_connect_phy(struct phylink *pl, struct phy_device *phy)
{
@ -72,7 +72,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
}
EXPORT_SYMBOL_GPL(phylink_connect_phy);
@@ -1759,8 +1759,17 @@ static void phylink_sfp_link_up(void *up
@@ -1764,8 +1764,17 @@ static void phylink_sfp_link_up(void *up
static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy)
{
struct phylink *pl = upstream;

12
target/linux/generic/pending-4.19/747-net-phylink-support-Clause-45-PHYs-on-SFP-modules.patch
View File

@ -18,7 +18,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -671,7 +671,8 @@ static void phylink_phy_change(struct ph
@@ -676,7 +676,8 @@ static void phylink_phy_change(struct ph
phy_duplex_to_str(phydev->duplex));
}
@ -28,7 +28,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
{
struct phylink_link_state config;
__ETHTOOL_DECLARE_LINK_MODE_MASK(supported);
@@ -691,7 +692,7 @@ static int phylink_bringup_phy(struct ph
@@ -696,7 +697,7 @@ static int phylink_bringup_phy(struct ph
ethtool_convert_legacy_u32_to_link_mode(supported, phy->supported);
ethtool_convert_legacy_u32_to_link_mode(config.advertising,
phy->advertising);
@ -37,7 +37,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
ret = phylink_validate(pl, supported, &config);
if (ret)
@@ -707,6 +708,7 @@ static int phylink_bringup_phy(struct ph
@@ -712,6 +713,7 @@ static int phylink_bringup_phy(struct ph
mutex_lock(&phy->lock);
mutex_lock(&pl->state_mutex);
pl->phydev = phy;
@ -45,7 +45,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
linkmode_copy(pl->supported, supported);
linkmode_copy(pl->link_config.advertising, config.advertising);
@@ -771,7 +773,7 @@ int phylink_connect_phy(struct phylink *
@@ -776,7 +778,7 @@ int phylink_connect_phy(struct phylink *
if (ret < 0)
return ret;
@ -54,7 +54,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
if (ret)
phy_detach(phy);
@@ -824,7 +826,7 @@ int phylink_of_phy_connect(struct phylin
@@ -829,7 +831,7 @@ int phylink_of_phy_connect(struct phylin
if (!phy_dev)
return -ENODEV;
@ -63,7 +63,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
if (ret)
phy_detach(phy_dev);
@@ -1759,13 +1761,22 @@ static void phylink_sfp_link_up(void *up
@@ -1764,13 +1766,22 @@ static void phylink_sfp_link_up(void *up
static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy)
{
struct phylink *pl = upstream;

34
target/linux/generic/pending-4.19/748-net-phylink-split-link_an_mode-configured-and-curren.patch
View File

@ -91,7 +91,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
pl->cur_interface, pl->phydev);
netif_carrier_on(ndev);
@@ -610,7 +611,7 @@ struct phylink *phylink_create(struct ne
@@ -615,7 +616,7 @@ struct phylink *phylink_create(struct ne
return ERR_PTR(ret);
}
@ -100,7 +100,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
ret = phylink_parse_fixedlink(pl, fwnode);
if (ret < 0) {
kfree(pl);
@@ -618,6 +619,8 @@ struct phylink *phylink_create(struct ne
@@ -623,6 +624,8 @@ struct phylink *phylink_create(struct ne
}
}
@ -109,7 +109,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
ret = phylink_register_sfp(pl, fwnode);
if (ret < 0) {
kfree(pl);
@@ -733,8 +736,8 @@ static int phylink_bringup_phy(struct ph
@@ -738,8 +741,8 @@ static int phylink_bringup_phy(struct ph
static int phylink_attach_phy(struct phylink *pl, struct phy_device *phy,
phy_interface_t interface)
{
@ -120,7 +120,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
phy_interface_mode_is_8023z(interface))))
return -EINVAL;
@@ -801,8 +804,8 @@ int phylink_of_phy_connect(struct phylin
@@ -806,8 +809,8 @@ int phylink_of_phy_connect(struct phylin
int ret;
/* Fixed links and 802.3z are handled without needing a PHY */
@ -131,7 +131,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
phy_interface_mode_is_8023z(pl->link_interface)))
return 0;
@@ -813,7 +816,7 @@ int phylink_of_phy_connect(struct phylin
@@ -818,7 +821,7 @@ int phylink_of_phy_connect(struct phylin
phy_node = of_parse_phandle(dn, "phy-device", 0);
if (!phy_node) {
@ -140,7 +140,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
return -ENODEV;
return 0;
}
@@ -876,7 +879,7 @@ int phylink_fixed_state_cb(struct phylin
@@ -881,7 +884,7 @@ int phylink_fixed_state_cb(struct phylin
/* It does not make sense to let the link be overriden unless we use
* MLO_AN_FIXED
*/
@ -149,7 +149,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
return -EINVAL;
mutex_lock(&pl->state_mutex);
@@ -926,7 +929,7 @@ void phylink_start(struct phylink *pl)
@@ -931,7 +934,7 @@ void phylink_start(struct phylink *pl)
ASSERT_RTNL();
netdev_info(pl->netdev, "configuring for %s/%s link mode\n",
@ -158,7 +158,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
phy_modes(pl->link_config.interface));
/* Always set the carrier off */
@@ -948,7 +951,7 @@ void phylink_start(struct phylink *pl)
@@ -953,7 +956,7 @@ void phylink_start(struct phylink *pl)
clear_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state);
phylink_run_resolve(pl);
@ -167,7 +167,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
int irq = gpiod_to_irq(pl->link_gpio);
if (irq > 0) {
@@ -963,7 +966,7 @@ void phylink_start(struct phylink *pl)
@@ -968,7 +971,7 @@ void phylink_start(struct phylink *pl)
if (irq <= 0)
mod_timer(&pl->link_poll, jiffies + HZ);
}
@ -176,7 +176,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
mod_timer(&pl->link_poll, jiffies + HZ);
if (pl->phydev)
phy_start(pl->phydev);
@@ -1090,7 +1093,7 @@ int phylink_ethtool_ksettings_get(struct
@@ -1095,7 +1098,7 @@ int phylink_ethtool_ksettings_get(struct
linkmode_copy(kset->link_modes.supported, pl->supported);
@ -185,7 +185,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
case MLO_AN_FIXED:
/* We are using fixed settings. Report these as the
* current link settings - and note that these also
@@ -1163,7 +1166,7 @@ int phylink_ethtool_ksettings_set(struct
@@ -1168,7 +1171,7 @@ int phylink_ethtool_ksettings_set(struct
/* If we have a fixed link (as specified by firmware), refuse
* to change link parameters.
*/
@ -194,7 +194,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
(s->speed != pl->link_config.speed ||
s->duplex != pl->link_config.duplex))
return -EINVAL;
@@ -1175,7 +1178,7 @@ int phylink_ethtool_ksettings_set(struct
@@ -1180,7 +1183,7 @@ int phylink_ethtool_ksettings_set(struct
__clear_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, config.advertising);
} else {
/* If we have a fixed link, refuse to enable autonegotiation */
@ -203,7 +203,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
return -EINVAL;
config.speed = SPEED_UNKNOWN;
@@ -1217,7 +1220,7 @@ int phylink_ethtool_ksettings_set(struct
@@ -1222,7 +1225,7 @@ int phylink_ethtool_ksettings_set(struct
* configuration. For a fixed link, this isn't able to change any
* parameters, which just leaves inband mode.
*/
@ -212,7 +212,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
!test_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state)) {
phylink_mac_config(pl, &pl->link_config);
phylink_mac_an_restart(pl);
@@ -1307,7 +1310,7 @@ int phylink_ethtool_set_pauseparam(struc
@@ -1312,7 +1315,7 @@ int phylink_ethtool_set_pauseparam(struc
pause->tx_pause);
} else if (!test_bit(PHYLINK_DISABLE_STOPPED,
&pl->phylink_disable_state)) {
@ -221,7 +221,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
case MLO_AN_FIXED:
/* Should we allow fixed links to change against the config? */
phylink_resolve_flow(pl, config);
@@ -1496,7 +1499,7 @@ static int phylink_mii_read(struct phyli
@@ -1501,7 +1504,7 @@ static int phylink_mii_read(struct phyli
struct phylink_link_state state;
int val = 0xffff;
@ -230,7 +230,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
case MLO_AN_FIXED:
if (phy_id == 0) {
phylink_get_fixed_state(pl, &state);
@@ -1524,7 +1527,7 @@ static int phylink_mii_read(struct phyli
@@ -1529,7 +1532,7 @@ static int phylink_mii_read(struct phyli
static int phylink_mii_write(struct phylink *pl, unsigned int phy_id,
unsigned int reg, unsigned int val)
{
@ -239,7 +239,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
case MLO_AN_FIXED:
break;
@@ -1698,10 +1701,10 @@ static int phylink_sfp_module_insert(voi
@@ -1703,10 +1706,10 @@ static int phylink_sfp_module_insert(voi
linkmode_copy(pl->link_config.advertising, config.advertising);
}

10
target/linux/generic/pending-4.19/749-net-phylink-split-phylink_sfp_module_insert.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1633,25 +1633,21 @@ static void phylink_sfp_detach(void *ups
@@ -1638,25 +1638,21 @@ static void phylink_sfp_detach(void *ups
pl->netdev->sfp_bus = NULL;
}
@ -46,7 +46,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
config.interface = PHY_INTERFACE_MODE_NA;
config.speed = SPEED_UNKNOWN;
config.duplex = DUPLEX_UNKNOWN;
@@ -1666,8 +1662,6 @@ static int phylink_sfp_module_insert(voi
@@ -1671,8 +1667,6 @@ static int phylink_sfp_module_insert(voi
return ret;
}
@ -55,7 +55,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
iface = sfp_select_interface(pl->sfp_bus, config.advertising);
if (iface == PHY_INTERFACE_MODE_NA) {
netdev_err(pl->netdev,
@@ -1677,18 +1671,18 @@ static int phylink_sfp_module_insert(voi
@@ -1682,18 +1676,18 @@ static int phylink_sfp_module_insert(voi
}
config.interface = iface;
@ -77,7 +77,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
__ETHTOOL_LINK_MODE_MASK_NBITS, support);
if (phy_interface_mode_is_8023z(iface) && pl->phydev)
@@ -1701,15 +1695,15 @@ static int phylink_sfp_module_insert(voi
@@ -1706,15 +1700,15 @@ static int phylink_sfp_module_insert(voi
linkmode_copy(pl->link_config.advertising, config.advertising);
}
@ -96,7 +96,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
phy_modes(config.interface));
}
@@ -1722,6 +1716,21 @@ static int phylink_sfp_module_insert(voi
@@ -1727,6 +1721,21 @@ static int phylink_sfp_module_insert(voi
return ret;
}

10
target/linux/generic/pending-4.19/750-net-phylink-delay-MAC-configuration-for-copper-SFP-m.patch
View File

@ -36,7 +36,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
};
static inline void linkmode_zero(unsigned long *dst)
@@ -1633,7 +1636,7 @@ static void phylink_sfp_detach(void *ups
@@ -1638,7 +1641,7 @@ static void phylink_sfp_detach(void *ups
pl->netdev->sfp_bus = NULL;
}
@ -45,7 +45,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
const unsigned long *supported,
const unsigned long *advertising)
{
@@ -1707,7 +1710,7 @@ static int phylink_sfp_config(struct phy
@@ -1712,7 +1715,7 @@ static int phylink_sfp_config(struct phy
phy_modes(config.interface));
}
@ -54,7 +54,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
if (changed && !test_bit(PHYLINK_DISABLE_STOPPED,
&pl->phylink_disable_state))
@@ -1720,15 +1723,20 @@ static int phylink_sfp_module_insert(voi
@@ -1725,15 +1728,20 @@ static int phylink_sfp_module_insert(voi
const struct sfp_eeprom_id *id)
{
struct phylink *pl = upstream;
@ -79,7 +79,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
}
static int phylink_sfp_module_start(void *upstream)
@@ -1736,10 +1744,19 @@ static int phylink_sfp_module_start(void
@@ -1741,10 +1749,19 @@ static int phylink_sfp_module_start(void
struct phylink *pl = upstream;
/* If this SFP module has a PHY, start the PHY now. */
@ -102,7 +102,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
}
static void phylink_sfp_module_stop(void *upstream)
@@ -1773,10 +1790,30 @@ static void phylink_sfp_link_up(void *up
@@ -1778,10 +1795,30 @@ static void phylink_sfp_link_up(void *up
static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy)
{
struct phylink *pl = upstream;

4
target/linux/generic/pending-4.19/751-net-phylink-make-Broadcom-BCM84881-based-SFPs-work.patch
View File

@ -18,7 +18,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1787,12 +1787,22 @@ static void phylink_sfp_link_up(void *up
@@ -1792,12 +1792,22 @@ static void phylink_sfp_link_up(void *up
phylink_run_resolve(pl);
}
@ -41,7 +41,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
int ret;
/*
@@ -1807,8 +1817,13 @@ static int phylink_sfp_connect_phy(void
@@ -1812,8 +1822,13 @@ static int phylink_sfp_connect_phy(void
ethtool_convert_legacy_u32_to_link_mode(supported, phy->supported);
ethtool_convert_legacy_u32_to_link_mode(advertising, phy->advertising);

8
target/linux/generic/pending-4.19/834-ledtrig-libata.patch
View File

@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile
@@ -5169,6 +5182,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
@@ -5170,6 +5183,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (tag < 0)
return NULL;
}
@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
qc = __ata_qc_from_tag(ap, tag);
qc->tag = qc->hw_tag = tag;
@@ -6105,6 +6121,9 @@ struct ata_port *ata_port_alloc(struct a
@@ -6106,6 +6122,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap);
return ap;
@@ -6140,6 +6159,12 @@ static void ata_host_release(struct kref
@@ -6141,6 +6160,12 @@ static void ata_host_release(struct kref
kfree(ap->pmp_link);
kfree(ap->slave_link);
@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
kfree(ap);
host->ports[i] = NULL;
}
@@ -6603,7 +6628,23 @@ int ata_host_register(struct ata_host *h
@@ -6604,7 +6629,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1;
}

2
target/linux/generic/pending-4.19/920-mangle_bootargs.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1531,6 +1531,15 @@ config EMBEDDED
@@ -1541,6 +1541,15 @@ config EMBEDDED
an embedded system so certain expert options are available
for configuration.

2
target/linux/generic/pending-4.9/601-add-kernel-imq-support.patch
View File

@ -1411,7 +1411,7 @@
+
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -3694,6 +3694,19 @@ static inline void netif_tx_unlock_bh(st
@@ -3695,6 +3695,19 @@ static inline void netif_tx_unlock_bh(st
} \
}

16
target/linux/generic/pending-4.9/630-packet_socket_type.patch
View File

@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#define PACKET_FANOUT_LB 1
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1787,6 +1787,7 @@ static int packet_rcv_spkt(struct sk_buf
@@ -1791,6 +1791,7 @@ static int packet_rcv_spkt(struct sk_buf
{
struct sock *sk;
struct sockaddr_pkt *spkt;
@ -38,7 +38,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/*
* When we registered the protocol we saved the socket in the data
@@ -1794,6 +1795,7 @@ static int packet_rcv_spkt(struct sk_buf
@@ -1798,6 +1799,7 @@ static int packet_rcv_spkt(struct sk_buf
*/
sk = pt->af_packet_priv;
@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/*
* Yank back the headers [hope the device set this
@@ -1806,7 +1808,7 @@ static int packet_rcv_spkt(struct sk_buf
@@ -1810,7 +1812,7 @@ static int packet_rcv_spkt(struct sk_buf
* so that this procedure is noop.
*/
@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
goto out;
if (!net_eq(dev_net(dev), sock_net(sk)))
@@ -2044,12 +2046,12 @@ static int packet_rcv(struct sk_buff *sk
@@ -2048,12 +2050,12 @@ static int packet_rcv(struct sk_buff *sk
unsigned int snaplen, res;
bool is_drop_n_account = false;
@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
@@ -2176,12 +2178,12 @@ static int tpacket_rcv(struct sk_buff *s
@@ -2180,12 +2182,12 @@ static int tpacket_rcv(struct sk_buff *s
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32);
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48);
@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
@@ -3305,6 +3307,7 @@ static int packet_create(struct net *net
@@ -3309,6 +3311,7 @@ static int packet_create(struct net *net
mutex_init(&po->pg_vec_lock);
po->rollover = NULL;
po->prot_hook.func = packet_rcv;
@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
@@ -3929,6 +3932,16 @@ packet_setsockopt(struct socket *sock, i
@@ -3935,6 +3938,16 @@ packet_setsockopt(struct socket *sock, i
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
return 0;
}
@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
default:
return -ENOPROTOOPT;
}
@@ -3981,6 +3994,13 @@ static int packet_getsockopt(struct sock
@@ -3987,6 +4000,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;

8
target/linux/generic/pending-4.9/834-ledtrig-libata.patch
View File

@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile
@@ -5033,6 +5046,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
@@ -5034,6 +5047,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (tag < 0)
return NULL;
}
@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
qc = __ata_qc_from_tag(ap, tag);
qc->tag = tag;
@@ -5936,6 +5952,9 @@ struct ata_port *ata_port_alloc(struct a
@@ -5937,6 +5953,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap);
return ap;
@@ -5957,6 +5976,12 @@ static void ata_host_release(struct devi
@@ -5958,6 +5977,12 @@ static void ata_host_release(struct devi
kfree(ap->pmp_link);
kfree(ap->slave_link);
@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
kfree(ap);
host->ports[i] = NULL;
}
@@ -6403,7 +6428,23 @@ int ata_host_register(struct ata_host *h
@@ -6404,7 +6429,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1;
}

2
target/linux/generic/pending-4.9/920-mangle_bootargs.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1694,6 +1694,15 @@ config EMBEDDED
@@ -1704,6 +1704,15 @@ config EMBEDDED
an embedded system so certain expert options are available
for configuration.

8
target/linux/ipq40xx/patches-4.14/950-add-tx-hw802.11-encapusaltion-offloading-support.patch
View File

@ -59,7 +59,7 @@
u8 drv_priv[0] __aligned(sizeof(void *));
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -812,6 +812,10 @@ static u8 ath10k_htt_tx_get_tid(struct s
@@ -815,6 +815,10 @@ static u8 ath10k_htt_tx_get_tid(struct s
struct ieee80211_hdr *hdr = (void *)skb->data;
struct ath10k_skb_cb *cb = ATH10K_SKB_CB(skb);
@ -70,7 +70,7 @@
if (!is_eth && ieee80211_is_mgmt(hdr->frame_control))
return HTT_DATA_TX_EXT_TID_MGMT;
else if (cb->flags & ATH10K_SKB_F_QOS)
@@ -933,15 +937,17 @@ int ath10k_htt_tx(struct ath10k_htt *htt
@@ -936,15 +940,17 @@ int ath10k_htt_tx(struct ath10k_htt *htt
txbuf_paddr = htt->txbuf.paddr +
(sizeof(struct ath10k_htt_txbuf) * msdu_id);
@ -287,8 +287,8 @@
+
ath10k_htt_tx_free_msdu_id(htt, tx_done->msdu_id);
ath10k_htt_tx_dec_pending(htt);
if (htt->num_pending_tx == 0)
@@ -119,7 +124,11 @@ int ath10k_txrx_tx_unref(struct ath10k_h
spin_unlock_bh(&htt->tx_lock);
@@ -117,7 +122,11 @@ int ath10k_txrx_tx_unref(struct ath10k_h
(info->flags & IEEE80211_TX_CTL_NO_ACK))
info->flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED;

2
target/linux/ipq40xx/patches-4.14/998-ignore-stats-debug-info.patch
View File

@ -31,7 +31,7 @@
--- a/drivers/net/wireless/ath/ath10k/txrx.c
+++ b/drivers/net/wireless/ath/ath10k/txrx.c
@@ -250,8 +250,8 @@ void ath10k_peer_unmap_event(struct ath1
@@ -248,8 +248,8 @@ void ath10k_peer_unmap_event(struct ath1
spin_lock_bh(&ar->data_lock);
peer = ath10k_peer_find_by_id(ar, ev->peer_id);
if (!peer) {

2
target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch
View File

@ -26,7 +26,7 @@
case UPIO_MEM:
case UPIO_MEM16:
case UPIO_MEM32:
@@ -2959,6 +2960,7 @@ int uart_match_port(struct uart_port *po
@@ -2960,6 +2961,7 @@ int uart_match_port(struct uart_port *po
case UPIO_HUB6:
return (port1->iobase == port2->iobase) &&
(port1->hub6 == port2->hub6);

6
target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
View File

@ -539,7 +539,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2378,7 +2378,8 @@ int register_netdevice_notifier(struct n
@@ -2379,7 +2379,8 @@ int register_netdevice_notifier(struct n
int unregister_netdevice_notifier(struct notifier_block *nb);
struct netdev_notifier_info {
@ -549,7 +549,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
};
struct netdev_notifier_info_ext {
@@ -2410,6 +2411,7 @@ static inline void netdev_notifier_info_
@@ -2411,6 +2412,7 @@ static inline void netdev_notifier_info_
struct net_device *dev)
{
info->dev = dev;
@ -557,7 +557,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
}
static inline struct net_device *
@@ -2418,6 +2420,12 @@ netdev_notifier_info_to_dev(const struct
@@ -2419,6 +2421,12 @@ netdev_notifier_info_to_dev(const struct
return info->dev;
}

48
target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch
View File

@ -2129,8 +2129,8 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
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(&params->addr, mac_dev->addr, sizeof(mac_dev->addr));
params->max_speed = priv->max_speed;
- params->phy_if = priv->phy_if;
@ -2138,7 +2138,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
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);
@ -2156,7 +2156,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
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)
@ -2174,7 +2174,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
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)
@ -2237,7 +2237,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
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;
@ -2258,7 +2258,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
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;
@ -2279,7 +2279,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
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;
@ -2293,7 +2293,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
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,
@ -2303,7 +2303,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
{
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;
@ -2323,7 +2323,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
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;
@ -2331,7 +2331,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
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;
}
@ -2341,7 +2341,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
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;
@ -2350,7 +2350,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
}
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);
@ -2359,7 +2359,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
}
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;
@ -2368,7 +2368,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
}
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;
@ -2388,7 +2388,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
}
/* 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;
@ -2397,7 +2397,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
}
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;
@ -2406,7 +2406,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
}
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;
@ -2423,7 +2423,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
}
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;
}
@ -2440,7 +2440,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
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 */
@ -2480,7 +2480,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
}
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);
@ -2491,7 +2491,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
}
/* 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]);
@ -2500,7 +2500,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
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);

4
target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch
View File

@ -528,7 +528,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
reg &= ~DWC3_DCTL_INITU2ENA;
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -3244,6 +3244,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
@@ -3257,6 +3257,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
{
int ret;
int irq;
@ -536,7 +536,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
irq = dwc3_gadget_get_irq(dwc);
if (irq < 0) {
@@ -3322,6 +3323,12 @@ int dwc3_gadget_init(struct dwc3 *dwc)
@@ -3335,6 +3336,12 @@ int dwc3_gadget_init(struct dwc3 *dwc)
dwc3_gadget_set_speed(&dwc->gadget, dwc->maximum_speed);

34
target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch
View File

@ -131,7 +131,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
};
/**
@@ -500,13 +550,20 @@ static void esdhc_clock_enable(struct sd
@@ -504,13 +554,20 @@ static void esdhc_clock_enable(struct sd
}
}
@ -152,7 +152,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
u32 temp;
host->mmc->actual_clock = 0;
@@ -520,27 +577,14 @@ static void esdhc_of_set_clock(struct sd
@@ -524,27 +581,14 @@ static void esdhc_of_set_clock(struct sd
if (esdhc->vendor_ver < VENDOR_V_23)
pre_div = 2;
@ -187,7 +187,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL);
temp &= ~(ESDHC_CLOCK_SDCLKEN | ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN |
@@ -553,9 +597,30 @@ static void esdhc_of_set_clock(struct sd
@@ -557,9 +601,30 @@ static void esdhc_of_set_clock(struct sd
while (host->max_clk / pre_div / div > clock && div < 16)
div++;
@ -218,7 +218,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
pre_div >>= 1;
div--;
@@ -565,6 +630,29 @@ static void esdhc_of_set_clock(struct sd
@@ -569,6 +634,29 @@ static void esdhc_of_set_clock(struct sd
| (pre_div << ESDHC_PREDIV_SHIFT));
sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL);
@ -248,7 +248,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
/* Wait max 20 ms */
timeout = ktime_add_ms(ktime_get(), 20);
while (1) {
@@ -580,6 +668,7 @@ static void esdhc_of_set_clock(struct sd
@@ -584,6 +672,7 @@ static void esdhc_of_set_clock(struct sd
udelay(10);
}
@ -256,7 +256,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
temp |= ESDHC_CLOCK_SDCLKEN;
sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL);
}
@@ -608,6 +697,8 @@ static void esdhc_pltfm_set_bus_width(st
@@ -612,6 +701,8 @@ static void esdhc_pltfm_set_bus_width(st
static void esdhc_reset(struct sdhci_host *host, u8 mask)
{
@ -265,7 +265,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
u32 val;
sdhci_reset(host, mask);
@@ -619,6 +710,12 @@ static void esdhc_reset(struct sdhci_hos
@@ -623,6 +714,12 @@ static void esdhc_reset(struct sdhci_hos
val = sdhci_readl(host, ESDHC_TBCTL);
val &= ~ESDHC_TB_EN;
sdhci_writel(host, val, ESDHC_TBCTL);
@ -278,7 +278,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
}
}
@@ -630,6 +727,7 @@ static void esdhc_reset(struct sdhci_hos
@@ -634,6 +731,7 @@ static void esdhc_reset(struct sdhci_hos
static const struct of_device_id scfg_device_ids[] = {
{ .compatible = "fsl,t1040-scfg", },
{ .compatible = "fsl,ls1012a-scfg", },
@ -286,7 +286,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
{ .compatible = "fsl,ls1046a-scfg", },
{}
};
@@ -692,23 +790,91 @@ static int esdhc_signal_voltage_switch(s
@@ -696,23 +794,91 @@ static int esdhc_signal_voltage_switch(s
}
}
@ -383,7 +383,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
}
#ifdef CONFIG_PM_SLEEP
@@ -757,7 +923,7 @@ static const struct sdhci_ops sdhci_esdh
@@ -761,7 +927,7 @@ static const struct sdhci_ops sdhci_esdh
.adma_workaround = esdhc_of_adma_workaround,
.set_bus_width = esdhc_pltfm_set_bus_width,
.reset = esdhc_reset,
@ -392,7 +392,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
};
static const struct sdhci_ops sdhci_esdhc_le_ops = {
@@ -774,7 +940,7 @@ static const struct sdhci_ops sdhci_esdh
@@ -778,7 +944,7 @@ static const struct sdhci_ops sdhci_esdh
.adma_workaround = esdhc_of_adma_workaround,
.set_bus_width = esdhc_pltfm_set_bus_width,
.reset = esdhc_reset,
@ -401,7 +401,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
};
static const struct sdhci_pltfm_data sdhci_esdhc_be_pdata = {
@@ -800,8 +966,20 @@ static struct soc_device_attribute soc_i
@@ -804,8 +970,20 @@ static struct soc_device_attribute soc_i
{ },
};
@ -422,7 +422,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
struct sdhci_pltfm_host *pltfm_host;
struct sdhci_esdhc *esdhc;
struct device_node *np;
@@ -821,6 +999,24 @@ static void esdhc_init(struct platform_d
@@ -825,6 +1003,24 @@ static void esdhc_init(struct platform_d
else
esdhc->quirk_incorrect_hostver = false;
@ -447,7 +447,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
np = pdev->dev.of_node;
clk = of_clk_get(np, 0);
if (!IS_ERR(clk)) {
@@ -848,6 +1044,12 @@ static void esdhc_init(struct platform_d
@@ -852,6 +1048,12 @@ static void esdhc_init(struct platform_d
}
}
@ -460,7 +460,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
static int sdhci_esdhc_probe(struct platform_device *pdev)
{
struct sdhci_host *host;
@@ -871,6 +1073,7 @@ static int sdhci_esdhc_probe(struct plat
@@ -875,6 +1077,7 @@ static int sdhci_esdhc_probe(struct plat
host->mmc_host_ops.start_signal_voltage_switch =
esdhc_signal_voltage_switch;
host->mmc_host_ops.execute_tuning = esdhc_execute_tuning;
@ -468,7 +468,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
host->tuning_delay = 1;
esdhc_init(pdev, host);
@@ -879,6 +1082,11 @@ static int sdhci_esdhc_probe(struct plat
@@ -883,6 +1086,11 @@ static int sdhci_esdhc_probe(struct plat
pltfm_host = sdhci_priv(host);
esdhc = sdhci_pltfm_priv(pltfm_host);
@ -480,7 +480,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
if (esdhc->vendor_ver == VENDOR_V_22)
host->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23;
@@ -925,14 +1133,6 @@ static int sdhci_esdhc_probe(struct plat
@@ -929,14 +1137,6 @@ static int sdhci_esdhc_probe(struct plat
return ret;
}

2
target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
View File

@ -49,7 +49,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
};
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1060,34 +1060,6 @@ int phylink_ethtool_set_pauseparam(struc
@@ -1065,34 +1065,6 @@ int phylink_ethtool_set_pauseparam(struc
}
EXPORT_SYMBOL_GPL(phylink_ethtool_set_pauseparam);

4
target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -777,8 +777,8 @@ void phylink_start(struct phylink *pl)
@@ -782,8 +782,8 @@ void phylink_start(struct phylink *pl)
clear_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state);
phylink_run_resolve(pl);
@ -21,7 +21,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
if (pl->phydev)
phy_start(pl->phydev);
}
@@ -790,8 +790,8 @@ void phylink_stop(struct phylink *pl)
@@ -795,8 +795,8 @@ void phylink_stop(struct phylink *pl)
if (pl->phydev)
phy_stop(pl->phydev);

4
target/linux/oxnas/patches-4.14/999-libata-hacks.patch
View File

@ -15,7 +15,7 @@
/* initialize internal qc */
/* XXX: Tag 0 is used for drivers with legacy EH as some
@@ -5166,6 +5174,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
@@ -5167,6 +5175,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (unlikely(ap->pflags & ATA_PFLAG_FROZEN))
return NULL;
@ -25,7 +25,7 @@
/* libsas case */
if (ap->flags & ATA_FLAG_SAS_HOST) {
tag = ata_sas_allocate_tag(ap);
@@ -5211,6 +5222,8 @@ void ata_qc_free(struct ata_queued_cmd *
@@ -5212,6 +5223,8 @@ void ata_qc_free(struct ata_queued_cmd *
qc->tag = ATA_TAG_POISON;
if (ap->flags & ATA_FLAG_SAS_HOST)
ata_sas_free_tag(tag, ap);