ravb: Remove checks for unsupported internal delay modes
The EtherAVB instances on the R-Car E3/D3 and RZ/G2E SoCs do not support TX clock internal delay modes, and the EtherAVB driver prints a warning if an unsupported "rgmii-*id" PHY mode is specified, to catch buggy DTBs. Commita6f51f2efa
("ravb: Add support for explicit internal clock delay configuration") deprecated deriving the internal delay mode from the PHY mode, in favor of explicit configuration using the now mandatory "rx-internal-delay-ps" and "tx-internal-delay-ps" properties, thus delegating the warning to the legacy fallback code. Since explicit configuration of a (valid) internal clock delay configuration is enforced by validating device tree source files against DT binding files, and all upstream DTS files have been converted as of commita5200e63af
("arm64: dts: renesas: rzg2: Convert EtherAVB to explicit delay handling"), the checks in the legacy fallback code can be removed. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> Link: https://lore.kernel.org/r/2037542ac56e99413b9807e24049711553cc88a9.1628696778.git.geert+renesas@glider.be Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
b06a1ffe17
commit
44e5d08812
@ -1973,13 +1973,6 @@ static void ravb_set_config_mode(struct net_device *ndev)
|
||||
}
|
||||
}
|
||||
|
||||
static const struct soc_device_attribute ravb_delay_mode_quirk_match[] = {
|
||||
{ .soc_id = "r8a774c0" },
|
||||
{ .soc_id = "r8a77990" },
|
||||
{ .soc_id = "r8a77995" },
|
||||
{ /* sentinel */ }
|
||||
};
|
||||
|
||||
/* Set tx and rx clock internal delay modes */
|
||||
static void ravb_parse_delay_mode(struct device_node *np, struct net_device *ndev)
|
||||
{
|
||||
@ -2010,12 +2003,8 @@ static void ravb_parse_delay_mode(struct device_node *np, struct net_device *nde
|
||||
|
||||
if (priv->phy_interface == PHY_INTERFACE_MODE_RGMII_ID ||
|
||||
priv->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID) {
|
||||
if (!WARN(soc_device_match(ravb_delay_mode_quirk_match),
|
||||
"phy-mode %s requires TX clock internal delay mode which is not supported by this hardware revision. Please update device tree",
|
||||
phy_modes(priv->phy_interface))) {
|
||||
priv->txcidm = 1;
|
||||
priv->rgmii_override = 1;
|
||||
}
|
||||
priv->txcidm = 1;
|
||||
priv->rgmii_override = 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user