From: Andre Przywara <andre.przywara@arm.com>
To: Samuel Holland <samuel@sholland.org>
Cc: u-boot@lists.denx.de, Jagan Teki <jagan@amarulasolutions.com>,
Sean Anderson <seanga2@gmail.com>, Simon Glass <sjg@chromium.org>,
Heinrich Schuchardt <heinrich.schuchardt@canonical.com>,
Heiko Schocher <hs@denx.de>,
Joe Hershberger <joe.hershberger@ni.com>
Subject: Re: [PATCH v2 12/23] net: sun8i_emac: Remove non-DM pin setup
Date: Fri, 1 Apr 2022 00:20:21 +0100 [thread overview]
Message-ID: <20220401002021.6bfe54fe@slackpad.lan> (raw)
In-Reply-To: <20220318035420.15058-13-samuel@sholland.org>
On Thu, 17 Mar 2022 22:54:09 -0500
Samuel Holland <samuel@sholland.org> wrote:
> This is now handled automatically by the pinctrl driver.
>
> Signed-off-by: Samuel Holland <samuel@sholland.org>
Love that diffstat!
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Cheers,
Andre
> ---
>
> (no changes since v1)
>
> drivers/net/sun8i_emac.c | 90 ----------------------------------------
> 1 file changed, 90 deletions(-)
>
> diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
> index 2e24d12214..b23faa228e 100644
> --- a/drivers/net/sun8i_emac.c
> +++ b/drivers/net/sun8i_emac.c
> @@ -29,7 +29,6 @@
> #include <miiphy.h>
> #include <net.h>
> #include <reset.h>
> -#include <dt-bindings/pinctrl/sun4i-a10.h>
> #include <wait_bit.h>
>
> #define MDIO_CMD_MII_BUSY BIT(0)
> @@ -81,13 +80,6 @@
>
> #define AHB_GATE_OFFSET_EPHY 0
>
> -/* IO mux settings */
> -#define SUN8I_IOMUX_H3 2
> -#define SUN8I_IOMUX_R40 5
> -#define SUN8I_IOMUX_H6 5
> -#define SUN8I_IOMUX_H616 2
> -#define SUN8I_IOMUX 4
> -
> /* H3/A64 EMAC Register's offset */
> #define EMAC_CTL0 0x00
> #define EMAC_CTL0_FULL_DUPLEX BIT(0)
> @@ -519,85 +511,6 @@ static int sun8i_emac_eth_start(struct udevice *dev)
> return 0;
> }
>
> -static int parse_phy_pins(struct udevice *dev)
> -{
> - int offset;
> - const char *pin_name;
> - int drive, pull = SUN4I_PINCTRL_NO_PULL, i;
> - u32 iomux;
> -
> - offset = fdtdec_lookup_phandle(gd->fdt_blob, dev_of_offset(dev),
> - "pinctrl-0");
> - if (offset < 0) {
> - printf("WARNING: emac: cannot find pinctrl-0 node\n");
> - return offset;
> - }
> -
> - drive = fdt_getprop_u32_default_node(gd->fdt_blob, offset, 0,
> - "drive-strength", ~0);
> - if (drive != ~0) {
> - if (drive <= 10)
> - drive = SUN4I_PINCTRL_10_MA;
> - else if (drive <= 20)
> - drive = SUN4I_PINCTRL_20_MA;
> - else if (drive <= 30)
> - drive = SUN4I_PINCTRL_30_MA;
> - else
> - drive = SUN4I_PINCTRL_40_MA;
> - }
> -
> - if (fdt_get_property(gd->fdt_blob, offset, "bias-pull-up", NULL))
> - pull = SUN4I_PINCTRL_PULL_UP;
> - else if (fdt_get_property(gd->fdt_blob, offset, "bias-pull-down", NULL))
> - pull = SUN4I_PINCTRL_PULL_DOWN;
> -
> - /*
> - * The GPIO pinmux value is an integration choice, so depends on the
> - * SoC, not the EMAC variant.
> - */
> - if (IS_ENABLED(CONFIG_MACH_SUNXI_H3_H5))
> - iomux = SUN8I_IOMUX_H3;
> - else if (IS_ENABLED(CONFIG_MACH_SUN8I_R40))
> - iomux = SUN8I_IOMUX_R40;
> - else if (IS_ENABLED(CONFIG_MACH_SUN50I_H6))
> - iomux = SUN8I_IOMUX_H6;
> - else if (IS_ENABLED(CONFIG_MACH_SUN50I_H616))
> - iomux = SUN8I_IOMUX_H616;
> - else if (IS_ENABLED(CONFIG_MACH_SUN8I_A83T))
> - iomux = SUN8I_IOMUX;
> - else if (IS_ENABLED(CONFIG_MACH_SUN50I))
> - iomux = SUN8I_IOMUX;
> - else
> - BUILD_BUG_ON_MSG(1, "missing pinmux value for Ethernet pins");
> -
> - for (i = 0; ; i++) {
> - int pin;
> -
> - pin_name = fdt_stringlist_get(gd->fdt_blob, offset,
> - "pins", i, NULL);
> - if (!pin_name)
> - break;
> -
> - pin = sunxi_name_to_gpio(pin_name);
> - if (pin < 0)
> - continue;
> -
> - sunxi_gpio_set_cfgpin(pin, iomux);
> -
> - if (drive != ~0)
> - sunxi_gpio_set_drv(pin, drive);
> - if (pull != ~0)
> - sunxi_gpio_set_pull(pin, pull);
> - }
> -
> - if (!i) {
> - printf("WARNING: emac: cannot find pins property\n");
> - return -2;
> - }
> -
> - return 0;
> -}
> -
> static int sun8i_emac_eth_recv(struct udevice *dev, int flags, uchar **packetp)
> {
> struct emac_eth_dev *priv = dev_get_priv(dev);
> @@ -965,9 +878,6 @@ static int sun8i_emac_eth_of_to_plat(struct udevice *dev)
>
> priv->interface = pdata->phy_interface;
>
> - if (!priv->use_internal_phy)
> - parse_phy_pins(dev);
> -
> sun8i_pdata->tx_delay_ps = fdtdec_get_int(gd->fdt_blob, node,
> "allwinner,tx-delay-ps", 0);
> if (sun8i_pdata->tx_delay_ps < 0 || sun8i_pdata->tx_delay_ps > 700)
next prev parent reply other threads:[~2022-03-31 23:37 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-18 3:53 [PATCH v2 00/23] sunxi: Add and use a pinctrl driver Samuel Holland
2022-03-18 3:53 ` [PATCH v2 01/23] sunxi: pinctrl: Create the driver skeleton Samuel Holland
2022-03-18 3:53 ` [PATCH v2 02/23] sunxi: pinctrl: Implement pin muxing functions Samuel Holland
2022-03-31 23:34 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 03/23] sunxi: pinctrl: Implement get_pin_muxing function Samuel Holland
2022-03-31 23:36 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 04/23] sunxi: pinctrl: Implement pin configuration Samuel Holland
2022-03-18 3:54 ` [PATCH v2 05/23] pinctrl: sunxi: Add UART pinmuxes Samuel Holland
2022-03-31 23:18 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 06/23] sunxi: Skip non-DM UART pin setup when PINCTRL=y Samuel Holland
2022-03-31 23:19 ` Andre Przywara
2022-03-31 23:59 ` Samuel Holland
2022-03-18 3:54 ` [PATCH v2 07/23] pinctrl: sunxi: Add sun4i EMAC pinmuxes Samuel Holland
2022-03-31 23:19 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 08/23] net: sunxi_emac: Remove non-DM pin setup Samuel Holland
2022-03-31 23:19 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 09/23] pinctrl: sunxi: Add sunxi GMAC pinmuxes Samuel Holland
2022-03-31 23:19 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 10/23] sunxi: Remove non-DM GMAC pin setup Samuel Holland
2022-03-31 23:20 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 11/23] pinctrl: sunxi: Add sun8i EMAC pinmuxes Samuel Holland
2022-03-31 23:20 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 12/23] net: sun8i_emac: Remove non-DM pin setup Samuel Holland
2022-03-31 23:20 ` Andre Przywara [this message]
2022-03-18 3:54 ` [PATCH v2 13/23] pinctrl: sunxi: Add I2C pinmuxes Samuel Holland
2022-03-27 17:22 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 14/23] sunxi: Remove options and setup code for I2C2-I2C4 Samuel Holland
2022-03-18 3:54 ` [PATCH v2 15/23] sunxi: Remove non-DM I2C clock/pin setup from U-Boot Samuel Holland
2022-03-31 23:20 ` Andre Przywara
2022-04-01 0:04 ` Samuel Holland
2022-03-18 3:54 ` [PATCH v2 16/23] i2c: sun6i_p2wi: Only do non-DM pin setup for non-DM I2C Samuel Holland
2022-03-31 23:20 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 17/23] i2c: sun8i_rsb: " Samuel Holland
2022-03-20 7:17 ` Heinrich Schuchardt
2022-03-20 7:22 ` Heinrich Schuchardt
2022-03-31 23:20 ` Andre Przywara
2022-04-01 0:10 ` Samuel Holland
2022-03-18 3:54 ` [PATCH v2 18/23] pinctrl: sunxi: Add MMC pinmuxes Samuel Holland
2022-03-31 23:20 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 19/23] sunxi: Remove non-DM MMC pin setup Samuel Holland
2022-03-31 23:21 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 20/23] pinctrl: sunxi: Add the A64 PWM pinmux Samuel Holland
2022-03-31 23:21 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 21/23] pwm: sunxi: Remove non-DM pin setup Samuel Holland
2022-03-31 23:21 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 22/23] pinctrl: sunxi: Add SPI0 pinmuxes Samuel Holland
2022-03-31 23:21 ` Andre Przywara
2022-03-18 3:54 ` [PATCH v2 23/23] spi: sun4i_spi: Remove non-DM pin setup Samuel Holland
2022-03-31 23:21 ` Andre Przywara
2022-04-04 0:54 ` [PATCH v2 00/23] sunxi: Add and use a pinctrl driver Andre Przywara
2022-04-04 1:24 ` Samuel Holland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220401002021.6bfe54fe@slackpad.lan \
--to=andre.przywara@arm.com \
--cc=heinrich.schuchardt@canonical.com \
--cc=hs@denx.de \
--cc=jagan@amarulasolutions.com \
--cc=joe.hershberger@ni.com \
--cc=samuel@sholland.org \
--cc=seanga2@gmail.com \
--cc=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).