KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

generic: ar8216: allow to specify SGMII config via platform data

Browse source 
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 36798
This commit is contained in:
Gabor Juhos 2013-05-30 17:38:26 +00:00
parent c170d3c3e4
commit a1f91282b4
3 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
target/linux/generic/files/drivers/net/phy/ar8216.c
View file

@ -1099,13 +1099,32 @@ ar8327_hw_config_pdata(struct ar8xxx_priv *priv,
priv->write(priv, AR8327_REG_LED_CTRL1, led_cfg->led_ctrl1); priv->write(priv, AR8327_REG_LED_CTRL1, led_cfg->led_ctrl1);
priv->write(priv, AR8327_REG_LED_CTRL2, led_cfg->led_ctrl2); priv->write(priv, AR8327_REG_LED_CTRL2, led_cfg->led_ctrl2);
priv->write(priv, AR8327_REG_LED_CTRL3, led_cfg->led_ctrl3); priv->write(priv, AR8327_REG_LED_CTRL3, led_cfg->led_ctrl3);
if (new_pos != pos)
new_pos |= AR8327_POWER_ON_STRIP_POWER_ON_SEL;
} }
if (new_pos != pos) { if (pdata->sgmii_cfg) {
new_pos |= AR8327_POWER_ON_STRIP_POWER_ON_SEL; t = pdata->sgmii_cfg->sgmii_ctrl;
priv->write(priv, AR8327_REG_POWER_ON_STRIP, new_pos); if (priv->chip_rev == 1)
t |= AR8327_SGMII_CTRL_EN_PLL |
AR8327_SGMII_CTRL_EN_RX |
AR8327_SGMII_CTRL_EN_TX;
else
t &= ~(AR8327_SGMII_CTRL_EN_PLL |
AR8327_SGMII_CTRL_EN_RX |
AR8327_SGMII_CTRL_EN_TX);
priv->write(priv, AR8327_REG_SGMII_CTRL, t);
if (pdata->sgmii_cfg->serdes_aen)
new_pos &= ~AR8327_POWER_ON_STRIP_SERDES_AEN;
else
new_pos |= AR8327_POWER_ON_STRIP_SERDES_AEN;
} }
priv->write(priv, AR8327_REG_POWER_ON_STRIP, new_pos);
return 0; return 0;
} }

6
target/linux/generic/files/drivers/net/phy/ar8216.h
View file

@ -327,6 +327,7 @@
#define AR8327_REG_POWER_ON_STRIP 0x010 #define AR8327_REG_POWER_ON_STRIP 0x010
#define AR8327_POWER_ON_STRIP_POWER_ON_SEL BIT(31) #define AR8327_POWER_ON_STRIP_POWER_ON_SEL BIT(31)
#define AR8327_POWER_ON_STRIP_LED_OPEN_EN BIT(24) #define AR8327_POWER_ON_STRIP_LED_OPEN_EN BIT(24)
#define AR8327_POWER_ON_STRIP_SERDES_AEN BIT(7)
#define AR8327_REG_INT_STATUS0 0x020 #define AR8327_REG_INT_STATUS0 0x020
#define AR8327_INT0_VT_DONE BIT(20) #define AR8327_INT0_VT_DONE BIT(20)
@ -357,6 +358,11 @@
#define AR8327_REG_HEADER_CTRL 0x098 #define AR8327_REG_HEADER_CTRL 0x098
#define AR8327_REG_PORT_HEADER(_i) (0x09c + (_i) * 4) #define AR8327_REG_PORT_HEADER(_i) (0x09c + (_i) * 4)
#define AR8327_REG_SGMII_CTRL 0x0e0
#define AR8327_SGMII_CTRL_EN_PLL BIT(1)
#define AR8327_SGMII_CTRL_EN_RX BIT(2)
#define AR8327_SGMII_CTRL_EN_TX BIT(3)
#define AR8327_REG_PORT_VLAN0(_i) (0x420 + (_i) * 0x8) #define AR8327_REG_PORT_VLAN0(_i) (0x420 + (_i) * 0x8)
#define AR8327_PORT_VLAN0_DEF_SVID BITS(0, 12) #define AR8327_PORT_VLAN0_DEF_SVID BITS(0, 12)
#define AR8327_PORT_VLAN0_DEF_SVID_S 0 #define AR8327_PORT_VLAN0_DEF_SVID_S 0

6
target/linux/generic/files/include/linux/ar8216_platform.h
View file

@ -63,6 +63,11 @@ struct ar8327_port_cfg {
int duplex:1; int duplex:1;
}; };
struct ar8327_sgmii_cfg {
u32 sgmii_ctrl;
bool serdes_aen;
};
struct ar8327_led_cfg { struct ar8327_led_cfg {
u32 led_ctrl0; u32 led_ctrl0;
u32 led_ctrl1; u32 led_ctrl1;
@ -75,6 +80,7 @@ struct ar8327_platform_data {
struct ar8327_pad_cfg *pad0_cfg; struct ar8327_pad_cfg *pad0_cfg;
struct ar8327_pad_cfg *pad5_cfg; struct ar8327_pad_cfg *pad5_cfg;
struct ar8327_pad_cfg *pad6_cfg; struct ar8327_pad_cfg *pad6_cfg;
struct ar8327_sgmii_cfg *sgmii_cfg;
struct ar8327_port_cfg port0_cfg; struct ar8327_port_cfg port0_cfg;
struct ar8327_port_cfg port6_cfg; struct ar8327_port_cfg port6_cfg;
struct ar8327_led_cfg *led_cfg; struct ar8327_led_cfg *led_cfg;