Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5634cb2b authored by Arun Parameswaran's avatar Arun Parameswaran Committed by David S. Miller
Browse files

net: phy: Disable external master access in bcm mdio mux driver 



Configure the scan control register in the Broadcom iProc
mdio mux driver to disable access to external master.

In some SoC's, the scan control register defaults to an incorrect
value.

Signed-off-by: default avatarArun Parameswaran <arun.parameswaran@broadcom.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 18b872d8

drivers/net/phy/mdio-mux-bcm-iproc.c

+15 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
#include <linux/mdio-mux.h>

#include <linux/delay.h>



#define MDIO_SCAN_CTRL_OFFSET		0x008

#define MDIO_SCAN_CTRL_OVRIDE_EXT_MSTR	28



#define MDIO_PARAM_OFFSET		0x23c

#define MDIO_PARAM_MIIM_CYCLE		29

#define MDIO_PARAM_INTERNAL_SEL		25
@@ -53,6 +56,16 @@ struct iproc_mdiomux_desc { 
	struct mii_bus *mii_bus;

};



static void mdio_mux_iproc_config(struct iproc_mdiomux_desc *md)

{

	u32 val;



	/* Disable external mdio master access */

	val = readl(md->base + MDIO_SCAN_CTRL_OFFSET);

	val |= BIT(MDIO_SCAN_CTRL_OVRIDE_EXT_MSTR);

	writel(val, md->base + MDIO_SCAN_CTRL_OFFSET);

}



static int iproc_mdio_wait_for_idle(void __iomem *base, bool result)

{

	unsigned int timeout = 1000; /* loop for 1s */
@@ -216,6 +229,8 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) 
		goto out_register;

	}



	mdio_mux_iproc_config(md);



	dev_info(md->dev, "iProc mdiomux registered\n");

	return 0;