diff options
| author | Tom Rini <[email protected]> | 2020-10-01 10:29:39 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-10-01 10:29:39 -0400 |
| commit | b084d8596d3f044a087f1c2ab0bfb38a120276de (patch) | |
| tree | 1529cea52f65311e8d4733b527f462f57794ff68 /drivers | |
| parent | 26acc6395fee680cea72e51348bd59e206eb0464 (diff) | |
| parent | 9275a963d448562a80213639c73e2dc34c6d1835 (diff) | |
Merge branch 'next' of git://git.denx.de/u-boot-sh into next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ravb.c | 2 | ||||
| -rw-r--r-- | drivers/pinctrl/renesas/Kconfig | 20 |
2 files changed, 10 insertions, 12 deletions
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c index 886f53ee827..98883cd15b4 100644 --- a/drivers/net/ravb.c +++ b/drivers/net/ravb.c @@ -438,8 +438,6 @@ static int ravb_config(struct udevice *dev) writel(mask, eth->iobase + RAVB_REG_ECMR); - phy->drv->writeext(phy, -1, 0x02, 0x08, (0x0f << 5) | 0x19); - return 0; } diff --git a/drivers/pinctrl/renesas/Kconfig b/drivers/pinctrl/renesas/Kconfig index 8327bcabd66..e14294b6e7e 100644 --- a/drivers/pinctrl/renesas/Kconfig +++ b/drivers/pinctrl/renesas/Kconfig @@ -57,6 +57,16 @@ config PINCTRL_PFC_R8A7794 the GPIO definitions and pin control functions for each available multiplex function. +config PINCTRL_PFC_R8A774A1 + bool "Renesas RZ/G2 R8A774A1 pin control driver" + depends on PINCTRL_PFC + help + Support pin multiplexing control on Renesas RZ/G2M R8A774A1 SoCs. + + The driver is controlled by a device tree node which contains both + the GPIO definitions and pin control functions for each available + multiplex function. + config PINCTRL_PFC_R8A7795 bool "Renesas RCar Gen3 R8A7795 pin control driver" depends on PINCTRL_PFC @@ -77,16 +87,6 @@ config PINCTRL_PFC_R8A7796 the GPIO definitions and pin control functions for each available multiplex function. -config PINCTRL_PFC_R8A774A1 - bool "Renesas RCar Gen3 R8A774A1 pin control driver" - depends on PINCTRL_PFC - help - Support pin multiplexing control on Renesas RZG2M R8A774A1 SoCs. - - The driver is controlled by a device tree node which contains both - the GPIO definitions and pin control functions for each available - multiplex function. - config PINCTRL_PFC_R8A77965 bool "Renesas RCar Gen3 R8A77965 pin control driver" depends on PINCTRL_PFC |