summaryrefslogtreecommitdiff
path: root/drivers/pinctrl/rockchip
diff options
context:
space:
mode:
authorRomain Perier <romain.perier@collabora.com>2017-07-17 11:00:22 +0200
committerPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>2017-07-27 14:59:01 +0200
commita98fc4325e5be65b9f5f451e3bd313bd6c707f38 (patch)
treedc84c1df65b5f97cbb4befd63e8ec20a217b19b1 /drivers/pinctrl/rockchip
parent928979cb2b4cbf4cf79febca311bcb0b8cdd0535 (diff)
rockchip: rk3288: Remove phy reset GPIO pull up
We should not handle this pin explicitly from pinctrl. GMAC driver takes care of it by using a "reset-gpio" in the DT. This commit removes pull up for GPIO4B0. Fixes: 2454b719fb87 ("rockchip: rk3288: Add pinctrl support for the...") Signed-off-by: Romain Perier <romain.perier@collabora.com> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Diffstat (limited to 'drivers/pinctrl/rockchip')
-rw-r--r--drivers/pinctrl/rockchip/pinctrl_rk3288.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pinctrl/rockchip/pinctrl_rk3288.c b/drivers/pinctrl/rockchip/pinctrl_rk3288.c
index 3c9ae974f4..ba488f7ce6 100644
--- a/drivers/pinctrl/rockchip/pinctrl_rk3288.c
+++ b/drivers/pinctrl/rockchip/pinctrl_rk3288.c
@@ -501,11 +501,9 @@ static void pinctrl_rk3288_gmac_config(struct rk3288_grf *grf, int gmac_id)
GPIO_BIAS_MASK << GPIO_BIAS_SHIFT(1),
GPIO_BIAS_12MA << GPIO_BIAS_SHIFT(1));
- /* Set pull normal for GPIO4B1, pull up for GPIO4B0 */
+ /* Set pull normal for GPIO4B1 */
rk_clrsetreg(&grf->gpio1_p[3][1],
- (GPIO_PULL_MASK << GPIO_PULL_SHIFT(0)) |
(GPIO_PULL_MASK << GPIO_PULL_SHIFT(1)),
- (GPIO_PULL_UP << GPIO_PULL_SHIFT(0)) |
(GPIO_PULL_NORMAL << GPIO_PULL_SHIFT(1)));
break;