On Thu, 17 Mar 2022 22:54:05 -0500 Samuel Holland <sam...@sholland.org> wrote:
> This is now handled automatically by the pinctrl driver. > > Signed-off-by: Samuel Holland <sam...@sholland.org> Reviewed-by: Andre Przywara <andre.przyw...@arm.com> Cheers, Andre > --- > > (no changes since v1) > > arch/arm/include/asm/arch-sunxi/gpio.h | 1 - > drivers/net/sunxi_emac.c | 7 +------ > 2 files changed, 1 insertion(+), 7 deletions(-) > > diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h > b/arch/arm/include/asm/arch-sunxi/gpio.h > index 773711b6a3..e93c9e84c9 100644 > --- a/arch/arm/include/asm/arch-sunxi/gpio.h > +++ b/arch/arm/include/asm/arch-sunxi/gpio.h > @@ -135,7 +135,6 @@ enum sunxi_gpio_number { > #define SUNXI_GPIO_OUTPUT 1 > #define SUNXI_GPIO_DISABLE 7 > > -#define SUNXI_GPA_EMAC 2 > #define SUN6I_GPA_GMAC 2 > #define SUN7I_GPA_GMAC 5 > #define SUN8I_H3_GPA_UART0 2 > diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c > index 17ad88e732..d15b0add7c 100644 > --- a/drivers/net/sunxi_emac.c > +++ b/drivers/net/sunxi_emac.c > @@ -17,7 +17,6 @@ > #include <net.h> > #include <asm/io.h> > #include <asm/arch/clock.h> > -#include <asm/arch/gpio.h> > > /* EMAC register */ > struct emac_regs { > @@ -511,15 +510,11 @@ static int sunxi_emac_board_setup(struct udevice *dev, > struct sunxi_sramc_regs *sram = > (struct sunxi_sramc_regs *)SUNXI_SRAMC_BASE; > struct emac_regs *regs = priv->regs; > - int pin, ret; > + int ret; > > /* Map SRAM to EMAC */ > setbits_le32(&sram->ctrl1, 0x5 << 2); > > - /* Configure pin mux settings for MII Ethernet */ > - for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(17); pin++) > - sunxi_gpio_set_cfgpin(pin, SUNXI_GPA_EMAC); > - > /* Set up clock gating */ > ret = clk_enable(&priv->clk); > if (ret) {