From f003d732d726758f11f0c308758637c434c37c1a Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 28 Jan 2019 13:07:54 +0100 Subject: 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 --- ...0001-pinctrl-gemini-Mask-and-set-properly.patch | 7 +----- ...002-pinctrl-gemini-Fix-up-TVC-clock-group.patch | 29 +++++++++------------- ...03-pinctrl-gemini-Drop-noisy-debug-prints.patch | 15 ++++------- .../patches-4.19/0004-boot-sq201-from-sda1.patch | 5 ---- ...mtd-physmap_of-Move-custom-initialization.patch | 9 ++----- ...-mtd-physmap_of_gemini-Handle-pin-control.patch | 13 +++------- ...-up-the-D-Link-DIR-685-MTD-partition-info.patch | 5 ---- .../0008-ARM-dts-Enable-Gemini-flash-access.patch | 7 ------ ...td-partitions-Add-RedBoot-FIS-DT-bindings.patch | 6 ----- ...titions-Add-second-compatible-for-redboot.patch | 11 +++----- .../0011-ARM-dts-Fix-up-SQ201-flash-access.patch | 5 ---- ...0012-ARM-dts-Blank-D-Link-DIR-685-console.patch | 5 ---- ...usb-host-fotg2-add-silicon-clock-handling.patch | 15 +++-------- ...sb-host-add-DT-bindings-for-faraday-fotg2.patch | 6 ----- ...15-usb-host-fotg2-add-device-tree-probing.patch | 7 +----- ...b-host-fotg2-add-Gemini-specific-handling.patch | 11 ++------ ...b-host-fotg2-restart-hcd-after-port-reset.patch | 7 +----- ...Add-the-FOTG210-USB-host-to-Gemini-boards.patch | 19 -------------- 18 files changed, 34 insertions(+), 148 deletions(-) (limited to 'target/linux/gemini') diff --git a/target/linux/gemini/patches-4.19/0001-pinctrl-gemini-Mask-and-set-properly.patch b/target/linux/gemini/patches-4.19/0001-pinctrl-gemini-Mask-and-set-properly.patch index 3cc7bad8b8..3bf9341e34 100644 --- a/target/linux/gemini/patches-4.19/0001-pinctrl-gemini-Mask-and-set-properly.patch +++ b/target/linux/gemini/patches-4.19/0001-pinctrl-gemini-Mask-and-set-properly.patch @@ -17,11 +17,9 @@ Signed-off-by: Linus Walleij 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 - diff --git a/target/linux/gemini/patches-4.19/0002-pinctrl-gemini-Fix-up-TVC-clock-group.patch b/target/linux/gemini/patches-4.19/0002-pinctrl-gemini-Fix-up-TVC-clock-group.patch index b6435f373d..64172acb44 100644 --- a/target/linux/gemini/patches-4.19/0002-pinctrl-gemini-Fix-up-TVC-clock-group.patch +++ b/target/linux/gemini/patches-4.19/0002-pinctrl-gemini-Fix-up-TVC-clock-group.patch @@ -18,11 +18,9 @@ Signed-off-by: Linus Walleij 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), diff --git a/target/linux/gemini/patches-4.19/0003-pinctrl-gemini-Drop-noisy-debug-prints.patch b/target/linux/gemini/patches-4.19/0003-pinctrl-gemini-Drop-noisy-debug-prints.patch index d01eaf3947..d3383b3182 100644 --- a/target/linux/gemini/patches-4.19/0003-pinctrl-gemini-Drop-noisy-debug-prints.patch +++ b/target/linux/gemini/patches-4.19/0003-pinctrl-gemini-Drop-noisy-debug-prints.patch @@ -11,11 +11,9 @@ Signed-off-by: Linus Walleij 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 - diff --git a/target/linux/gemini/patches-4.19/0004-boot-sq201-from-sda1.patch b/target/linux/gemini/patches-4.19/0004-boot-sq201-from-sda1.patch index c81efd2076..d2fa02a957 100644 --- a/target/linux/gemini/patches-4.19/0004-boot-sq201-from-sda1.patch +++ b/target/linux/gemini/patches-4.19/0004-boot-sq201-from-sda1.patch @@ -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 - diff --git a/target/linux/gemini/patches-4.19/0005-mtd-physmap_of-Move-custom-initialization.patch b/target/linux/gemini/patches-4.19/0005-mtd-physmap_of-Move-custom-initialization.patch index f192ed7f9e..5462844a79 100644 --- a/target/linux/gemini/patches-4.19/0005-mtd-physmap_of-Move-custom-initialization.patch +++ b/target/linux/gemini/patches-4.19/0005-mtd-physmap_of-Move-custom-initialization.patch @@ -14,11 +14,9 @@ Signed-off-by: Linus Walleij 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 - diff --git a/target/linux/gemini/patches-4.19/0006-mtd-physmap_of_gemini-Handle-pin-control.patch b/target/linux/gemini/patches-4.19/0006-mtd-physmap_of_gemini-Handle-pin-control.patch index 47aa38a6ab..128760d78a 100644 --- a/target/linux/gemini/patches-4.19/0006-mtd-physmap_of_gemini-Handle-pin-control.patch +++ b/target/linux/gemini/patches-4.19/0006-mtd-physmap_of_gemini-Handle-pin-control.patch @@ -37,8 +37,6 @@ Signed-off-by: Linus Walleij drivers/mtd/maps/physmap_of_gemini.c | 105 ++++++++++++++++++++++++++- 2 files changed, 105 insertions(+), 1 deletion(-) -diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig -index afb36bff13a7..00efbf246849 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@ -89,6 +89,7 @@ config MTD_PHYSMAP_OF_GEMINI @@ -49,8 +47,6 @@ index afb36bff13a7..00efbf246849 100644 help This provides some extra DT physmap parsing for the Gemini platforms, some detection and setting up parallel mode on the -diff --git a/drivers/mtd/maps/physmap_of_gemini.c b/drivers/mtd/maps/physmap_of_gemini.c -index 830b1b7e702b..7c2b67460192 100644 --- a/drivers/mtd/maps/physmap_of_gemini.c +++ b/drivers/mtd/maps/physmap_of_gemini.c @@ -10,9 +10,11 @@ @@ -65,7 +61,7 @@ index 830b1b7e702b..7c2b67460192 100644 #include "physmap_of_gemini.h" /* -@@ -49,6 +51,77 @@ static const struct of_device_id syscon_match[] = { +@@ -49,6 +51,77 @@ static const struct of_device_id syscon_ { }, }; @@ -143,7 +139,7 @@ index 830b1b7e702b..7c2b67460192 100644 int of_flash_probe_gemini(struct platform_device *pdev, struct device_node *np, struct map_info *map) -@@ -62,6 +135,11 @@ int of_flash_probe_gemini(struct platform_device *pdev, +@@ -62,6 +135,11 @@ int of_flash_probe_gemini(struct platfor if (!of_device_is_compatible(np, "cortina,gemini-flash")) return 0; @@ -155,7 +151,7 @@ index 830b1b7e702b..7c2b67460192 100644 rmap = syscon_regmap_lookup_by_phandle(np, "syscon"); if (IS_ERR(rmap)) { dev_err(dev, "no syscon\n"); -@@ -96,7 +174,32 @@ int of_flash_probe_gemini(struct platform_device *pdev, +@@ -96,7 +174,32 @@ int of_flash_probe_gemini(struct platfor map->bankwidth * 8); } @@ -189,6 +185,3 @@ index 830b1b7e702b..7c2b67460192 100644 return 0; } --- -2.19.2 - diff --git a/target/linux/gemini/patches-4.19/0007-ARM-dts-Fix-up-the-D-Link-DIR-685-MTD-partition-info.patch b/target/linux/gemini/patches-4.19/0007-ARM-dts-Fix-up-the-D-Link-DIR-685-MTD-partition-info.patch index 2e4377ec02..f70ab262c7 100644 --- a/target/linux/gemini/patches-4.19/0007-ARM-dts-Fix-up-the-D-Link-DIR-685-MTD-partition-info.patch +++ b/target/linux/gemini/patches-4.19/0007-ARM-dts-Fix-up-the-D-Link-DIR-685-MTD-partition-info.patch @@ -35,8 +35,6 @@ Signed-off-by: Linus Walleij arch/arm/boot/dts/gemini-dlink-dir-685.dts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) -diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts -index 6f258b50eb44..502a361d1fe9 100644 --- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts +++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts @@ -274,20 +274,16 @@ @@ -66,6 +64,3 @@ index 6f258b50eb44..502a361d1fe9 100644 partition@1f80000 { label = "rgdb"; reg = <0x01f80000 0x00040000>; --- -2.19.2 - diff --git a/target/linux/gemini/patches-4.19/0008-ARM-dts-Enable-Gemini-flash-access.patch b/target/linux/gemini/patches-4.19/0008-ARM-dts-Enable-Gemini-flash-access.patch index 0fde9197b6..372242c68b 100644 --- a/target/linux/gemini/patches-4.19/0008-ARM-dts-Enable-Gemini-flash-access.patch +++ b/target/linux/gemini/patches-4.19/0008-ARM-dts-Enable-Gemini-flash-access.patch @@ -20,8 +20,6 @@ Signed-off-by: Linus Walleij arch/arm/boot/dts/gemini-sq201.dts | 31 ++++++++++--------- 2 files changed, 41 insertions(+), 25 deletions(-) -diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts -index 502a361d1fe9..318e9b2ba7dc 100644 --- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts +++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts @@ -64,7 +64,6 @@ @@ -95,8 +93,6 @@ index 502a361d1fe9..318e9b2ba7dc 100644 port@0 { reg = <0>; -diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts -index 66e2845a3edb..79df6ce5bc6a 100644 --- a/arch/arm/boot/dts/gemini-sq201.dts +++ b/arch/arm/boot/dts/gemini-sq201.dts @@ -41,14 +41,12 @@ @@ -164,6 +160,3 @@ index 66e2845a3edb..79df6ce5bc6a 100644 pinctrl-gmii { mux { function = "gmii"; --- -2.19.2 - diff --git a/target/linux/gemini/patches-4.19/0009-mtd-partitions-Add-RedBoot-FIS-DT-bindings.patch b/target/linux/gemini/patches-4.19/0009-mtd-partitions-Add-RedBoot-FIS-DT-bindings.patch index afcf5111d8..bc3c927db8 100644 --- a/target/linux/gemini/patches-4.19/0009-mtd-partitions-Add-RedBoot-FIS-DT-bindings.patch +++ b/target/linux/gemini/patches-4.19/0009-mtd-partitions-Add-RedBoot-FIS-DT-bindings.patch @@ -13,9 +13,6 @@ Signed-off-by: Linus Walleij 1 file changed, 27 insertions(+) create mode 100644 Documentation/devicetree/bindings/mtd/partitions/redboot-fis.txt -diff --git a/Documentation/devicetree/bindings/mtd/partitions/redboot-fis.txt b/Documentation/devicetree/bindings/mtd/partitions/redboot-fis.txt -new file mode 100644 -index 000000000000..fd0ebe4e3415 --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/partitions/redboot-fis.txt @@ -0,0 +1,27 @@ @@ -46,6 +43,3 @@ index 000000000000..fd0ebe4e3415 + fis-index-block = <0>; + }; +}; --- -2.19.2 - diff --git a/target/linux/gemini/patches-4.19/0010-mtd-partitions-Add-second-compatible-for-redboot.patch b/target/linux/gemini/patches-4.19/0010-mtd-partitions-Add-second-compatible-for-redboot.patch index 451ba3af8b..d888e78187 100644 --- a/target/linux/gemini/patches-4.19/0010-mtd-partitions-Add-second-compatible-for-redboot.patch +++ b/target/linux/gemini/patches-4.19/0010-mtd-partitions-Add-second-compatible-for-redboot.patch @@ -11,8 +11,6 @@ Signed-off-by: Linus Walleij drivers/mtd/redboot.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) -diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c -index fe3df7437483..e9c21579ba35 100644 --- a/drivers/mtd/redboot.c +++ b/drivers/mtd/redboot.c @@ -25,7 +25,7 @@ @@ -24,7 +22,7 @@ index fe3df7437483..e9c21579ba35 100644 #include #include #include -@@ -56,6 +56,31 @@ static inline int redboot_checksum(struct fis_image_desc *img) +@@ -56,6 +56,31 @@ static inline int redboot_checksum(struc return 1; } @@ -56,7 +54,7 @@ index fe3df7437483..e9c21579ba35 100644 static int parse_redboot_partitions(struct mtd_info *master, const struct mtd_partition **pparts, struct mtd_part_parser_data *data) -@@ -75,6 +100,7 @@ static int parse_redboot_partitions(struct mtd_info *master, +@@ -75,6 +100,7 @@ static int parse_redboot_partitions(stru #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED static char nullstring[] = "unallocated"; #endif @@ -64,7 +62,7 @@ index fe3df7437483..e9c21579ba35 100644 if ( directory < 0 ) { offset = master->size + directory * master->erasesize; -@@ -298,6 +324,7 @@ static int parse_redboot_partitions(struct mtd_info *master, +@@ -298,6 +324,7 @@ static int parse_redboot_partitions(stru static const struct of_device_id redboot_parser_of_match_table[] = { { .compatible = "ecoscentric,redboot-fis-partitions" }, @@ -72,6 +70,3 @@ index fe3df7437483..e9c21579ba35 100644 {}, }; MODULE_DEVICE_TABLE(of, redboot_parser_of_match_table); --- -2.19.2 - diff --git a/target/linux/gemini/patches-4.19/0011-ARM-dts-Fix-up-SQ201-flash-access.patch b/target/linux/gemini/patches-4.19/0011-ARM-dts-Fix-up-SQ201-flash-access.patch index 2b72dcd63d..7517d62ed3 100644 --- a/target/linux/gemini/patches-4.19/0011-ARM-dts-Fix-up-SQ201-flash-access.patch +++ b/target/linux/gemini/patches-4.19/0011-ARM-dts-Fix-up-SQ201-flash-access.patch @@ -13,8 +13,6 @@ Signed-off-by: Linus Walleij arch/arm/boot/dts/gemini-sq201.dts | 37 ++++-------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) -diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts -index 79df6ce5bc6a..c5bb24102b75 100644 --- a/arch/arm/boot/dts/gemini-sq201.dts +++ b/arch/arm/boot/dts/gemini-sq201.dts @@ -20,7 +20,7 @@ @@ -68,6 +66,3 @@ index 79df6ce5bc6a..c5bb24102b75 100644 }; }; --- -2.19.2 - diff --git a/target/linux/gemini/patches-4.19/0012-ARM-dts-Blank-D-Link-DIR-685-console.patch b/target/linux/gemini/patches-4.19/0012-ARM-dts-Blank-D-Link-DIR-685-console.patch index d1b3085a40..ebddc3ab90 100644 --- a/target/linux/gemini/patches-4.19/0012-ARM-dts-Blank-D-Link-DIR-685-console.patch +++ b/target/linux/gemini/patches-4.19/0012-ARM-dts-Blank-D-Link-DIR-685-console.patch @@ -12,8 +12,6 @@ Signed-off-by: Linus Walleij arch/arm/boot/dts/gemini-dlink-dir-685.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts -index 318e9b2ba7dc..850a605124eb 100644 --- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts +++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts @@ -20,7 +20,7 @@ @@ -25,6 +23,3 @@ index 318e9b2ba7dc..850a605124eb 100644 stdout-path = "uart0:19200n8"; }; --- -2.19.2 - diff --git a/target/linux/gemini/patches-4.19/0013-usb-host-fotg2-add-silicon-clock-handling.patch b/target/linux/gemini/patches-4.19/0013-usb-host-fotg2-add-silicon-clock-handling.patch index 041717c299..b28454e6f1 100644 --- a/target/linux/gemini/patches-4.19/0013-usb-host-fotg2-add-silicon-clock-handling.patch +++ b/target/linux/gemini/patches-4.19/0013-usb-host-fotg2-add-silicon-clock-handling.patch @@ -26,8 +26,6 @@ ChangeLog v1->v2: drivers/usb/host/fotg210.h | 3 +++ 2 files changed, 32 insertions(+), 4 deletions(-) -diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c -index e64eb47770c8..058ff82ea789 100644 --- a/drivers/usb/host/fotg210-hcd.c +++ b/drivers/usb/host/fotg210-hcd.c @@ -31,6 +31,7 @@ @@ -38,7 +36,7 @@ index e64eb47770c8..058ff82ea789 100644 #include #include -@@ -5596,7 +5597,7 @@ static int fotg210_hcd_probe(struct platform_device *pdev) +@@ -5596,7 +5597,7 @@ static int fotg210_hcd_probe(struct plat hcd->regs = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(hcd->regs)) { retval = PTR_ERR(hcd->regs); @@ -47,7 +45,7 @@ index e64eb47770c8..058ff82ea789 100644 } hcd->rsrc_start = res->start; -@@ -5606,22 +5607,42 @@ static int fotg210_hcd_probe(struct platform_device *pdev) +@@ -5606,22 +5607,42 @@ static int fotg210_hcd_probe(struct plat fotg210->caps = hcd->regs; @@ -93,7 +91,7 @@ index e64eb47770c8..058ff82ea789 100644 usb_put_hcd(hcd); fail_create_hcd: dev_err(dev, "init %s fail, %d\n", dev_name(dev), retval); -@@ -5637,6 +5658,10 @@ static int fotg210_hcd_remove(struct platform_device *pdev) +@@ -5637,6 +5658,10 @@ static int fotg210_hcd_remove(struct pla { struct device *dev = &pdev->dev; struct usb_hcd *hcd = dev_get_drvdata(dev); @@ -104,11 +102,9 @@ index e64eb47770c8..058ff82ea789 100644 if (!hcd) return 0; -diff --git a/drivers/usb/host/fotg210.h b/drivers/usb/host/fotg210.h -index 7fcd785c7bc8..28f6467c0cbf 100644 --- a/drivers/usb/host/fotg210.h +++ b/drivers/usb/host/fotg210.h -@@ -182,6 +182,9 @@ struct fotg210_hcd { /* one per controller */ +@@ -182,6 +182,9 @@ struct fotg210_hcd { /* one per contro # define COUNT(x) #endif @@ -118,6 +114,3 @@ index 7fcd785c7bc8..28f6467c0cbf 100644 /* debug files */ struct dentry *debug_dir; }; --- -2.19.2 - diff --git a/target/linux/gemini/patches-4.19/0014-usb-host-add-DT-bindings-for-faraday-fotg2.patch b/target/linux/gemini/patches-4.19/0014-usb-host-add-DT-bindings-for-faraday-fotg2.patch index 7e321f1f8f..4bac72a5d1 100644 --- a/target/linux/gemini/patches-4.19/0014-usb-host-add-DT-bindings-for-faraday-fotg2.patch +++ b/target/linux/gemini/patches-4.19/0014-usb-host-add-DT-bindings-for-faraday-fotg2.patch @@ -23,9 +23,6 @@ ChangeLog v1->v2: 1 file changed, 35 insertions(+) create mode 100644 Documentation/devicetree/bindings/usb/faraday,fotg210.txt -diff --git a/Documentation/devicetree/bindings/usb/faraday,fotg210.txt b/Documentation/devicetree/bindings/usb/faraday,fotg210.txt -new file mode 100644 -index 000000000000..06a2286e2054 --- /dev/null +++ b/Documentation/devicetree/bindings/usb/faraday,fotg210.txt @@ -0,0 +1,35 @@ @@ -64,6 +61,3 @@ index 000000000000..06a2286e2054 + syscon = <&syscon>; + wakeup-source; +}; --- -2.19.2 - diff --git a/target/linux/gemini/patches-4.19/0015-usb-host-fotg2-add-device-tree-probing.patch b/target/linux/gemini/patches-4.19/0015-usb-host-fotg2-add-device-tree-probing.patch index 5673352f14..8950ef040f 100644 --- a/target/linux/gemini/patches-4.19/0015-usb-host-fotg2-add-device-tree-probing.patch +++ b/target/linux/gemini/patches-4.19/0015-usb-host-fotg2-add-device-tree-probing.patch @@ -12,8 +12,6 @@ Signed-off-by: Linus Walleij drivers/usb/host/fotg210-hcd.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c -index 058ff82ea789..6e4b40cd5916 100644 --- a/drivers/usb/host/fotg210-hcd.c +++ b/drivers/usb/host/fotg210-hcd.c @@ -10,6 +10,7 @@ @@ -24,7 +22,7 @@ index 058ff82ea789..6e4b40cd5916 100644 #include #include #include -@@ -5672,9 +5673,18 @@ static int fotg210_hcd_remove(struct platform_device *pdev) +@@ -5672,9 +5673,18 @@ static int fotg210_hcd_remove(struct pla return 0; } @@ -43,6 +41,3 @@ index 058ff82ea789..6e4b40cd5916 100644 }, .probe = fotg210_hcd_probe, .remove = fotg210_hcd_remove, --- -2.19.2 - diff --git a/target/linux/gemini/patches-4.19/0016-usb-host-fotg2-add-Gemini-specific-handling.patch b/target/linux/gemini/patches-4.19/0016-usb-host-fotg2-add-Gemini-specific-handling.patch index 55d44b0e10..51bd0e7d7e 100644 --- a/target/linux/gemini/patches-4.19/0016-usb-host-fotg2-add-Gemini-specific-handling.patch +++ b/target/linux/gemini/patches-4.19/0016-usb-host-fotg2-add-Gemini-specific-handling.patch @@ -20,8 +20,6 @@ Signed-off-by: Linus Walleij drivers/usb/host/fotg210-hcd.c | 76 ++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) -diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig -index 1a4ea98cac2a..308d514c9a2a 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -372,6 +372,7 @@ config USB_ISP1362_HCD @@ -32,8 +30,6 @@ index 1a4ea98cac2a..308d514c9a2a 100644 ---help--- Faraday FOTG210 is an OTG controller which can be configured as an USB2.0 host. It is designed to meet USB2.0 EHCI specification -diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c -index 6e4b40cd5916..5abb07f4136f 100644 --- a/drivers/usb/host/fotg210-hcd.c +++ b/drivers/usb/host/fotg210-hcd.c @@ -33,6 +33,10 @@ @@ -47,7 +43,7 @@ index 6e4b40cd5916..5abb07f4136f 100644 #include #include -@@ -5554,6 +5558,72 @@ static void fotg210_init(struct fotg210_hcd *fotg210) +@@ -5554,6 +5558,72 @@ static void fotg210_init(struct fotg210_ iowrite32(value, &fotg210->regs->otgcsr); } @@ -120,7 +116,7 @@ index 6e4b40cd5916..5abb07f4136f 100644 /** * fotg210_hcd_probe - initialize faraday FOTG210 HCDs * -@@ -5631,6 +5701,12 @@ static int fotg210_hcd_probe(struct platform_device *pdev) +@@ -5631,6 +5701,12 @@ static int fotg210_hcd_probe(struct plat fotg210_init(fotg210); @@ -133,6 +129,3 @@ index 6e4b40cd5916..5abb07f4136f 100644 retval = usb_add_hcd(hcd, irq, IRQF_SHARED); if (retval) { dev_err(dev, "failed to add hcd with err %d\n", retval); --- -2.19.2 - diff --git a/target/linux/gemini/patches-4.19/0017-usb-host-fotg2-restart-hcd-after-port-reset.patch b/target/linux/gemini/patches-4.19/0017-usb-host-fotg2-restart-hcd-after-port-reset.patch index c0dc9201b9..0b5e81ce54 100644 --- a/target/linux/gemini/patches-4.19/0017-usb-host-fotg2-restart-hcd-after-port-reset.patch +++ b/target/linux/gemini/patches-4.19/0017-usb-host-fotg2-restart-hcd-after-port-reset.patch @@ -12,11 +12,9 @@ Signed-off-by: Linus Walleij drivers/usb/host/fotg210-hcd.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c -index 5abb07f4136f..d15e835c4b1f 100644 --- a/drivers/usb/host/fotg210-hcd.c +++ b/drivers/usb/host/fotg210-hcd.c -@@ -1633,6 +1633,10 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, +@@ -1633,6 +1633,10 @@ static int fotg210_hub_control(struct us /* see what we found out */ temp = check_reset_complete(fotg210, wIndex, status_reg, fotg210_readl(fotg210, status_reg)); @@ -27,6 +25,3 @@ index 5abb07f4136f..d15e835c4b1f 100644 } if (!(temp & (PORT_RESUME|PORT_RESET))) { --- -2.19.2 - diff --git a/target/linux/gemini/patches-4.19/0018-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini-boards.patch b/target/linux/gemini/patches-4.19/0018-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini-boards.patch index 9247f0b421..83d993b1f9 100644 --- a/target/linux/gemini/patches-4.19/0018-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini-boards.patch +++ b/target/linux/gemini/patches-4.19/0018-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini-boards.patch @@ -25,8 +25,6 @@ ChangeLog v1->v2: arch/arm/boot/dts/gemini.dtsi | 32 ++++++++++++++++++++++ 8 files changed, 100 insertions(+) -diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts -index 850a605124eb..848b16375873 100644 --- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts +++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts @@ -452,5 +452,13 @@ @@ -43,8 +41,6 @@ index 850a605124eb..848b16375873 100644 + }; }; }; -diff --git a/arch/arm/boot/dts/gemini-nas4220b.dts b/arch/arm/boot/dts/gemini-nas4220b.dts -index 963ea890c87f..53b65ebe8454 100644 --- a/arch/arm/boot/dts/gemini-nas4220b.dts +++ b/arch/arm/boot/dts/gemini-nas4220b.dts @@ -204,5 +204,13 @@ @@ -61,8 +57,6 @@ index 963ea890c87f..53b65ebe8454 100644 + }; }; }; -diff --git a/arch/arm/boot/dts/gemini-rut1xx.dts b/arch/arm/boot/dts/gemini-rut1xx.dts -index eb4f0bf074da..b2354c215a84 100644 --- a/arch/arm/boot/dts/gemini-rut1xx.dts +++ b/arch/arm/boot/dts/gemini-rut1xx.dts @@ -124,5 +124,25 @@ @@ -91,8 +85,6 @@ index eb4f0bf074da..b2354c215a84 100644 + }; }; }; -diff --git a/arch/arm/boot/dts/gemini-sl93512r.dts b/arch/arm/boot/dts/gemini-sl93512r.dts -index ebefb7297379..2bb953440793 100644 --- a/arch/arm/boot/dts/gemini-sl93512r.dts +++ b/arch/arm/boot/dts/gemini-sl93512r.dts @@ -324,5 +324,13 @@ @@ -109,8 +101,6 @@ index ebefb7297379..2bb953440793 100644 + }; }; }; -diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts -index c5bb24102b75..ecbc27d93b2d 100644 --- a/arch/arm/boot/dts/gemini-sq201.dts +++ b/arch/arm/boot/dts/gemini-sq201.dts @@ -292,5 +292,13 @@ @@ -127,8 +117,6 @@ index c5bb24102b75..ecbc27d93b2d 100644 + }; }; }; -diff --git a/arch/arm/boot/dts/gemini-wbd111.dts b/arch/arm/boot/dts/gemini-wbd111.dts -index 29af86cd10f7..6831d2aed17a 100644 --- a/arch/arm/boot/dts/gemini-wbd111.dts +++ b/arch/arm/boot/dts/gemini-wbd111.dts @@ -171,5 +171,13 @@ @@ -145,8 +133,6 @@ index 29af86cd10f7..6831d2aed17a 100644 + }; }; }; -diff --git a/arch/arm/boot/dts/gemini-wbd222.dts b/arch/arm/boot/dts/gemini-wbd222.dts -index 24e6ae3616f7..ed38d48ef5f6 100644 --- a/arch/arm/boot/dts/gemini-wbd222.dts +++ b/arch/arm/boot/dts/gemini-wbd222.dts @@ -183,5 +183,13 @@ @@ -163,8 +149,6 @@ index 24e6ae3616f7..ed38d48ef5f6 100644 + }; }; }; -diff --git a/arch/arm/boot/dts/gemini.dtsi b/arch/arm/boot/dts/gemini.dtsi -index eb752e9495de..8cf67b11751f 100644 --- a/arch/arm/boot/dts/gemini.dtsi +++ b/arch/arm/boot/dts/gemini.dtsi @@ -409,5 +409,37 @@ @@ -205,6 +189,3 @@ index eb752e9495de..8cf67b11751f 100644 + }; }; }; --- -2.19.2 - -- cgit v1.2.3