Commitb07e675

authored and

committed

fsl/fman: take into account all RGMII modes

Accept the internal delay RGMII variants.Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>Signed-off-by: David S. Miller <davem@davemloft.net>

1 parentd6acfeb commitb07e675Copy full SHA for b07e675

File tree

+11

-2

lines changed

+11

-2

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -381,6 +381,9 @@ static int init(struct dtsec_regs __iomem regs, struct dtsec_cfg cfg,`
`381`	`381`
`382`	`382`	`/* check RGMII support */`
`383`	`383`	`if (iface==PHY_INTERFACE_MODE_RGMII\|\|`
	`384`	`+iface==PHY_INTERFACE_MODE_RGMII_ID\|\|`
	`385`	`+iface==PHY_INTERFACE_MODE_RGMII_RXID\|\|`
	`386`	`+iface==PHY_INTERFACE_MODE_RGMII_TXID\|\|`
`384`	`387`	`iface==PHY_INTERFACE_MODE_RMII)`
`385`	`388`	`if (tmp&DTSEC_ID2_INT_REDUCED_OFF)`
`386`	`389`	`return-EINVAL;`
`@@ -390,7 +393,10 @@ static int init(struct dtsec_regs __iomem regs, struct dtsec_cfg cfg,`
`390`	`393`	`if (tmp&DTSEC_ID2_INT_REDUCED_OFF)`
`391`	`394`	`return-EINVAL;`
`392`	`395`
`393`		`-is_rgmii=iface==PHY_INTERFACE_MODE_RGMII;`
	`396`	`+is_rgmii=iface==PHY_INTERFACE_MODE_RGMII\|\|`
	`397`	`+iface==PHY_INTERFACE_MODE_RGMII_ID\|\|`
	`398`	`+iface==PHY_INTERFACE_MODE_RGMII_RXID\|\|`
	`399`	`+iface==PHY_INTERFACE_MODE_RGMII_TXID;`
`394`	`400`	`is_sgmii=iface==PHY_INTERFACE_MODE_SGMII;`
`395`	`401`	`is_qsgmii=iface==PHY_INTERFACE_MODE_QSGMII;`
`396`	`402`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,10 @@ static int init(struct memac_regs __iomem regs, struct memac_cfg cfg,`
`443`	`443`	`break;`
`444`	`444`	`default:`
`445`	`445`	`tmp \|=IF_MODE_GMII;`
`446`		`-if (phy_if==PHY_INTERFACE_MODE_RGMII)`
	`446`	`+if (phy_if==PHY_INTERFACE_MODE_RGMII\|\|`
	`447`	`+phy_if==PHY_INTERFACE_MODE_RGMII_ID\|\|`
	`448`	`+phy_if==PHY_INTERFACE_MODE_RGMII_RXID\|\|`
	`449`	`+phy_if==PHY_INTERFACE_MODE_RGMII_TXID)`
`447`	`450`	`tmp \|=IF_MODE_RGMII \|IF_MODE_RGMII_AUTO;`
`448`	`451`	`}`
`449`	`452`	`iowrite32be(tmp,&regs->if_mode);`

Comments

(0)