diff options
| author | Romain Perier <romain.perier@collabora.com> | 2017-07-17 11:00:23 +0200 |
|---|---|---|
| committer | Philipp Tomsich <philipp.tomsich@theobroma-systems.com> | 2017-07-27 14:59:01 +0200 |
| commit | 3641d346eab75e183cbde10d6aa5d77d870477ed (patch) | |
| tree | 47917072a29a531e223ddf2fcc5b6a6b06c2b2d6 /drivers/pinctrl/rockchip/pinctrl_rk3288.c | |
| parent | a98fc4325e5be65b9f5f451e3bd313bd6c707f38 (diff) | |
rockchip: rk3288: Revert MAC_TXCLK in pinctrl for GMAC
This reverts TXCLK toggling that was accidently dropped while reworking
commit 2454b719fb87 ("rockchip: rk3288: Add pinctrl support for the gmac
ethernet interface"). So the TX clock is enabled and we can use
GMAC_ROCKCHIP in 1Gbps when basic PINCTRL support is enabled
(!PINTRL_FULL).
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/pinctrl_rk3288.c')
| -rw-r--r-- | drivers/pinctrl/rockchip/pinctrl_rk3288.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/pinctrl/rockchip/pinctrl_rk3288.c b/drivers/pinctrl/rockchip/pinctrl_rk3288.c index ba488f7ce6..47cefc5abf 100644 --- a/drivers/pinctrl/rockchip/pinctrl_rk3288.c +++ b/drivers/pinctrl/rockchip/pinctrl_rk3288.c @@ -496,6 +496,10 @@ static void pinctrl_rk3288_gmac_config(struct rk3288_grf *grf, int gmac_id) (GPIO_PULL_NORMAL << GPIO_PULL_SHIFT(6)) | (GPIO_PULL_NORMAL << GPIO_PULL_SHIFT(7))); + rk_clrsetreg(&grf->gpio4bl_iomux, + GPIO4B1_MASK << GPIO4B1_SHIFT, + GPIO4B1_MAC_TXCLK << GPIO4B1_SHIFT); + /* switch GPIO4B1 to 12ma drive-strength */ rk_clrsetreg(&grf->gpio1_e[3][1], GPIO_BIAS_MASK << GPIO_BIAS_SHIFT(1), |