aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/gemini/patches-4.14/0011-pinctrl-gemini-Support-drive-strength-setting.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-25 11:32:58 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-29 10:01:27 +0100
commit2777947a75c1033576d49e16969d82db9fc534fe (patch)
tree88d0d42e5652f583cf6712b784d9b4feba77703e /target/linux/gemini/patches-4.14/0011-pinctrl-gemini-Support-drive-strength-setting.patch
parent7863a8f302048857ce2276fbbdf899f474b8948c (diff)
downloadupstream-2777947a75c1033576d49e16969d82db9fc534fe.tar.gz
upstream-2777947a75c1033576d49e16969d82db9fc534fe.tar.bz2
upstream-2777947a75c1033576d49e16969d82db9fc534fe.zip
kernel: bump 4.14 to 4.14.156
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/gemini/patches-4.14/0011-pinctrl-gemini-Support-drive-strength-setting.patch')
-rw-r--r--target/linux/gemini/patches-4.14/0011-pinctrl-gemini-Support-drive-strength-setting.patch18
1 files changed, 9 insertions, 9 deletions
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;
}