diff options
| author | Tom Rini <trini@konsulko.com> | 2024-07-08 11:56:59 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-07-08 11:56:59 -0600 |
| commit | 475aa8345a78396d39b42f96eccecd37ebe24e99 (patch) | |
| tree | c788908a4d8b32a0624c59c4ad60ebbb82998674 /drivers/net/mtk_eth.c | |
| parent | e13fcae3fce8b2c4db86339c9e8bafdd403f22b5 (diff) | |
| parent | 4b45082bf710097c8aa6f3ec25c3f34c54c7398c (diff) | |
Merge patch series "mediatek: cumulative trivial fix for OF_UPSTREAM support"
Christian Marangi <ansuelsmth@gmail.com> says:
This is an initial series that have all the initial trivial
fixes required for usage of OF_UPSTREAM for the mediatek SoC
This also contains the pcie-gen3 driver and the required tphy
support driver to make it work.
Subsequent series will follow with conversion of the mtk-clk
to permit usage of OF_UPSTREAM and upstream clk ID.
MT7981, MT7986 and MT7988 migration to upstream clock ID
is complete and working on MT7623.
Series CI tested with PR: https://github.com/u-boot/u-boot/pull/590
Diffstat (limited to 'drivers/net/mtk_eth.c')
| -rw-r--r-- | drivers/net/mtk_eth.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c index 94f17a97fe0..5098afef8a8 100644 --- a/drivers/net/mtk_eth.c +++ b/drivers/net/mtk_eth.c @@ -1964,7 +1964,9 @@ static int mtk_eth_of_to_plat(struct udevice *dev) return -ENODEV; } - priv->pn_swap = ofnode_read_bool(args.node, "pn_swap"); + /* Upstream linux use mediatek,pnswap instead of pn_swap */ + priv->pn_swap = ofnode_read_bool(args.node, "pn_swap") || + ofnode_read_bool(args.node, "mediatek,pnswap"); } else if (priv->phy_interface == PHY_INTERFACE_MODE_USXGMII) { /* get corresponding usxgmii phandle */ ret = dev_read_phandle_with_args(dev, "mediatek,usxgmiisys", |