[U-Boot] [PATCH 0/2] rockchip: rk3288: Fixes for GMAC

[U-Boot] [PATCH 0/2] rockchip: rk3288: Fixes for GMAC

[Romain Perier]

This set of patches contains two fixes. The first one removes the pull up
for GPIO4B0 that is the pin for phy-reset. This is already supported by
GMAC ("reset-gpio" from DT) and should not be hardcoded in the pinctrl
driver. The second one, revert back the removal of the MAX_TCLK pin that
was accidentaly removed while re-working commit 2454b719fb87
("rockchip: rk3288: Add pinctrl support for the...").

Romain Perier (2):
  rockchip: rk3288: Remove phy reset GPIO pull up
  rockchip: rk3288: Revert MAC_TXCLK in pinctrl for GMAC

 drivers/pinctrl/rockchip/pinctrl_rk3288.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

-- 
2.11.0

[U-Boot] [PATCH 1/2] rockchip: rk3288: Remove phy reset GPIO pull up

[Romain Perier]

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>
---
 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.11.0

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

[Romain Perier]

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(+)

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

[U-Boot] [U-Boot, 1/2] rockchip: rk3288: Remove phy reset GPIO pull up

[Philipp Tomsich]

> 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>
> ---
>  drivers/pinctrl/rockchip/pinctrl_rk3288.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 

Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

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

[Philipp Tomsich]

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

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

[Philipp Tomsich]

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

[U-Boot] [U-Boot, 1/2] rockchip: rk3288: Remove phy reset GPIO pull up

[Philipp Tomsich]

> 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>
> ---
>  drivers/pinctrl/rockchip/pinctrl_rk3288.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 

Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

[U-Boot] [U-Boot, 1/2] rockchip: rk3288: Remove phy reset GPIO pull up

[Philipp Tomsich]

> 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>
> ---
>  drivers/pinctrl/rockchip/pinctrl_rk3288.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 

Applied to u-boot-rockchip, thanks!

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

[Philipp Tomsich]

> 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!