diff options
Diffstat (limited to 'target')
25 files changed, 65 insertions, 65 deletions
diff --git a/target/linux/cns3xxx/patches-4.14/070-i2c_support.patch b/target/linux/cns3xxx/patches-4.14/070-i2c_support.patch index bacec36085..53a6f7ff5e 100644 --- a/target/linux/cns3xxx/patches-4.14/070-i2c_support.patch +++ b/target/linux/cns3xxx/patches-4.14/070-i2c_support.patch @@ -1,6 +1,6 @@ --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig -@@ -473,6 +473,18 @@ config I2C_CBUS_GPIO +@@ -474,6 +474,18 @@ config I2C_CBUS_GPIO This driver can also be built as a module. If so, the module will be called i2c-cbus-gpio. diff --git a/target/linux/gemini/patches-4.14/0002-pinctrl-gemini-Add-missing-functions.patch b/target/linux/gemini/patches-4.14/0002-pinctrl-gemini-Add-missing-functions.patch index 604fee469c..d4e93f88b2 100644 --- a/target/linux/gemini/patches-4.14/0002-pinctrl-gemini-Add-missing-functions.patch +++ b/target/linux/gemini/patches-4.14/0002-pinctrl-gemini-Add-missing-functions.patch @@ -14,7 +14,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- a/drivers/pinctrl/pinctrl-gemini.c +++ b/drivers/pinctrl/pinctrl-gemini.c -@@ -2074,6 +2074,16 @@ static const struct gemini_pmx_func gemi +@@ -2102,6 +2102,16 @@ static const struct gemini_pmx_func gemi .num_groups = ARRAY_SIZE(satagrps), }, { diff --git a/target/linux/gemini/patches-4.14/0005-pinctrl-gemini-Use-generic-DT-parser.patch b/target/linux/gemini/patches-4.14/0005-pinctrl-gemini-Use-generic-DT-parser.patch index 5b0bba1cd4..f9debdd900 100644 --- a/target/linux/gemini/patches-4.14/0005-pinctrl-gemini-Use-generic-DT-parser.patch +++ b/target/linux/gemini/patches-4.14/0005-pinctrl-gemini-Use-generic-DT-parser.patch @@ -34,7 +34,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/regmap.h> -@@ -1918,73 +1920,13 @@ static void gemini_pin_dbg_show(struct p +@@ -1946,73 +1948,13 @@ static void gemini_pin_dbg_show(struct p seq_printf(s, " " DRIVER_NAME); } diff --git a/target/linux/gemini/patches-4.14/0006-pinctrl-gemini-Implement-clock-skew-delay-config.patch b/target/linux/gemini/patches-4.14/0006-pinctrl-gemini-Implement-clock-skew-delay-config.patch index 4bff3bce9c..87a051e1b2 100644 --- a/target/linux/gemini/patches-4.14/0006-pinctrl-gemini-Implement-clock-skew-delay-config.patch +++ b/target/linux/gemini/patches-4.14/0006-pinctrl-gemini-Implement-clock-skew-delay-config.patch @@ -97,7 +97,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> #define GLOBAL_MISC_CTRL 0x30 #define TVC_CLK_PAD_ENABLE BIT(20) #define PCI_CLK_PAD_ENABLE BIT(17) -@@ -1925,7 +1946,7 @@ static const struct pinctrl_ops gemini_p +@@ -1953,7 +1974,7 @@ static const struct pinctrl_ops gemini_p .get_group_name = gemini_get_group_name, .get_group_pins = gemini_get_group_pins, .pin_dbg_show = gemini_pin_dbg_show, @@ -106,7 +106,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> .dt_free_map = pinconf_generic_dt_free_map, }; -@@ -2203,10 +2224,155 @@ static const struct pinmux_ops gemini_pm +@@ -2232,10 +2253,155 @@ static const struct pinmux_ops gemini_pm .set_mux = gemini_pmx_set_mux, }; @@ -262,7 +262,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> .owner = THIS_MODULE, }; -@@ -2249,11 +2415,15 @@ static int gemini_pmx_probe(struct platf +@@ -2278,11 +2444,15 @@ static int gemini_pmx_probe(struct platf val &= 0xffff; if (val == 0x3512) { pmx->is_3512 = true; diff --git a/target/linux/gemini/patches-4.14/0007-pinctrl-gemini-Fix-GMAC-groups.patch b/target/linux/gemini/patches-4.14/0007-pinctrl-gemini-Fix-GMAC-groups.patch index 902168ba62..4a4dae34ca 100644 --- a/target/linux/gemini/patches-4.14/0007-pinctrl-gemini-Fix-GMAC-groups.patch +++ b/target/linux/gemini/patches-4.14/0007-pinctrl-gemini-Fix-GMAC-groups.patch @@ -55,7 +55,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> }; static const unsigned int pci_3512_pins[] = { -@@ -668,10 +678,10 @@ static const unsigned int gpio1c_3512_pi +@@ -671,10 +681,10 @@ static const unsigned int gpio1c_3512_pi /* The GPIO1D (28-31) pins overlap with LCD and TVC */ static const unsigned int gpio1d_3512_pins[] = { 246, 319, 301, 283 }; @@ -68,7 +68,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> static const unsigned int gpio2b_3512_pins[] = { 262, 244, 317, 299 }; /* The GPIO2C (8-31) pins overlap with PCI */ -@@ -738,9 +748,16 @@ static const struct gemini_pin_group gem +@@ -741,9 +751,16 @@ static const struct gemini_pin_group gem .num_pins = ARRAY_SIZE(usb_3512_pins), }, { @@ -88,7 +88,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> }, { .name = "pcigrp", -@@ -954,14 +971,15 @@ static const struct gemini_pin_group gem +@@ -963,14 +980,15 @@ static const struct gemini_pin_group gem .name = "gpio2agrp", .pins = gpio2a_3512_pins, .num_pins = ARRAY_SIZE(gpio2a_3512_pins), @@ -107,7 +107,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> }, { .name = "gpio2cgrp", -@@ -1441,9 +1459,12 @@ static const unsigned int usb_3516_pins[ +@@ -1450,9 +1468,12 @@ static const unsigned int usb_3516_pins[ }; /* GMII, ethernet pins */ @@ -123,7 +123,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> }; static const unsigned int pci_3516_pins[] = { -@@ -1585,10 +1606,10 @@ static const unsigned int gpio1c_3516_pi +@@ -1600,10 +1621,10 @@ static const unsigned int gpio1c_3516_pi /* The GPIO1D (28-31) pins overlap with TVC */ static const unsigned int gpio1d_3516_pins[] = { 353, 311, 394, 374 }; @@ -136,7 +136,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> static const unsigned int gpio2b_3516_pins[] = { 391, 351, 310, 371 }; /* The GPIO2C (8-31) pins overlap with PCI */ -@@ -1660,9 +1681,16 @@ static const struct gemini_pin_group gem +@@ -1675,9 +1696,16 @@ static const struct gemini_pin_group gem .num_pins = ARRAY_SIZE(usb_3516_pins), }, { @@ -156,7 +156,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> }, { .name = "pcigrp", -@@ -1861,14 +1889,15 @@ static const struct gemini_pin_group gem +@@ -1889,14 +1917,15 @@ static const struct gemini_pin_group gem .name = "gpio2agrp", .pins = gpio2a_3516_pins, .num_pins = ARRAY_SIZE(gpio2a_3516_pins), @@ -175,7 +175,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> }, { .name = "gpio2cgrp", -@@ -1971,7 +2000,7 @@ static const char * const icegrps[] = { +@@ -1999,7 +2028,7 @@ static const char * const icegrps[] = { static const char * const idegrps[] = { "idegrp" }; static const char * const satagrps[] = { "satagrp" }; static const char * const usbgrps[] = { "usbgrp" }; diff --git a/target/linux/gemini/patches-4.14/0009-pinctrl-gemini-Add-two-missing-GPIO-groups.patch b/target/linux/gemini/patches-4.14/0009-pinctrl-gemini-Add-two-missing-GPIO-groups.patch index 46fc102c1d..dfb93f6ade 100644 --- a/target/linux/gemini/patches-4.14/0009-pinctrl-gemini-Add-two-missing-GPIO-groups.patch +++ b/target/linux/gemini/patches-4.14/0009-pinctrl-gemini-Add-two-missing-GPIO-groups.patch @@ -13,7 +13,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- a/drivers/pinctrl/pinctrl-gemini.c +++ b/drivers/pinctrl/pinctrl-gemini.c -@@ -2015,7 +2015,8 @@ static const char * const sflashgrps[] = +@@ -2043,7 +2043,8 @@ static const char * const sflashgrps[] = static const char * const gpio0grps[] = { "gpio0agrp", "gpio0bgrp", "gpio0cgrp", "gpio0dgrp", "gpio0egrp", "gpio0fgrp", "gpio0ggrp", "gpio0hgrp", "gpio0igrp", diff --git a/target/linux/gemini/patches-4.14/0010-pinctrl-gemini-Fix-usage-of-3512-groups.patch b/target/linux/gemini/patches-4.14/0010-pinctrl-gemini-Fix-usage-of-3512-groups.patch index 1cab269a64..f01edb9bff 100644 --- a/target/linux/gemini/patches-4.14/0010-pinctrl-gemini-Fix-usage-of-3512-groups.patch +++ b/target/linux/gemini/patches-4.14/0010-pinctrl-gemini-Fix-usage-of-3512-groups.patch @@ -14,7 +14,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- a/drivers/pinctrl/pinctrl-gemini.c +++ b/drivers/pinctrl/pinctrl-gemini.c -@@ -2323,7 +2323,7 @@ static const struct gemini_pin_conf *gem +@@ -2352,7 +2352,7 @@ static const struct gemini_pin_conf *gem int i; for (i = 0; i < pmx->nconfs; i++) { diff --git a/target/linux/gemini/patches-4.14/0011-pinctrl-gemini-Support-drive-strength-setting.patch b/target/linux/gemini/patches-4.14/0011-pinctrl-gemini-Support-drive-strength-setting.patch index 5fefece493..e6d153403e 100644 --- a/target/linux/gemini/patches-4.14/0011-pinctrl-gemini-Support-drive-strength-setting.patch +++ b/target/linux/gemini/patches-4.14/0011-pinctrl-gemini-Support-drive-strength-setting.patch @@ -54,7 +54,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> #define GLOBAL_GMAC_CTRL_SKEW 0x1c #define GLOBAL_GMAC0_DATA_SKEW 0x20 #define GLOBAL_GMAC1_DATA_SKEW 0x24 -@@ -738,6 +743,7 @@ static const struct gemini_pin_group gem +@@ -741,6 +746,7 @@ static const struct gemini_pin_group gem /* Conflict with all flash usage */ .value = IDE_PADS_ENABLE | NAND_PADS_DISABLE | PFLASH_PADS_DISABLE | SFLASH_PADS_DISABLE, @@ -62,7 +62,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> }, { .name = "satagrp", -@@ -753,6 +759,7 @@ static const struct gemini_pin_group gem +@@ -756,6 +762,7 @@ static const struct gemini_pin_group gem .name = "gmii_gmac0_grp", .pins = gmii_gmac0_3512_pins, .num_pins = ARRAY_SIZE(gmii_gmac0_3512_pins), @@ -70,7 +70,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> }, { .name = "gmii_gmac1_grp", -@@ -760,6 +767,7 @@ static const struct gemini_pin_group gem +@@ -763,6 +770,7 @@ static const struct gemini_pin_group gem .num_pins = ARRAY_SIZE(gmii_gmac1_3512_pins), /* Bring out RGMII on the GMAC1 pins */ .value = GEMINI_GMAC_IOSEL_GMAC0_GMAC1_RGMII, @@ -78,7 +78,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> }, { .name = "pcigrp", -@@ -767,6 +775,7 @@ static const struct gemini_pin_group gem +@@ -770,6 +778,7 @@ static const struct gemini_pin_group gem .num_pins = ARRAY_SIZE(pci_3512_pins), /* Conflict only with GPIO2 */ .value = PCI_PADS_ENABLE | PCI_CLK_PAD_ENABLE, @@ -86,7 +86,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> }, { .name = "lpcgrp", -@@ -1671,6 +1680,7 @@ static const struct gemini_pin_group gem +@@ -1686,6 +1695,7 @@ static const struct gemini_pin_group gem /* Conflict with all flash usage */ .value = IDE_PADS_ENABLE | NAND_PADS_DISABLE | PFLASH_PADS_DISABLE | SFLASH_PADS_DISABLE, @@ -94,7 +94,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> }, { .name = "satagrp", -@@ -1686,6 +1696,7 @@ static const struct gemini_pin_group gem +@@ -1701,6 +1711,7 @@ static const struct gemini_pin_group gem .name = "gmii_gmac0_grp", .pins = gmii_gmac0_3516_pins, .num_pins = ARRAY_SIZE(gmii_gmac0_3516_pins), @@ -102,7 +102,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> }, { .name = "gmii_gmac1_grp", -@@ -1693,6 +1704,7 @@ static const struct gemini_pin_group gem +@@ -1708,6 +1719,7 @@ static const struct gemini_pin_group gem .num_pins = ARRAY_SIZE(gmii_gmac1_3516_pins), /* Bring out RGMII on the GMAC1 pins */ .value = GEMINI_GMAC_IOSEL_GMAC0_GMAC1_RGMII, @@ -110,7 +110,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> }, { .name = "pcigrp", -@@ -1700,6 +1712,7 @@ static const struct gemini_pin_group gem +@@ -1715,6 +1727,7 @@ static const struct gemini_pin_group gem .num_pins = ARRAY_SIZE(pci_3516_pins), /* Conflict only with GPIO2 */ .value = PCI_PADS_ENABLE | PCI_CLK_PAD_ENABLE, @@ -118,7 +118,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> }, { .name = "lpcgrp", -@@ -2394,9 +2407,77 @@ static int gemini_pinconf_set(struct pin +@@ -2423,9 +2436,77 @@ static int gemini_pinconf_set(struct pin return ret; } diff --git a/target/linux/generic/backport-4.14/303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch b/target/linux/generic/backport-4.14/303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch index ed33b2fc5f..a2388a1b9b 100644 --- a/target/linux/generic/backport-4.14/303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch +++ b/target/linux/generic/backport-4.14/303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch @@ -361,7 +361,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> par->hook_mask = 1 << ops->hooknum; } else { -@@ -318,7 +318,7 @@ static int nft_target_validate(const str +@@ -337,7 +337,7 @@ static int nft_target_validate(const str if (nft_is_base_chain(ctx->chain)) { const struct nft_base_chain *basechain = nft_base_chain(ctx->chain); @@ -370,7 +370,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> hook_mask = 1 << ops->hooknum; if (target->hooks && !(hook_mask & target->hooks)) -@@ -415,7 +415,7 @@ nft_match_set_mtchk_param(struct xt_mtch +@@ -434,7 +434,7 @@ nft_match_set_mtchk_param(struct xt_mtch if (nft_is_base_chain(ctx->chain)) { const struct nft_base_chain *basechain = nft_base_chain(ctx->chain); @@ -379,7 +379,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> par->hook_mask = 1 << ops->hooknum; } else { -@@ -566,7 +566,7 @@ static int nft_match_validate(const stru +@@ -586,7 +586,7 @@ static int nft_match_validate(const stru if (nft_is_base_chain(ctx->chain)) { const struct nft_base_chain *basechain = nft_base_chain(ctx->chain); diff --git a/target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch b/target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch index a577e621bd..9108a5e4dc 100644 --- a/target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch +++ b/target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch @@ -1237,7 +1237,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> if (par.target->destroy != NULL) par.target->destroy(&par); -@@ -390,7 +390,7 @@ nft_match_set_mtchk_param(struct xt_mtch +@@ -409,7 +409,7 @@ nft_match_set_mtchk_param(struct xt_mtch { par->net = ctx->net; par->table = ctx->table->name; @@ -1246,7 +1246,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> case AF_INET: entry->e4.ip.proto = proto; entry->e4.ip.invflags = inv ? IPT_INV_PROTO : 0; -@@ -421,7 +421,7 @@ nft_match_set_mtchk_param(struct xt_mtch +@@ -440,7 +440,7 @@ nft_match_set_mtchk_param(struct xt_mtch } else { par->hook_mask = 0; } @@ -1255,7 +1255,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> par->nft_compat = true; } -@@ -504,7 +504,7 @@ __nft_match_destroy(const struct nft_ctx +@@ -523,7 +523,7 @@ __nft_match_destroy(const struct nft_ctx par.net = ctx->net; par.match = match; par.matchinfo = info; @@ -1264,7 +1264,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> if (par.match->destroy != NULL) par.match->destroy(&par); -@@ -734,7 +734,7 @@ nft_match_select_ops(const struct nft_ct +@@ -754,7 +754,7 @@ nft_match_select_ops(const struct nft_ct mt_name = nla_data(tb[NFTA_MATCH_NAME]); rev = ntohl(nla_get_be32(tb[NFTA_MATCH_REV])); @@ -1273,7 +1273,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> /* Re-use the existing match if it's already loaded. */ list_for_each_entry(nft_match, &nft_match_list, head) { -@@ -825,7 +825,7 @@ nft_target_select_ops(const struct nft_c +@@ -845,7 +845,7 @@ nft_target_select_ops(const struct nft_c tg_name = nla_data(tb[NFTA_TARGET_NAME]); rev = ntohl(nla_get_be32(tb[NFTA_TARGET_REV])); diff --git a/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch b/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch index 9625a51129..5e70756c4e 100644 --- a/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch +++ b/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch @@ -46,7 +46,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> errors per {size} bytes". --- a/drivers/mtd/maps/physmap_of_core.c +++ b/drivers/mtd/maps/physmap_of_core.c -@@ -114,37 +114,9 @@ static struct mtd_info *obsolete_probe(s +@@ -105,37 +105,9 @@ static struct mtd_info *obsolete_probe(s static const char * const part_probe_types_def[] = { "cmdlinepart", "RedBoot", "ofpart", "ofoldpart", NULL }; @@ -84,7 +84,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> const struct of_device_id *match; struct device_node *dp = dev->dev.of_node; struct resource res; -@@ -310,14 +282,8 @@ static int of_flash_probe(struct platfor +@@ -293,14 +265,8 @@ static int of_flash_probe(struct platfor info->cmtd->dev.parent = &dev->dev; mtd_set_of_node(info->cmtd, dp); diff --git a/target/linux/ipq806x/patches-4.14/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch b/target/linux/ipq806x/patches-4.14/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch index cca2fcaa4f..7c78d444f8 100644 --- a/target/linux/ipq806x/patches-4.14/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch +++ b/target/linux/ipq806x/patches-4.14/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch @@ -10,7 +10,7 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org> --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c -@@ -1292,11 +1292,13 @@ struct opp_table *dev_pm_opp_set_regulat +@@ -1280,11 +1280,13 @@ struct opp_table *dev_pm_opp_set_regulat if (!opp_table) return ERR_PTR(-ENOMEM); diff --git a/target/linux/ipq806x/patches-4.14/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch b/target/linux/ipq806x/patches-4.14/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch index 9f7c8185e9..ef48e9f01b 100644 --- a/target/linux/ipq806x/patches-4.14/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch +++ b/target/linux/ipq806x/patches-4.14/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch @@ -27,7 +27,7 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org> --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c -@@ -1620,6 +1620,83 @@ put_table: +@@ -1608,6 +1608,83 @@ put_table: } /** diff --git a/target/linux/ipq806x/patches-4.14/0051-PM-OPP-Add-a-helper-to-get-an-opp-regulator-for-devi.patch b/target/linux/ipq806x/patches-4.14/0051-PM-OPP-Add-a-helper-to-get-an-opp-regulator-for-devi.patch index 7819dc0dd8..22ae309801 100644 --- a/target/linux/ipq806x/patches-4.14/0051-PM-OPP-Add-a-helper-to-get-an-opp-regulator-for-devi.patch +++ b/target/linux/ipq806x/patches-4.14/0051-PM-OPP-Add-a-helper-to-get-an-opp-regulator-for-devi.patch @@ -12,7 +12,7 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org> --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c -@@ -131,6 +131,27 @@ unsigned long dev_pm_opp_get_freq(struct +@@ -126,6 +126,27 @@ unsigned long dev_pm_opp_get_freq(struct } EXPORT_SYMBOL_GPL(dev_pm_opp_get_freq); diff --git a/target/linux/ipq806x/patches-4.14/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch b/target/linux/ipq806x/patches-4.14/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch index 3105b4ea1b..7cde22be0b 100644 --- a/target/linux/ipq806x/patches-4.14/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch +++ b/target/linux/ipq806x/patches-4.14/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch @@ -17,7 +17,7 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org> --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c -@@ -1664,6 +1664,7 @@ int dev_pm_opp_adjust_voltage(struct dev +@@ -1652,6 +1652,7 @@ int dev_pm_opp_adjust_voltage(struct dev struct opp_table *opp_table; struct dev_pm_opp *new_opp, *tmp_opp, *opp = ERR_PTR(-ENODEV); int r = 0; @@ -25,7 +25,7 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org> /* keep the node allocated */ new_opp = kmalloc(sizeof(*new_opp), GFP_KERNEL); -@@ -1700,6 +1701,10 @@ int dev_pm_opp_adjust_voltage(struct dev +@@ -1688,6 +1689,10 @@ int dev_pm_opp_adjust_voltage(struct dev /* plug in new node */ new_opp->supplies[0].u_volt = u_volt; diff --git a/target/linux/lantiq/patches-4.14/0031-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch b/target/linux/lantiq/patches-4.14/0031-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch index a1e1cceddc..a1d92c39e2 100644 --- a/target/linux/lantiq/patches-4.14/0031-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch +++ b/target/linux/lantiq/patches-4.14/0031-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch @@ -18,7 +18,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig -@@ -696,6 +696,16 @@ config I2C_MESON +@@ -697,6 +697,16 @@ config I2C_MESON If you say yes to this option, support will be included for the I2C interface on the Amlogic Meson family of SoCs. diff --git a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch index 34a86b56bb..ab43bc49fc 100644 --- a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch @@ -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 -@@ -3211,6 +3211,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -3220,6 +3220,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) { -@@ -3290,6 +3291,12 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -3299,6 +3300,12 @@ int dwc3_gadget_init(struct dwc3 *dwc) dwc3_gadget_set_speed(&dwc->gadget, dwc->maximum_speed); diff --git a/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch b/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch index 502a99fa87..470aa683fa 100644 --- a/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch @@ -74,7 +74,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com> kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_DECREMENTER); --- a/virt/kvm/arm/mmu.c +++ b/virt/kvm/arm/mmu.c -@@ -1027,9 +1027,11 @@ static int stage2_pmdp_test_and_clear_yo +@@ -1028,9 +1028,11 @@ static int stage2_pmdp_test_and_clear_yo * @guest_ipa: The IPA at which to insert the mapping * @pa: The physical address of the device * @size: The size of the mapping @@ -87,7 +87,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com> { phys_addr_t addr, end; int ret = 0; -@@ -1040,7 +1042,7 @@ int kvm_phys_addr_ioremap(struct kvm *kv +@@ -1041,7 +1043,7 @@ int kvm_phys_addr_ioremap(struct kvm *kv pfn = __phys_to_pfn(pa); for (addr = guest_ipa; addr < end; addr += PAGE_SIZE) { @@ -96,7 +96,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com> if (writable) pte = kvm_s2pte_mkwrite(pte); -@@ -1064,6 +1066,30 @@ out: +@@ -1065,6 +1067,30 @@ out: return ret; } @@ -127,7 +127,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com> static bool transparent_hugepage_adjust(kvm_pfn_t *pfnp, phys_addr_t *ipap) { kvm_pfn_t pfn = *pfnp; -@@ -1340,6 +1366,18 @@ static int user_mem_abort(struct kvm_vcp +@@ -1341,6 +1367,18 @@ static int user_mem_abort(struct kvm_vcp hugetlb = true; gfn = (fault_ipa & PMD_MASK) >> PAGE_SHIFT; } else { @@ -146,7 +146,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com> /* * Pages belonging to memslots that don't have the same * alignment for userspace and IPA cannot be mapped using -@@ -1381,6 +1419,11 @@ static int user_mem_abort(struct kvm_vcp +@@ -1382,6 +1420,11 @@ static int user_mem_abort(struct kvm_vcp if (is_error_noslot_pfn(pfn)) return -EFAULT; @@ -158,7 +158,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com> if (kvm_is_device_pfn(pfn)) { mem_type = PAGE_S2_DEVICE; flags |= KVM_S2PTE_FLAG_IS_IOMAP; -@@ -1917,6 +1960,9 @@ int kvm_arch_prepare_memory_region(struc +@@ -1918,6 +1961,9 @@ int kvm_arch_prepare_memory_region(struc gpa_t gpa = mem->guest_phys_addr + (vm_start - mem->userspace_addr); phys_addr_t pa; @@ -168,7 +168,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com> pa = (phys_addr_t)vma->vm_pgoff << PAGE_SHIFT; pa += vm_start - vma->vm_start; -@@ -1927,9 +1973,13 @@ int kvm_arch_prepare_memory_region(struc +@@ -1928,9 +1974,13 @@ int kvm_arch_prepare_memory_region(struc goto out; } diff --git a/target/linux/layerscape/patches-4.14/813-ifc-nor-nand-support-layerscape.patch b/target/linux/layerscape/patches-4.14/813-ifc-nor-nand-support-layerscape.patch index dd024305cd..8e9cd1d4a1 100644 --- a/target/linux/layerscape/patches-4.14/813-ifc-nor-nand-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/813-ifc-nor-nand-support-layerscape.patch @@ -321,7 +321,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_platform.h> -@@ -205,6 +206,9 @@ static int of_flash_probe(struct platfor +@@ -197,6 +198,9 @@ static int of_flash_probe(struct platfor info->list[i].map.bankwidth = be32_to_cpup(width); info->list[i].map.device_node = dp; diff --git a/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch b/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch index 781333356a..f3f09989a7 100644 --- a/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch @@ -5841,7 +5841,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> #endif /* __UAPI_LINUX_PCITEST_H */ --- a/tools/pci/pcitest.c +++ b/tools/pci/pcitest.c -@@ -31,12 +31,17 @@ +@@ -30,12 +30,17 @@ #define BILLION 1E9 static char *result[] = { "NOT OKAY", "OKAY" }; @@ -5859,7 +5859,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> bool read; bool write; bool copy; -@@ -65,6 +70,24 @@ static int run_test(struct pci_test *tes +@@ -62,6 +67,24 @@ static int run_test(struct pci_test *tes fprintf(stdout, "%s\n", result[ret]); } @@ -5884,7 +5884,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> if (test->legacyirq) { ret = ioctl(fd, PCITEST_LEGACY_IRQ, 0); fprintf(stdout, "LEGACY IRQ:\t"); -@@ -83,6 +106,15 @@ static int run_test(struct pci_test *tes +@@ -80,6 +103,15 @@ static int run_test(struct pci_test *tes fprintf(stdout, "%s\n", result[ret]); } @@ -5900,7 +5900,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> if (test->write) { ret = ioctl(fd, PCITEST_WRITE, test->size); fprintf(stdout, "WRITE (%7ld bytes):\t\t", test->size); -@@ -133,7 +165,7 @@ int main(int argc, char **argv) +@@ -130,7 +162,7 @@ int main(int argc, char **argv) /* set default endpoint device */ test->device = "/dev/pci-endpoint-test.0"; @@ -5909,7 +5909,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> switch (c) { case 'D': test->device = optarg; -@@ -151,6 +183,20 @@ int main(int argc, char **argv) +@@ -148,6 +180,20 @@ int main(int argc, char **argv) if (test->msinum < 1 || test->msinum > 32) goto usage; continue; @@ -5930,7 +5930,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> case 'r': test->read = true; continue; -@@ -173,6 +219,9 @@ usage: +@@ -170,6 +216,9 @@ usage: "\t-D <dev> PCI endpoint test device {default: /dev/pci-endpoint-test.0}\n" "\t-b <bar num> BAR test (bar number between 0..5)\n" "\t-m <msi num> MSI test (msi number between 1..32)\n" diff --git a/target/linux/mediatek/patches-4.14/0173-clk-mediatek-fixup-test-building-of-MediaTek-clock-d.patch b/target/linux/mediatek/patches-4.14/0173-clk-mediatek-fixup-test-building-of-MediaTek-clock-d.patch index f8a755003a..259a93cf2f 100644 --- a/target/linux/mediatek/patches-4.14/0173-clk-mediatek-fixup-test-building-of-MediaTek-clock-d.patch +++ b/target/linux/mediatek/patches-4.14/0173-clk-mediatek-fixup-test-building-of-MediaTek-clock-d.patch @@ -16,8 +16,8 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile -@@ -67,7 +67,7 @@ obj-$(CONFIG_ARCH_MXC) += imx/ - obj-$(CONFIG_MACH_INGENIC) += ingenic/ +@@ -68,7 +68,7 @@ obj-$(CONFIG_MACH_INGENIC) += ingenic/ + obj-$(CONFIG_ARCH_K3) += keystone/ obj-$(CONFIG_ARCH_KEYSTONE) += keystone/ obj-$(CONFIG_MACH_LOONGSON32) += loongson1/ -obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/ diff --git a/target/linux/mxs/patches-4.14/110-crypto-mxsdcp-provide-importexport.patch b/target/linux/mxs/patches-4.14/110-crypto-mxsdcp-provide-importexport.patch index 3be3e1a111..4a1722a663 100644 --- a/target/linux/mxs/patches-4.14/110-crypto-mxsdcp-provide-importexport.patch +++ b/target/linux/mxs/patches-4.14/110-crypto-mxsdcp-provide-importexport.patch @@ -1,6 +1,6 @@ --- a/drivers/crypto/mxs-dcp.c +++ b/drivers/crypto/mxs-dcp.c -@@ -777,6 +777,24 @@ static void dcp_sha_cra_exit(struct cryp +@@ -833,6 +833,24 @@ static void dcp_sha_cra_exit(struct cryp { } @@ -25,7 +25,7 @@ /* AES 128 ECB and AES 128 CBC */ static struct crypto_alg dcp_aes_algs[] = { { -@@ -836,8 +854,11 @@ static struct ahash_alg dcp_sha1_alg = { +@@ -892,8 +910,11 @@ static struct ahash_alg dcp_sha1_alg = { .final = dcp_sha_final, .finup = dcp_sha_finup, .digest = dcp_sha_digest, @@ -37,7 +37,7 @@ .base = { .cra_name = "sha1", .cra_driver_name = "sha1-dcp", -@@ -860,8 +881,11 @@ static struct ahash_alg dcp_sha256_alg = +@@ -916,8 +937,11 @@ static struct ahash_alg dcp_sha256_alg = .final = dcp_sha_final, .finup = dcp_sha_finup, .digest = dcp_sha_digest, diff --git a/target/linux/oxnas/patches-4.14/500-oxnas-sata.patch b/target/linux/oxnas/patches-4.14/500-oxnas-sata.patch index 5fe0746086..0699e158a7 100644 --- a/target/linux/oxnas/patches-4.14/500-oxnas-sata.patch +++ b/target/linux/oxnas/patches-4.14/500-oxnas-sata.patch @@ -1,6 +1,6 @@ --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig -@@ -492,6 +492,13 @@ config SATA_VITESSE +@@ -493,6 +493,13 @@ config SATA_VITESSE If unsure, say N. diff --git a/target/linux/ramips/patches-4.14/0044-i2c-MIPS-adds-ralink-I2C-driver.patch b/target/linux/ramips/patches-4.14/0044-i2c-MIPS-adds-ralink-I2C-driver.patch index 471c8f40e0..4905aba046 100644 --- a/target/linux/ramips/patches-4.14/0044-i2c-MIPS-adds-ralink-I2C-driver.patch +++ b/target/linux/ramips/patches-4.14/0044-i2c-MIPS-adds-ralink-I2C-driver.patch @@ -45,7 +45,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> +}; --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig -@@ -863,6 +863,11 @@ config I2C_RK3X +@@ -864,6 +864,11 @@ config I2C_RK3X This driver can also be built as a module. If so, the module will be called i2c-rk3x. diff --git a/target/linux/ramips/patches-4.14/0045-i2c-add-mt7621-driver.patch b/target/linux/ramips/patches-4.14/0045-i2c-add-mt7621-driver.patch index 9cd8c4b5cf..a848085520 100644 --- a/target/linux/ramips/patches-4.14/0045-i2c-add-mt7621-driver.patch +++ b/target/linux/ramips/patches-4.14/0045-i2c-add-mt7621-driver.patch @@ -13,7 +13,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig -@@ -868,6 +868,11 @@ config I2C_RALINK +@@ -869,6 +869,11 @@ config I2C_RALINK depends on RALINK && !SOC_MT7621 select OF_I2C |