From: Andreas Rehn <rehn.andreas86@gmail.com>
To: hdegoede@redhat.com, jagan@amarulasolutions.com, andre.przywara@arm.com
Cc: icenowy@aosc.io, u-boot@lists.denx.de,
linux-sunxi@googlegroups.com,
Andreas Rehn <rehn.andreas86@gmail.com>
Subject: [PATCH v2 4/6] net: sun8i-emac: add v3s variant
Date: Fri, 21 May 2021 22:05:02 +0200 [thread overview]
Message-ID: <20210521200503.97577-2-rehn.andreas86@gmail.com> (raw)
In-Reply-To: <20210521200503.97577-1-rehn.andreas86@gmail.com>
Add variant V3S_EMAC.
Skip GPIO setup for V3s because it uses internal phy and don't expose pins.
Signed-off-by: Andreas Rehn <rehn.andreas86@gmail.com>
---
drivers/net/sun8i_emac.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index 5a1b38bf80..7541d3cf68 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -145,6 +145,7 @@ enum emac_variant {
A64_EMAC,
R40_GMAC,
H6_EMAC,
+ V3S_EMAC,
};
struct emac_dma_desc {
@@ -303,7 +304,7 @@ static void sun8i_adjust_link(struct emac_eth_dev *priv,
static u32 sun8i_emac_set_syscon_ephy(struct emac_eth_dev *priv, u32 reg)
{
if (priv->use_internal_phy) {
- /* H3 based SoC's that has an Internal 100MBit PHY
+ /* H3 and V3s based SoC's that has an Internal 100MBit PHY
* needs to be configured and powered up before use
*/
reg &= ~H3_EPHY_DEFAULT_MASK;
@@ -343,7 +344,8 @@ static int sun8i_emac_set_syscon(struct sun8i_eth_pdata *pdata,
reg &= ~(SC_ETCS_MASK | SC_EPIT);
if (priv->variant == H3_EMAC ||
priv->variant == A64_EMAC ||
- priv->variant == H6_EMAC)
+ priv->variant == H6_EMAC ||
+ priv->variant == V3S_EMAC)
reg &= ~SC_RMII_EN;
switch (priv->interface) {
@@ -354,7 +356,8 @@ static int sun8i_emac_set_syscon(struct sun8i_eth_pdata *pdata,
case PHY_INTERFACE_MODE_RGMII_ID:
case PHY_INTERFACE_MODE_RGMII_RXID:
case PHY_INTERFACE_MODE_RGMII_TXID:
- reg |= SC_EPIT | SC_ETCS_INT_GMII;
+ if (priv->variant != V3S_EMAC)
+ reg |= SC_EPIT | SC_ETCS_INT_GMII;
break;
case PHY_INTERFACE_MODE_RMII:
if (priv->variant == H3_EMAC ||
@@ -566,6 +569,9 @@ static int parse_phy_pins(struct udevice *dev)
iomux = SUN8I_IOMUX;
else if (IS_ENABLED(CONFIG_MACH_SUN50I))
iomux = SUN8I_IOMUX;
+ else if (IS_ENABLED(CONFIG_MACH_SUN8I_V3S))
+ // V3s does not expose any MAC pins - skip gpio setup.
+ return 0;
else
BUILD_BUG_ON_MSG(1, "missing pinmux value for Ethernet pins");
@@ -956,7 +962,8 @@ static int sun8i_emac_eth_of_to_plat(struct udevice *dev)
return -EINVAL;
}
- if (priv->variant == H3_EMAC) {
+ if (priv->variant == H3_EMAC ||
+ priv->variant == V3S_EMAC) {
ret = sun8i_handle_internal_phy(dev, priv);
if (ret)
return ret;
@@ -1009,6 +1016,8 @@ static const struct udevice_id sun8i_emac_eth_ids[] = {
.data = (uintptr_t)R40_GMAC },
{.compatible = "allwinner,sun50i-h6-emac",
.data = (uintptr_t)H6_EMAC },
+ {.compatible = "allwinner,sun8i-v3s-emac",
+ .data = (uintptr_t)V3S_EMAC },
{ }
};
--
2.25.1
next prev parent reply other threads:[~2021-05-21 20:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-21 20:05 [PATCH v2 3/6] clk: sunxi: v3s: fix tabs / spaces Andreas Rehn
2021-05-21 20:05 ` Andreas Rehn [this message]
2021-05-21 20:05 ` [PATCH v2 5/6] dts: sunxi: v3s: enable emac Andreas Rehn
2021-12-07 6:10 ` Jagan Teki
-- strict thread matches above, loose matches on Subject: below --
2021-05-19 19:42 [PATCH 4/6] net: sun8i-emac: add v3s pinmux setting Andreas Rehn
2021-05-22 23:22 ` [PATCH v2 4/6] net: sun8i-emac: add v3s variant Andreas Rehn
2021-05-25 6:53 ` Ramon Fried
2021-05-26 23:24 ` Andre Przywara
2021-12-07 6:13 ` Jagan Teki
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=20210521200503.97577-2-rehn.andreas86@gmail.com \
--to=rehn.andreas86@gmail.com \
--cc=andre.przywara@arm.com \
--cc=hdegoede@redhat.com \
--cc=icenowy@aosc.io \
--cc=jagan@amarulasolutions.com \
--cc=linux-sunxi@googlegroups.com \
--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