sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

net/phy: support of mmd register read and write 

Add function for indirect access of the mmd registers, based on linux.
phy_read_mmd_indirect
phy_write_mmd_indirect

Also clean some private mmd functions

Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Jan Weitzel 2013-08-30 10:01:20 +02:00 committed by Sascha Hauer
parent 93a4a77528
commit f958ffb3cd
4 changed files with 73 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/boards/dmo-mx6-realq7/board.c
View File

@ -58,23 +58,15 @@ static iomux_v3_cfg_t realq7_pads_gpio[] = {
MX6Q_PAD_RGMII_RX_CTL__GPIO_6_24,
};
static void mmd_write_reg(struct phy_device *dev, int device, int reg, int val)
{
phy_write(dev, 0x0d, device);
phy_write(dev, 0x0e, reg);
phy_write(dev, 0x0d, (1 << 14) | device);
phy_write(dev, 0x0e, val);
}
static int ksz9031rn_phy_fixup(struct phy_device *dev)
{
/*
* min rx data delay, max rx/tx clock delay,
* min rx/tx control delay
*/
mmd_write_reg(dev, 2, 4, 0);
mmd_write_reg(dev, 2, 5, 0);
mmd_write_reg(dev, 2, 8, 0x003ff);
phy_write_mmd_indirect(dev, 4, 2, 0);
phy_write_mmd_indirect(dev, 5, 2, 0);
phy_write_mmd_indirect(dev, 8, 2, 0x03ff);
return 0;
}

14
arch/arm/boards/tqma6x/board.c
View File

@ -58,23 +58,15 @@ static iomux_v3_cfg_t tqma6x_pads_gpio[] = {
MX6Q_PAD_RGMII_RX_CTL__GPIO_6_24,
};
static void mmd_write_reg(struct phy_device *dev, int device, int reg, int val)
{
phy_write(dev, 0x0d, device);
phy_write(dev, 0x0e, reg);
phy_write(dev, 0x0d, (1 << 14) | device);
phy_write(dev, 0x0e, val);
}
static int ksz9031rn_phy_fixup(struct phy_device *dev)
{
/*
* min rx data delay, max rx/tx clock delay,
* min rx/tx control delay
*/
mmd_write_reg(dev, 2, 4, 0);
mmd_write_reg(dev, 2, 5, 0);
mmd_write_reg(dev, 2, 8, 0x003ff);
phy_write_mmd_indirect(dev, 4, 2, 0);
phy_write_mmd_indirect(dev, 5, 2, 0);
phy_write_mmd_indirect(dev, 8, 2, 0x003ff);
return 0;
}

63
drivers/net/phy/phy.c
View File

@ -632,6 +632,69 @@ int genphy_read_status(struct phy_device *phydev)
return 0;
}
static inline void mmd_phy_indirect(struct phy_device *phydev, int prtad,
int devad)
{
/* Write the desired MMD Devad */
phy_write(phydev, MII_MMD_CTRL, devad);
/* Write the desired MMD register address */
phy_write(phydev, MII_MMD_DATA, prtad);
/* Select the Function : DATA with no post increment */
phy_write(phydev, MII_MMD_CTRL, (devad | MII_MMD_CTRL_NOINCR));
}
/**
* phy_read_mmd_indirect - reads data from the MMD registers
* @phy_device: phy device
* @prtad: MMD Address
* @devad: MMD DEVAD
*
* Description: it reads data from the MMD registers (clause 22 to access to
* clause 45) of the specified phy address.
* To read these register we have:
* 1) Write reg 13 // DEVAD
* 2) Write reg 14 // MMD Address
* 3) Write reg 13 // MMD Data Command for MMD DEVAD
* 3) Read reg 14 // Read MMD data
*/
int phy_read_mmd_indirect(struct phy_device *phydev, int prtad, int devad)
{
u32 ret;
mmd_phy_indirect(phydev, prtad, devad);
/* Read the content of the MMD's selected register */
ret = phy_read(phydev, MII_MMD_DATA);
return ret;
}
/**
* phy_write_mmd_indirect - writes data to the MMD registers
* @phy_device: phy device
* @prtad: MMD Address
* @devad: MMD DEVAD
* @data: data to write in the MMD register
*
* Description: Write data from the MMD registers of the specified
* phy address.
* To write these register we have:
* 1) Write reg 13 // DEVAD
* 2) Write reg 14 // MMD Address
* 3) Write reg 13 // MMD Data Command for MMD DEVAD
* 3) Write reg 14 // Write MMD data
*/
void phy_write_mmd_indirect(struct phy_device *phydev, int prtad, int devad,
u16 data)
{
mmd_phy_indirect(phydev, prtad, devad);
/* Write the data into MMD's selected register */
phy_write(phydev, MII_MMD_DATA, data);
}
static int genphy_config_init(struct phy_device *phydev)
{
int val;

4
include/linux/phy.h
View File

@ -288,5 +288,9 @@ int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask,
int (*run)(struct phy_device *));
int phy_scan_fixups(struct phy_device *phydev);
int phy_read_mmd_indirect(struct phy_device *phydev, int prtad, int devad);
void phy_write_mmd_indirect(struct phy_device *phydev, int prtad, int devad,
u16 data);
extern struct bus_type mdio_bus_type;
#endif /* __PHYDEV_H__ */