| Message ID | 20190629122451.19578-1-opensource@vdorst.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | net: ethernet: mediatek: Allow non TRGMII mode with MT7621 DDR2 devices | expand |
Quoting René van Dorst <opensource@vdorst.com>: I see that I also forgot to tag this patch for net-next. Greats, René > No reason to error out on a MT7621 device with DDR2 memory when non > TRGMII mode is selected. > Only MT7621 DDR2 clock setup is not supported for TRGMII mode. > But non TRGMII mode doesn't need any special clock setup. > > Signed-off-by: René van Dorst <opensource@vdorst.com> > --- > drivers/net/ethernet/mediatek/mtk_eth_soc.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c > b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > index 066712f2e985..b20b3a5a1ebb 100644 > --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c > +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > @@ -139,9 +139,12 @@ static int mt7621_gmac0_rgmii_adjust(struct > mtk_eth *eth, > { > u32 val; > > - /* Check DDR memory type. Currently DDR2 is not supported. */ > + /* Check DDR memory type. > + * Currently TRGMII mode with DDR2 memory is not supported. > + */ > regmap_read(eth->ethsys, ETHSYS_SYSCFG, &val); > - if (val & SYSCFG_DRAM_TYPE_DDR2) { > + if (interface == PHY_INTERFACE_MODE_TRGMII && > + val & SYSCFG_DRAM_TYPE_DDR2) { > dev_err(eth->dev, > "TRGMII mode with DDR2 memory is not supported!\n"); > return -EOPNOTSUPP; > -- > 2.20.1
From: René van Dorst <opensource@vdorst.com> Date: Sat, 29 Jun 2019 14:24:51 +0200 > No reason to error out on a MT7621 device with DDR2 memory when non > TRGMII mode is selected. > Only MT7621 DDR2 clock setup is not supported for TRGMII mode. > But non TRGMII mode doesn't need any special clock setup. > > Signed-off-by: René van Dorst <opensource@vdorst.com> Applied to net-next, thanks.
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 066712f2e985..b20b3a5a1ebb 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -139,9 +139,12 @@ static int mt7621_gmac0_rgmii_adjust(struct mtk_eth *eth, { u32 val; - /* Check DDR memory type. Currently DDR2 is not supported. */ + /* Check DDR memory type. + * Currently TRGMII mode with DDR2 memory is not supported. + */ regmap_read(eth->ethsys, ETHSYS_SYSCFG, &val); - if (val & SYSCFG_DRAM_TYPE_DDR2) { + if (interface == PHY_INTERFACE_MODE_TRGMII && + val & SYSCFG_DRAM_TYPE_DDR2) { dev_err(eth->dev, "TRGMII mode with DDR2 memory is not supported!\n"); return -EOPNOTSUPP;
No reason to error out on a MT7621 device with DDR2 memory when non TRGMII mode is selected. Only MT7621 DDR2 clock setup is not supported for TRGMII mode. But non TRGMII mode doesn't need any special clock setup. Signed-off-by: René van Dorst <opensource@vdorst.com> --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)