kernel: bump 4.19 to 4.19.86
Refreshed all patches. Altered patches: - 950-0064-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch - 0005-mtd-physmap_of-Move-custom-initialization.patch Remove upstreamed: - 0001-pinctrl-gemini-Mask-and-set-properly.patch - 0002-pinctrl-gemini-Fix-up-TVC-clock-group.patch Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
Koen Vandeputte
@@ -1,31 +0,0 @@
|
||||
From f8ac3d3472a8dc99c8647a637611d146d88be8cb Mon Sep 17 00:00:00 2001
|
||||
From: Linus Walleij <linus.walleij@linaro.org>
|
||||
Date: Tue, 9 Oct 2018 10:09:14 +0200
|
||||
Subject: [PATCH 01/18] pinctrl: gemini: Mask and set properly
|
||||
|
||||
The code was written under the assumption that the
|
||||
regmap_update_bits() would mask the bits in the mask and
|
||||
set the bits in the value.
|
||||
|
||||
It missed the points that it will not set bits in the value
|
||||
unless these are also masked in the mask. Set value bits
|
||||
that are not in the mask will simply be ignored.
|
||||
|
||||
Fixes: 06351d133dea ("pinctrl: add a Gemini SoC pin controller")
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/pinctrl-gemini.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/pinctrl/pinctrl-gemini.c
|
||||
+++ b/drivers/pinctrl/pinctrl-gemini.c
|
||||
@@ -2184,7 +2184,8 @@ static int gemini_pmx_set_mux(struct pin
|
||||
func->name, grp->name);
|
||||
|
||||
regmap_read(pmx->map, GLOBAL_MISC_CTRL, &before);
|
||||
- regmap_update_bits(pmx->map, GLOBAL_MISC_CTRL, grp->mask,
|
||||
+ regmap_update_bits(pmx->map, GLOBAL_MISC_CTRL,
|
||||
+ grp->mask | grp->value,
|
||||
grp->value);
|
||||
regmap_read(pmx->map, GLOBAL_MISC_CTRL, &after);
|
||||
|
||||
@@ -1,141 +0,0 @@
|
||||
From ce81398dccb984855de606b75db25eddecdaa9e5 Mon Sep 17 00:00:00 2001
|
||||
From: Linus Walleij <linus.walleij@linaro.org>
|
||||
Date: Wed, 10 Oct 2018 20:25:39 +0200
|
||||
Subject: [PATCH 02/18] pinctrl: gemini: Fix up TVC clock group
|
||||
|
||||
The previous fix made the TVC clock get muxed in on the
|
||||
D-Link DIR-685 instead of giving nagging warnings of this
|
||||
not working. Not good. We didn't want that, as it breaks
|
||||
video.
|
||||
|
||||
Create a specific group for the TVC CLK, and break out
|
||||
a specific GPIO group for it on the SL3516 so we can use
|
||||
that line as GPIO if we don't need the TVC CLK.
|
||||
|
||||
Fixes: d17f477c5bc6 ("pinctrl: gemini: Mask and set properly")
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/pinctrl-gemini.c | 44 ++++++++++++++++++++++++++------
|
||||
1 file changed, 36 insertions(+), 8 deletions(-)
|
||||
|
||||
--- a/drivers/pinctrl/pinctrl-gemini.c
|
||||
+++ b/drivers/pinctrl/pinctrl-gemini.c
|
||||
@@ -591,13 +591,16 @@ static const unsigned int tvc_3512_pins[
|
||||
319, /* TVC_DATA[1] */
|
||||
301, /* TVC_DATA[2] */
|
||||
283, /* TVC_DATA[3] */
|
||||
- 265, /* TVC_CLK */
|
||||
320, /* TVC_DATA[4] */
|
||||
302, /* TVC_DATA[5] */
|
||||
284, /* TVC_DATA[6] */
|
||||
266, /* TVC_DATA[7] */
|
||||
};
|
||||
|
||||
+static const unsigned int tvc_clk_3512_pins[] = {
|
||||
+ 265, /* TVC_CLK */
|
||||
+};
|
||||
+
|
||||
/* 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_pi
|
||||
/* Serial flash pins CE0, CE1, DI, DO, CK */
|
||||
static const unsigned int sflash_3512_pins[] = { 230, 231, 232, 233, 211 };
|
||||
|
||||
-/* The GPIO0A (0) pin overlap with TVC and extended parallel flash */
|
||||
+/* The GPIO0A (0) pin overlap with TVC CLK and extended parallel flash */
|
||||
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 gem
|
||||
.num_pins = ARRAY_SIZE(tvc_3512_pins),
|
||||
/* Conflict with character LCD and ICE */
|
||||
.mask = LCD_PADS_ENABLE,
|
||||
- .value = TVC_PADS_ENABLE | TVC_CLK_PAD_ENABLE,
|
||||
+ .value = TVC_PADS_ENABLE,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "tvcclkgrp",
|
||||
+ .pins = tvc_clk_3512_pins,
|
||||
+ .num_pins = ARRAY_SIZE(tvc_clk_3512_pins),
|
||||
+ .value = TVC_CLK_PAD_ENABLE,
|
||||
},
|
||||
/*
|
||||
* The construction is done such that it is possible to use a serial
|
||||
@@ -860,8 +869,8 @@ static const struct gemini_pin_group gem
|
||||
.name = "gpio0agrp",
|
||||
.pins = gpio0a_3512_pins,
|
||||
.num_pins = ARRAY_SIZE(gpio0a_3512_pins),
|
||||
- /* Conflict with TVC */
|
||||
- .mask = TVC_PADS_ENABLE,
|
||||
+ /* Conflict with TVC CLK */
|
||||
+ .mask = TVC_CLK_PAD_ENABLE,
|
||||
},
|
||||
{
|
||||
.name = "gpio0bgrp",
|
||||
@@ -1531,13 +1540,16 @@ static const unsigned int tvc_3516_pins[
|
||||
311, /* TVC_DATA[1] */
|
||||
394, /* TVC_DATA[2] */
|
||||
374, /* TVC_DATA[3] */
|
||||
- 333, /* TVC_CLK */
|
||||
354, /* TVC_DATA[4] */
|
||||
395, /* TVC_DATA[5] */
|
||||
312, /* TVC_DATA[6] */
|
||||
334, /* TVC_DATA[7] */
|
||||
};
|
||||
|
||||
+static const unsigned int tvc_clk_3516_pins[] = {
|
||||
+ 333, /* TVC_CLK */
|
||||
+};
|
||||
+
|
||||
/* 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_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 */
|
||||
-static const unsigned int gpio0a_3516_pins[] = { 333, 354, 395, 312, 334 };
|
||||
+static const unsigned int gpio0a_3516_pins[] = { 354, 395, 312, 334 };
|
||||
|
||||
/* 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_pi
|
||||
/* The GPIO0K (30,31) pins overlap with NAND flash */
|
||||
static const unsigned int gpio0k_3516_pins[] = { 275, 298 };
|
||||
|
||||
+/* The GPIO0L (0) pins overlap with TVC_CLK */
|
||||
+static const unsigned int gpio0l_3516_pins[] = { 333 };
|
||||
+
|
||||
/* 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 gem
|
||||
.num_pins = ARRAY_SIZE(tvc_3516_pins),
|
||||
/* Conflict with character LCD */
|
||||
.mask = LCD_PADS_ENABLE,
|
||||
- .value = TVC_PADS_ENABLE | TVC_CLK_PAD_ENABLE,
|
||||
+ .value = TVC_PADS_ENABLE,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "tvcclkgrp",
|
||||
+ .pins = tvc_clk_3516_pins,
|
||||
+ .num_pins = ARRAY_SIZE(tvc_clk_3516_pins),
|
||||
+ .value = TVC_CLK_PAD_ENABLE,
|
||||
},
|
||||
/*
|
||||
* The construction is done such that it is possible to use a serial
|
||||
@@ -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,
|
||||
.num_pins = ARRAY_SIZE(gpio1a_3516_pins),
|
||||
@@ -16,32 +16,22 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
|
||||
--- 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 platfor
|
||||
@@ -231,6 +231,9 @@ static int of_flash_probe(struct platfor
|
||||
else if (of_property_read_bool(dp, "little-endian"))
|
||||
info->list[i].map.swap = CFI_LITTLE_ENDIAN;
|
||||
|
||||
- err = of_flash_probe_gemini(dev, dp, &info->list[i].map);
|
||||
- if (err)
|
||||
- goto err_out;
|
||||
- err = of_flash_probe_versatile(dev, dp, &info->list[i].map);
|
||||
- if (err)
|
||||
- goto err_out;
|
||||
-
|
||||
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 platfor
|
||||
|
||||
simple_map_init(&info->list[i].map);
|
||||
|
||||
+ /* Variants can override map accessors */
|
||||
+ err = of_flash_probe_gemini(dev, dp, &info->list[i].map);
|
||||
+ if (err)
|
||||
+ goto err_out;
|
||||
+ err = of_flash_probe_versatile(dev, dp, &info->list[i].map);
|
||||
+ if (err)
|
||||
+ goto err_out;
|
||||
+ simple_map_init(&info->list[i].map);
|
||||
+
|
||||
+ /* Variants can override map accessors */
|
||||
err = of_flash_probe_gemini(dev, dp, &info->list[i].map);
|
||||
if (err)
|
||||
goto err_out;
|
||||
@@ -238,8 +241,6 @@ static int of_flash_probe(struct platfor
|
||||
if (err)
|
||||
goto err_out;
|
||||
|
||||
- simple_map_init(&info->list[i].map);
|
||||
-
|
||||
/*
|
||||
* On some platforms (e.g. MPC5200) a direct 1:1 mapping
|
||||
* may cause problems with JFFS2 usage, as the local bus (LPB)
|
||||
|
||||
Reference in New Issue
Block a user