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 10/23] sunxi: Remove non-DM GMAC pin setup
Date: Fri, 1 Apr 2022 00:20:05 +0100 [thread overview]
Message-ID: <20220401002005.0403d361@slackpad.lan> (raw)
In-Reply-To: <20220318035420.15058-11-samuel@sholland.org>
On Thu, 17 Mar 2022 22:54:07 -0500
Samuel Holland <samuel@sholland.org> wrote:
> This is now handled automatically by the pinctrl driver.
>
> Signed-off-by: Samuel Holland <samuel@sholland.org>
Yeah!
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Cheers,
Andre
> ---
>
> (no changes since v1)
>
> arch/arm/include/asm/arch-sunxi/gpio.h | 2 -
> board/sunxi/gmac.c | 55 --------------------------
> 2 files changed, 57 deletions(-)
>
> diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h
> index e93c9e84c9..2aa6bbb178 100644
> --- a/arch/arm/include/asm/arch-sunxi/gpio.h
> +++ b/arch/arm/include/asm/arch-sunxi/gpio.h
> @@ -135,8 +135,6 @@ enum sunxi_gpio_number {
> #define SUNXI_GPIO_OUTPUT 1
> #define SUNXI_GPIO_DISABLE 7
>
> -#define SUN6I_GPA_GMAC 2
> -#define SUN7I_GPA_GMAC 5
> #define SUN8I_H3_GPA_UART0 2
>
> #define SUN4I_GPB_PWM 2
> diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c
> index 1fa54ed72d..2a885305eb 100644
> --- a/board/sunxi/gmac.c
> +++ b/board/sunxi/gmac.c
> @@ -1,13 +1,11 @@
> #include <common.h>
> #include <netdev.h>
> #include <miiphy.h>
> -#include <asm/gpio.h>
> #include <asm/io.h>
> #include <asm/arch/clock.h>
>
> void eth_init_board(void)
> {
> - int pin;
> struct sunxi_ccm_reg *const ccm =
> (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
>
> @@ -21,57 +19,4 @@ void eth_init_board(void)
> setbits_le32(&ccm->gmac_clk_cfg, CCM_GMAC_CTRL_TX_CLK_SRC_MII |
> CCM_GMAC_CTRL_GPIT_MII);
> #endif
> -
> -#ifndef CONFIG_MACH_SUN6I
> - /* Configure pin mux settings for GMAC */
> -#ifdef CONFIG_SUN7I_GMAC_FORCE_TXERR
> - for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(17); pin++) {
> -#else
> - for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(16); pin++) {
> -#endif
> -#ifdef CONFIG_RGMII
> - /* skip unused pins in RGMII mode */
> - if (pin == SUNXI_GPA(9) || pin == SUNXI_GPA(14))
> - continue;
> -#endif
> - sunxi_gpio_set_cfgpin(pin, SUN7I_GPA_GMAC);
> - sunxi_gpio_set_drv(pin, 3);
> - }
> -#elif defined CONFIG_RGMII
> - /* Configure sun6i RGMII mode pin mux settings */
> - for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(3); pin++) {
> - sunxi_gpio_set_cfgpin(pin, SUN6I_GPA_GMAC);
> - sunxi_gpio_set_drv(pin, 3);
> - }
> - for (pin = SUNXI_GPA(9); pin <= SUNXI_GPA(14); pin++) {
> - sunxi_gpio_set_cfgpin(pin, SUN6I_GPA_GMAC);
> - sunxi_gpio_set_drv(pin, 3);
> - }
> - for (pin = SUNXI_GPA(19); pin <= SUNXI_GPA(20); pin++) {
> - sunxi_gpio_set_cfgpin(pin, SUN6I_GPA_GMAC);
> - sunxi_gpio_set_drv(pin, 3);
> - }
> - for (pin = SUNXI_GPA(25); pin <= SUNXI_GPA(27); pin++) {
> - sunxi_gpio_set_cfgpin(pin, SUN6I_GPA_GMAC);
> - sunxi_gpio_set_drv(pin, 3);
> - }
> -#elif defined CONFIG_GMII
> - /* Configure sun6i GMII mode pin mux settings */
> - for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(27); pin++) {
> - sunxi_gpio_set_cfgpin(pin, SUN6I_GPA_GMAC);
> - sunxi_gpio_set_drv(pin, 2);
> - }
> -#else
> - /* Configure sun6i MII mode pin mux settings */
> - for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(3); pin++)
> - sunxi_gpio_set_cfgpin(pin, SUN6I_GPA_GMAC);
> - for (pin = SUNXI_GPA(8); pin <= SUNXI_GPA(9); pin++)
> - sunxi_gpio_set_cfgpin(pin, SUN6I_GPA_GMAC);
> - for (pin = SUNXI_GPA(11); pin <= SUNXI_GPA(14); pin++)
> - sunxi_gpio_set_cfgpin(pin, SUN6I_GPA_GMAC);
> - for (pin = SUNXI_GPA(19); pin <= SUNXI_GPA(24); pin++)
> - sunxi_gpio_set_cfgpin(pin, SUN6I_GPA_GMAC);
> - for (pin = SUNXI_GPA(26); pin <= SUNXI_GPA(27); pin++)
> - sunxi_gpio_set_cfgpin(pin, SUN6I_GPA_GMAC);
> -#endif
> }
next prev parent reply other threads:[~2022-03-31 23:28 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 [this message]
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
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=20220401002005.0403d361@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).