summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2018-06-17 19:00:48 -0400
committerLinus Walleij <linus.walleij@linaro.org>2018-06-26 03:51:42 -0400
commiteb7692b4f3b315f7ec1bdb01a0db4b1dbb5c2a32 (patch)
treecf1b8736e60edd131816be1c69849879fc7f9c70
parentc969cb2f70aedf2159bc64073d012618506ef18f (diff)
pinctrl: gemini: Mask properly
Some logical error in the gemini pin control driver made it not mask and write properly for the GMAC. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/pinctrl-gemini.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pinctrl/pinctrl-gemini.c b/drivers/pinctrl/pinctrl-gemini.c
index 8c9970ae8505..fa7d998e1d5a 100644
--- a/drivers/pinctrl/pinctrl-gemini.c
+++ b/drivers/pinctrl/pinctrl-gemini.c
@@ -1696,6 +1696,7 @@ static const struct gemini_pin_group gemini_3516_pin_groups[] = {
1696 .name = "gmii_gmac0_grp", 1696 .name = "gmii_gmac0_grp",
1697 .pins = gmii_gmac0_3516_pins, 1697 .pins = gmii_gmac0_3516_pins,
1698 .num_pins = ARRAY_SIZE(gmii_gmac0_3516_pins), 1698 .num_pins = ARRAY_SIZE(gmii_gmac0_3516_pins),
1699 .mask = GEMINI_GMAC_IOSEL_MASK,
1699 .driving_mask = GENMASK(17, 16), 1700 .driving_mask = GENMASK(17, 16),
1700 }, 1701 },
1701 { 1702 {
@@ -1703,6 +1704,7 @@ static const struct gemini_pin_group gemini_3516_pin_groups[] = {
1703 .pins = gmii_gmac1_3516_pins, 1704 .pins = gmii_gmac1_3516_pins,
1704 .num_pins = ARRAY_SIZE(gmii_gmac1_3516_pins), 1705 .num_pins = ARRAY_SIZE(gmii_gmac1_3516_pins),
1705 /* Bring out RGMII on the GMAC1 pins */ 1706 /* Bring out RGMII on the GMAC1 pins */
1707 .mask = GEMINI_GMAC_IOSEL_MASK,
1706 .value = GEMINI_GMAC_IOSEL_GMAC0_GMAC1_RGMII, 1708 .value = GEMINI_GMAC_IOSEL_GMAC0_GMAC1_RGMII,
1707 .driving_mask = GENMASK(19, 18), 1709 .driving_mask = GENMASK(19, 18),
1708 }, 1710 },