From a98fc4325e5be65b9f5f451e3bd313bd6c707f38 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Mon, 17 Jul 2017 11:00:22 +0200 Subject: [PATCH] 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 Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- drivers/pinctrl/rockchip/pinctrl_rk3288.c | 4 +--- 1 file changed, 1 insertion(+), 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; -- 2.39.5