Skip to content
Permalink
Browse files

kernel: bump 4.19 to 4.19.18

Refreshed all patches.

Removed upstreamed:
- 031-v5.0-MIPS-BCM47XX-Setup-struct-device-for-the-SoC.patch
- 142-jffs2-Fix-use-of-uninitialized-delayed_work-lockdep-.patch

Removed upstreamed hunk in:
- 800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch

Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
  • Loading branch information...
xback committed Jan 28, 2019
1 parent 880a4b3 commit f003d732d726758f11f0c308758637c434c37c1a
Showing with 60 additions and 386 deletions.
  1. +2 −2 include/kernel-version.mk
  2. +0 −128 target/linux/brcm47xx/patches-4.19/031-v5.0-MIPS-BCM47XX-Setup-struct-device-for-the-SoC.patch
  3. +1 −6 target/linux/gemini/patches-4.19/0001-pinctrl-gemini-Mask-and-set-properly.patch
  4. +12 −17 target/linux/gemini/patches-4.19/0002-pinctrl-gemini-Fix-up-TVC-clock-group.patch
  5. +5 −10 target/linux/gemini/patches-4.19/0003-pinctrl-gemini-Drop-noisy-debug-prints.patch
  6. +0 −5 target/linux/gemini/patches-4.19/0004-boot-sq201-from-sda1.patch
  7. +2 −7 target/linux/gemini/patches-4.19/0005-mtd-physmap_of-Move-custom-initialization.patch
  8. +3 −10 target/linux/gemini/patches-4.19/0006-mtd-physmap_of_gemini-Handle-pin-control.patch
  9. +0 −5 target/linux/gemini/patches-4.19/0007-ARM-dts-Fix-up-the-D-Link-DIR-685-MTD-partition-info.patch
  10. +0 −7 target/linux/gemini/patches-4.19/0008-ARM-dts-Enable-Gemini-flash-access.patch
  11. +0 −6 target/linux/gemini/patches-4.19/0009-mtd-partitions-Add-RedBoot-FIS-DT-bindings.patch
  12. +3 −8 target/linux/gemini/patches-4.19/0010-mtd-partitions-Add-second-compatible-for-redboot.patch
  13. +0 −5 target/linux/gemini/patches-4.19/0011-ARM-dts-Fix-up-SQ201-flash-access.patch
  14. +0 −5 target/linux/gemini/patches-4.19/0012-ARM-dts-Blank-D-Link-DIR-685-console.patch
  15. +4 −11 target/linux/gemini/patches-4.19/0013-usb-host-fotg2-add-silicon-clock-handling.patch
  16. +0 −6 target/linux/gemini/patches-4.19/0014-usb-host-add-DT-bindings-for-faraday-fotg2.patch
  17. +1 −6 target/linux/gemini/patches-4.19/0015-usb-host-fotg2-add-device-tree-probing.patch
  18. +2 −9 target/linux/gemini/patches-4.19/0016-usb-host-fotg2-add-Gemini-specific-handling.patch
  19. +1 −6 target/linux/gemini/patches-4.19/0017-usb-host-fotg2-restart-hcd-after-port-reset.patch
  20. +0 −19 target/linux/gemini/patches-4.19/0018-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini-boards.patch
  21. +6 −9 target/linux/generic/backport-4.19/800-v5.0-usb-leds-fix-regression-in-usbport-led-trigger.patch
  22. +1 −1 target/linux/generic/hack-4.19/204-module_strip.patch
  23. +1 −1 target/linux/generic/hack-4.19/301-mips_image_cmdline_hack.patch
  24. +1 −1 target/linux/generic/hack-4.19/901-debloat_sock_diag.patch
  25. +1 −1 target/linux/generic/hack-4.19/902-debloat_proc.patch
  26. +0 −62 target/linux/generic/pending-4.19/142-jffs2-Fix-use-of-uninitialized-delayed_work-lockdep-.patch
  27. +1 −1 target/linux/generic/pending-4.19/203-kallsyms_uncompressed.patch
  28. +2 −2 target/linux/generic/pending-4.19/300-mips_expose_boot_raw.patch
  29. +1 −1 target/linux/generic/pending-4.19/304-mips_disable_fpu.patch
  30. +5 −5 target/linux/generic/pending-4.19/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch
  31. +0 −10 target/linux/generic/pending-4.19/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch
  32. +1 −1 target/linux/generic/pending-4.19/920-mangle_bootargs.patch
  33. +4 −8 target/linux/mpc85xx/patches-4.19/105-powerpc-85xx-panda-support.patch
  34. +0 −5 target/linux/sunxi/patches-4.19/400-arm64-allwinner-a64-sopine-Add-Sopine-flash-partitio.patch
@@ -5,12 +5,12 @@ LINUX_RELEASE?=1
LINUX_VERSION-3.18 = .133
LINUX_VERSION-4.9 = .153
LINUX_VERSION-4.14 = .96
LINUX_VERSION-4.19 = .16
LINUX_VERSION-4.19 = .18

LINUX_KERNEL_HASH-3.18.133 = 3ec7f47365a8a050e629a5016e90e38a800e840c844901c979e9e796f8dc6711
LINUX_KERNEL_HASH-4.9.153 = 9066929ec2550794ae107350a5f3c5b648438aa915cfc62bac5b7a54b9d7731a
LINUX_KERNEL_HASH-4.14.96 = 110daeae1a416b7e0ec8dce5e86d67552deeb4567f696c3869389be239f0ecb5
LINUX_KERNEL_HASH-4.19.16 = d8a088381fe3e7e5484c060dabcdda4b053ef7114f91cfd56db003a89bb11bdf
LINUX_KERNEL_HASH-4.19.18 = 5ffdc068f9bf768b7cd5a8a2271d1370c2326e967848b13e21dfdbb1ef0ff3f1

remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

This file was deleted.

@@ -17,11 +17,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-gemini.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/pinctrl-gemini.c b/drivers/pinctrl/pinctrl-gemini.c
index fa7d998e1d5a..1e484a36ff07 100644
--- a/drivers/pinctrl/pinctrl-gemini.c
+++ b/drivers/pinctrl/pinctrl-gemini.c
@@ -2184,7 +2184,8 @@ static int gemini_pmx_set_mux(struct pinctrl_dev *pctldev,
@@ -2184,7 +2184,8 @@ static int gemini_pmx_set_mux(struct pin
func->name, grp->name);

regmap_read(pmx->map, GLOBAL_MISC_CTRL, &before);
@@ -31,6 +29,3 @@ index fa7d998e1d5a..1e484a36ff07 100644
grp->value);
regmap_read(pmx->map, GLOBAL_MISC_CTRL, &after);

--
2.19.2

@@ -18,11 +18,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-gemini.c | 44 ++++++++++++++++++++++++++------
1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-gemini.c b/drivers/pinctrl/pinctrl-gemini.c
index 1e484a36ff07..3535f9841861 100644
--- a/drivers/pinctrl/pinctrl-gemini.c
+++ b/drivers/pinctrl/pinctrl-gemini.c
@@ -591,13 +591,16 @@ static const unsigned int tvc_3512_pins[] = {
@@ -591,13 +591,16 @@ static const unsigned int tvc_3512_pins[
319, /* TVC_DATA[1] */
301, /* TVC_DATA[2] */
283, /* TVC_DATA[3] */
@@ -40,7 +38,7 @@ index 1e484a36ff07..3535f9841861 100644
/* NAND flash pins */
static const unsigned int nflash_3512_pins[] = {
199, 200, 201, 202, 216, 217, 218, 219, 220, 234, 235, 236, 237, 252,
@@ -629,7 +632,7 @@ static const unsigned int pflash_3512_pins_extended[] = {
@@ -629,7 +632,7 @@ static const unsigned int pflash_3512_pi
/* Serial flash pins CE0, CE1, DI, DO, CK */
static const unsigned int sflash_3512_pins[] = { 230, 231, 232, 233, 211 };

@@ -49,7 +47,7 @@ index 1e484a36ff07..3535f9841861 100644
static const unsigned int gpio0a_3512_pins[] = { 265 };

/* The GPIO0B (1-4) pins overlap with TVC and ICE */
@@ -823,7 +826,13 @@ static const struct gemini_pin_group gemini_3512_pin_groups[] = {
@@ -823,7 +826,13 @@ static const struct gemini_pin_group gem
.num_pins = ARRAY_SIZE(tvc_3512_pins),
/* Conflict with character LCD and ICE */
.mask = LCD_PADS_ENABLE,
@@ -64,7 +62,7 @@ index 1e484a36ff07..3535f9841861 100644
},
/*
* The construction is done such that it is possible to use a serial
@@ -860,8 +869,8 @@ static const struct gemini_pin_group gemini_3512_pin_groups[] = {
@@ -860,8 +869,8 @@ static const struct gemini_pin_group gem
.name = "gpio0agrp",
.pins = gpio0a_3512_pins,
.num_pins = ARRAY_SIZE(gpio0a_3512_pins),
@@ -75,7 +73,7 @@ index 1e484a36ff07..3535f9841861 100644
},
{
.name = "gpio0bgrp",
@@ -1531,13 +1540,16 @@ static const unsigned int tvc_3516_pins[] = {
@@ -1531,13 +1540,16 @@ static const unsigned int tvc_3516_pins[
311, /* TVC_DATA[1] */
394, /* TVC_DATA[2] */
374, /* TVC_DATA[3] */
@@ -93,7 +91,7 @@ index 1e484a36ff07..3535f9841861 100644
/* NAND flash pins */
static const unsigned int nflash_3516_pins[] = {
243, 260, 261, 224, 280, 262, 281, 264, 300, 263, 282, 301, 320, 283,
@@ -1570,7 +1582,7 @@ static const unsigned int pflash_3516_pins_extended[] = {
@@ -1570,7 +1582,7 @@ static const unsigned int pflash_3516_pi
static const unsigned int sflash_3516_pins[] = { 296, 338, 295, 359, 339 };

/* The GPIO0A (0-4) pins overlap with TVC and extended parallel flash */
@@ -102,7 +100,7 @@ index 1e484a36ff07..3535f9841861 100644

/* The GPIO0B (5-7) pins overlap with ICE */
static const unsigned int gpio0b_3516_pins[] = { 375, 396, 376 };
@@ -1602,6 +1614,9 @@ static const unsigned int gpio0j_3516_pins[] = { 359, 339 };
@@ -1602,6 +1614,9 @@ static const unsigned int gpio0j_3516_pi
/* The GPIO0K (30,31) pins overlap with NAND flash */
static const unsigned int gpio0k_3516_pins[] = { 275, 298 };

@@ -112,7 +110,7 @@ index 1e484a36ff07..3535f9841861 100644
/* The GPIO1A (0-4) pins that overlap with IDE and parallel flash */
static const unsigned int gpio1a_3516_pins[] = { 221, 200, 222, 201, 220 };

@@ -1761,7 +1776,13 @@ static const struct gemini_pin_group gemini_3516_pin_groups[] = {
@@ -1761,7 +1776,13 @@ static const struct gemini_pin_group gem
.num_pins = ARRAY_SIZE(tvc_3516_pins),
/* Conflict with character LCD */
.mask = LCD_PADS_ENABLE,
@@ -127,20 +125,17 @@ index 1e484a36ff07..3535f9841861 100644
},
/*
* The construction is done such that it is possible to use a serial
@@ -1872,6 +1893,13 @@ static const struct gemini_pin_group gemini_3516_pin_groups[] = {
/* Conflict with parallel and NAND flash */
@@ -1873,6 +1894,13 @@ static const struct gemini_pin_group gem
.value = PFLASH_PADS_DISABLE | NAND_PADS_DISABLE,
},
+ {
{
+ .name = "gpio0lgrp",
+ .pins = gpio0l_3516_pins,
+ .num_pins = ARRAY_SIZE(gpio0l_3516_pins),
+ /* Conflict with TVE CLK */
+ .mask = TVC_CLK_PAD_ENABLE,
+ },
{
+ {
.name = "gpio1agrp",
.pins = gpio1a_3516_pins,
--
2.19.2

.num_pins = ARRAY_SIZE(gpio1a_3516_pins),
@@ -11,11 +11,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-gemini.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-gemini.c b/drivers/pinctrl/pinctrl-gemini.c
index 3535f9841861..f75bf6f16a2e 100644
--- a/drivers/pinctrl/pinctrl-gemini.c
+++ b/drivers/pinctrl/pinctrl-gemini.c
@@ -2207,9 +2207,9 @@ static int gemini_pmx_set_mux(struct pinctrl_dev *pctldev,
@@ -2207,9 +2207,9 @@ static int gemini_pmx_set_mux(struct pin
return -ENODEV;
}

@@ -28,7 +26,7 @@ index 3535f9841861..f75bf6f16a2e 100644

regmap_read(pmx->map, GLOBAL_MISC_CTRL, &before);
regmap_update_bits(pmx->map, GLOBAL_MISC_CTRL,
@@ -2240,10 +2240,10 @@ static int gemini_pmx_set_mux(struct pinctrl_dev *pctldev,
@@ -2240,10 +2240,10 @@ static int gemini_pmx_set_mux(struct pin
"GLOBAL MISC CTRL before: %08x, after %08x, expected %08x\n",
before, after, expected);
} else {
@@ -43,7 +41,7 @@ index 3535f9841861..f75bf6f16a2e 100644
}
}

@@ -2262,10 +2262,10 @@ static int gemini_pmx_set_mux(struct pinctrl_dev *pctldev,
@@ -2262,10 +2262,10 @@ static int gemini_pmx_set_mux(struct pin
"GLOBAL MISC CTRL before: %08x, after %08x, expected %08x\n",
before, after, expected);
} else {
@@ -58,7 +56,7 @@ index 3535f9841861..f75bf6f16a2e 100644
}
}

@@ -2492,9 +2492,9 @@ static int gemini_pinconf_group_set(struct pinctrl_dev *pctldev,
@@ -2492,9 +2492,9 @@ static int gemini_pinconf_group_set(stru
regmap_update_bits(pmx->map, GLOBAL_IODRIVE,
grp->driving_mask,
val);
@@ -71,7 +69,7 @@ index 3535f9841861..f75bf6f16a2e 100644
break;
default:
dev_err(pmx->dev, "invalid config param %04x\n", param);
@@ -2585,8 +2585,8 @@ static int gemini_pmx_probe(struct platform_device *pdev)
@@ -2585,8 +2585,8 @@ static int gemini_pmx_probe(struct platf
/* Print initial state */
tmp = val;
for_each_set_bit(i, &tmp, PADS_MAXBIT) {
@@ -82,6 +80,3 @@ index 3535f9841861..f75bf6f16a2e 100644
}

/* Check if flash pin is set */
--
2.19.2

@@ -7,8 +7,6 @@ Subject: [PATCH 04/18] boot sq201 from sda1
arch/arm/boot/dts/gemini-sq201.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts
index 3787cf3763c4..66e2845a3edb 100644
--- a/arch/arm/boot/dts/gemini-sq201.dts
+++ b/arch/arm/boot/dts/gemini-sq201.dts
@@ -20,7 +20,7 @@
@@ -20,6 +18,3 @@ index 3787cf3763c4..66e2845a3edb 100644
stdout-path = &uart0;
};

--
2.19.2

@@ -14,11 +14,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/mtd/maps/physmap_of_core.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/mtd/maps/physmap_of_core.c b/drivers/mtd/maps/physmap_of_core.c
index 4129535b8e46..74ad753265f3 100644
--- a/drivers/mtd/maps/physmap_of_core.c
+++ b/drivers/mtd/maps/physmap_of_core.c
@@ -239,13 +239,6 @@ static int of_flash_probe(struct platform_device *dev)
@@ -239,13 +239,6 @@ static int of_flash_probe(struct platfor
else if (of_property_read_bool(dp, "little-endian"))
info->list[i].map.swap = CFI_LITTLE_ENDIAN;

@@ -32,7 +30,7 @@ index 4129535b8e46..74ad753265f3 100644
err = -ENOMEM;
info->list[i].map.virt = ioremap(info->list[i].map.phys,
info->list[i].map.size);
@@ -257,6 +250,14 @@ static int of_flash_probe(struct platform_device *dev)
@@ -257,6 +250,14 @@ static int of_flash_probe(struct platfor

simple_map_init(&info->list[i].map);

@@ -47,6 +45,3 @@ index 4129535b8e46..74ad753265f3 100644
/*
* On some platforms (e.g. MPC5200) a direct 1:1 mapping
* may cause problems with JFFS2 usage, as the local bus (LPB)
--
2.19.2

0 comments on commit f003d73

Please sign in to comment.
You can’t perform that action at this time.