|
@@ -643,19 +643,11 @@ int fsl_rio_setup(struct platform_device *dev)
|
|
|
port->ops = ops;
|
|
|
port->priv = priv;
|
|
|
port->phys_efptr = 0x100;
|
|
|
+ port->phys_rmap = 1;
|
|
|
priv->regs_win = rio_regs_win;
|
|
|
|
|
|
- /* Probe the master port phy type */
|
|
|
ccsr = in_be32(priv->regs_win + RIO_CCSR + i*0x20);
|
|
|
- port->phy_type = (ccsr & 1) ? RIO_PHY_SERIAL : RIO_PHY_PARALLEL;
|
|
|
- if (port->phy_type == RIO_PHY_PARALLEL) {
|
|
|
- dev_err(&dev->dev, "RIO: Parallel PHY type, unsupported port type!\n");
|
|
|
- release_resource(&port->iores);
|
|
|
- kfree(priv);
|
|
|
- kfree(port);
|
|
|
- continue;
|
|
|
- }
|
|
|
- dev_info(&dev->dev, "RapidIO PHY type: Serial\n");
|
|
|
+
|
|
|
/* Checking the port training status */
|
|
|
if (in_be32((priv->regs_win + RIO_ESCSR + i*0x20)) & 1) {
|
|
|
dev_err(&dev->dev, "Port %d is not ready. "
|
|
@@ -705,11 +697,9 @@ int fsl_rio_setup(struct platform_device *dev)
|
|
|
((i == 0) ? RIO_INB_ATMU_REGS_PORT1_OFFSET :
|
|
|
RIO_INB_ATMU_REGS_PORT2_OFFSET));
|
|
|
|
|
|
-
|
|
|
- /* Set to receive any dist ID for serial RapidIO controller. */
|
|
|
- if (port->phy_type == RIO_PHY_SERIAL)
|
|
|
- out_be32((priv->regs_win
|
|
|
- + RIO_ISR_AACR + i*0x80), RIO_ISR_AACR_AA);
|
|
|
+ /* Set to receive packets with any dest ID */
|
|
|
+ out_be32((priv->regs_win + RIO_ISR_AACR + i*0x80),
|
|
|
+ RIO_ISR_AACR_AA);
|
|
|
|
|
|
/* Configure maintenance transaction window */
|
|
|
out_be32(&priv->maint_atmu_regs->rowbar,
|