diff mbox

[U-Boot,2/2] rockchip: rk3288: Revert MAC_TXCLK in pinctrl for GMAC

Message ID 20170717090023.15926-3-romain.perier@collabora.com
State Accepted
Commit 3641d346eab75e183cbde10d6aa5d77d870477ed
Delegated to: Philipp Tomsich
Headers show

Commit Message

Romain Perier July 17, 2017, 9 a.m. UTC
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>
---
 drivers/pinctrl/rockchip/pinctrl_rk3288.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Philipp Tomsich July 17, 2017, 12:25 p.m. UTC | #1
> 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>
> ---
>  drivers/pinctrl/rockchip/pinctrl_rk3288.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 

Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Philipp Tomsich July 26, 2017, 4:52 p.m. UTC | #2
> 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>
> ---
>  drivers/pinctrl/rockchip/pinctrl_rk3288.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 

Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Philipp Tomsich July 27, 2017, 8:31 a.m. UTC | #3
> 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>
> ---
>  drivers/pinctrl/rockchip/pinctrl_rk3288.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 

Applied to u-boot-rockchip, thanks!
diff mbox

Patch

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),