diff options
| author | Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2016-04-01 09:07:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-01 14:38:59 -0400 |
| commit | a7657f128c279ae5796ab2ca7d04a7819f4259f0 (patch) | |
| tree | 160bc8bb98d4211393230dcfbc6440359c00ecd0 /include | |
| parent | d7e944c8ddc0983640a9a32868fb217485d12ca2 (diff) | |
| download | linux-a7657f128c279ae5796ab2ca7d04a7819f4259f0.tar.gz linux-a7657f128c279ae5796ab2ca7d04a7819f4259f0.tar.bz2 linux-a7657f128c279ae5796ab2ca7d04a7819f4259f0.zip | |
stmmac: fix MDIO settings
Initially the phy_bus_name was added to manipulate the
driver name but it was recently just used to manage the
fixed-link and then to take some decision at run-time.
So the patch uses the is_pseudo_fixed_link and removes
the phy_bus_name variable not necessary anymore.
The driver can manage the mdio registration by using phy-handle,
dwmac-mdio and own parameter e.g. snps,phy-addr.
This patch takes care about all these possible configurations
and fixes the mdio registration in case of there is a real
transceiver or a switch (that needs to be managed by using
fixed-link).
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Tested-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Cc: Gabriel Fernandez <gabriel.fernandez@linaro.org>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Phil Reid <preid@electromag.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/stmmac.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index 6e53fa8942a4..e6bc30a42a74 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -108,12 +108,12 @@ struct stmmac_axi { }; struct plat_stmmacenet_data { - char *phy_bus_name; int bus_id; int phy_addr; int interface; struct stmmac_mdio_bus_data *mdio_bus_data; struct device_node *phy_node; + struct device_node *mdio_node; struct stmmac_dma_cfg *dma_cfg; int clk_csr; int has_gmac; |