79fb218d97
On newer PHYs, we need to select the expansion register to write with
setting bits [11:8] to 0xf. This was done correctly by bcm7xxx.c prior
to being migrated to generic code under bcm-phy-lib.c which
unfortunately used the older implementation from the BCM54xx days.
Fix this by creating an inline stub: bcm_write_exp_sel() which adds the
correct value (MII_BCM54XX_EXP_SEL_ER) and update both the Cygnus PHY
and BCM7xxx PHY drivers which require setting these bits.
broadcom.c is unchanged because some PHYs even use a different selector
method, so let them specify it directly (e.g: SerDes secondary selector).
Fixes: a1cba5613e ("net: phy: Add Broadcom phy library for common interfaces")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
57 lines
1.9 KiB
C
57 lines
1.9 KiB
C
/*
|
|
* Copyright (C) 2015 Broadcom Corporation
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation version 2.
|
|
*
|
|
* This program is distributed "as is" WITHOUT ANY WARRANTY of any
|
|
* kind, whether express or implied; without even the implied warranty
|
|
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#ifndef _LINUX_BCM_PHY_LIB_H
|
|
#define _LINUX_BCM_PHY_LIB_H
|
|
|
|
#include <linux/brcmphy.h>
|
|
#include <linux/phy.h>
|
|
|
|
int bcm_phy_write_exp(struct phy_device *phydev, u16 reg, u16 val);
|
|
int bcm_phy_read_exp(struct phy_device *phydev, u16 reg);
|
|
|
|
static inline int bcm_phy_write_exp_sel(struct phy_device *phydev,
|
|
u16 reg, u16 val)
|
|
{
|
|
return bcm_phy_write_exp(phydev, reg | MII_BCM54XX_EXP_SEL_ER, val);
|
|
}
|
|
|
|
int bcm54xx_auxctl_write(struct phy_device *phydev, u16 regnum, u16 val);
|
|
int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum);
|
|
|
|
int bcm_phy_write_misc(struct phy_device *phydev,
|
|
u16 reg, u16 chl, u16 value);
|
|
int bcm_phy_read_misc(struct phy_device *phydev,
|
|
u16 reg, u16 chl);
|
|
|
|
int bcm_phy_write_shadow(struct phy_device *phydev, u16 shadow,
|
|
u16 val);
|
|
int bcm_phy_read_shadow(struct phy_device *phydev, u16 shadow);
|
|
|
|
int bcm_phy_ack_intr(struct phy_device *phydev);
|
|
int bcm_phy_config_intr(struct phy_device *phydev);
|
|
|
|
int bcm_phy_enable_apd(struct phy_device *phydev, bool dll_pwr_down);
|
|
|
|
int bcm_phy_set_eee(struct phy_device *phydev, bool enable);
|
|
|
|
int bcm_phy_downshift_get(struct phy_device *phydev, u8 *count);
|
|
|
|
int bcm_phy_downshift_set(struct phy_device *phydev, u8 count);
|
|
|
|
int bcm_phy_get_sset_count(struct phy_device *phydev);
|
|
void bcm_phy_get_strings(struct phy_device *phydev, u8 *data);
|
|
void bcm_phy_get_stats(struct phy_device *phydev, u64 *shadow,
|
|
struct ethtool_stats *stats, u64 *data);
|
|
|
|
#endif /* _LINUX_BCM_PHY_LIB_H */
|