[Feature][T108] [task-view-1618] solve init warnings problem
Only Configure: No
Affected branch: GSW_V1453
Affected module: phy
Self-test: yes
Doc Update: no
Change-Id: I0a7262d34fdff8b81a9d1a43e9380da12cc3b186
diff --git a/marvell/linux/drivers/net/phy/realtek.c b/marvell/linux/drivers/net/phy/realtek.c
index 602da0b..d1de801 100755
--- a/marvell/linux/drivers/net/phy/realtek.c
+++ b/marvell/linux/drivers/net/phy/realtek.c
@@ -754,7 +754,7 @@
mutex_lock(&dev->lock);
- reg_op.val = __phy_read(dev->phydev, reg_op.reg);
+ reg_op.val = phy_read(dev->phydev, reg_op.reg);
mutex_unlock(&dev->lock);
if (copy_to_user(buf, ®_op, sizeof(struct mdio_reg_op)))
@@ -777,7 +777,7 @@
mutex_lock(&dev->lock);
- ret = __phy_write(dev->phydev, reg_op.reg, reg_op.val);
+ ret = phy_write(dev->phydev, reg_op.reg, reg_op.val);
mutex_unlock(&dev->lock);
*f_pos += count;
@@ -811,35 +811,35 @@
u32 timer = 2000; // set a 2ms timer
//power down
- __phy_write(phydev, 0, 0x800);
+ phy_write(phydev, 0, 0x800);
mdelay(10);
- __phy_write(phydev, 27, 0x8017);
- __phy_write(phydev, 28, 0xFB03);
- __phy_write(phydev, 27, 0x8092);
- __phy_write(phydev, 28, 0x6000);
- __phy_write(phydev, 27, 0x80AF);
- __phy_write(phydev, 28, 0x6000);
- __phy_write(phydev, 27, 0x807D);
- __phy_write(phydev, 28, 0x4443);
- __phy_write(phydev, 27, 0x809A);
- __phy_write(phydev, 28, 0x4443);
- __phy_write(phydev, 27, 0x81A3);
- __phy_write(phydev, 28, 0x0F00);
- __phy_write(phydev, 31, 0x0a81);
- __phy_write(phydev, 18, 0x0004);
- __phy_write(phydev, 27, 0x83c8);
- __phy_write(phydev, 28, 0x0005);
- __phy_write(phydev, 31, 0x0a5c);
- __phy_write(phydev, 18, 0x0003);
- __phy_write(phydev, 27, 0xB820);
- __phy_write(phydev, 28, 0x0010);
- __phy_write(phydev, 27, 0xB830);
- __phy_write(phydev, 28, 0x8000);
+ phy_write(phydev, 27, 0x8017);
+ phy_write(phydev, 28, 0xFB03);
+ phy_write(phydev, 27, 0x8092);
+ phy_write(phydev, 28, 0x6000);
+ phy_write(phydev, 27, 0x80AF);
+ phy_write(phydev, 28, 0x6000);
+ phy_write(phydev, 27, 0x807D);
+ phy_write(phydev, 28, 0x4443);
+ phy_write(phydev, 27, 0x809A);
+ phy_write(phydev, 28, 0x4443);
+ phy_write(phydev, 27, 0x81A3);
+ phy_write(phydev, 28, 0x0F00);
+ phy_write(phydev, 31, 0x0a81);
+ phy_write(phydev, 18, 0x0004);
+ phy_write(phydev, 27, 0x83c8);
+ phy_write(phydev, 28, 0x0005);
+ phy_write(phydev, 31, 0x0a5c);
+ phy_write(phydev, 18, 0x0003);
+ phy_write(phydev, 27, 0xB820);
+ phy_write(phydev, 28, 0x0010);
+ phy_write(phydev, 27, 0xB830);
+ phy_write(phydev, 28, 0x8000);
- __phy_write(phydev, 27, 0xB800);
+ phy_write(phydev, 27, 0xB800);
do {
- reg_data = ((u16)__phy_read(phydev, 28) & 0x0040);
+ reg_data = ((u16)phy_read(phydev, 28) & 0x0040);
timer--;
if (timer == 0)
{
@@ -847,45 +847,45 @@
}
} while (reg_data != 0x0040);
- __phy_write(phydev, 27, 0x8020);
- __phy_write(phydev, 28, 0x3300);
- __phy_write(phydev, 27, 0xb82e);
- __phy_write(phydev, 28, 0x0001);
- __phy_write(phydev, 27, 0xb820);
- __phy_write(phydev, 28, 0x0290);
- __phy_write(phydev, 27, 0xa012);
- __phy_write(phydev, 28, 0x0000);
- __phy_write(phydev, 27, 0xa014);
- __phy_write(phydev, 28, 0x401c);
- __phy_write(phydev, 28, 0xa610);
- __phy_write(phydev, 28, 0x8520);
- __phy_write(phydev, 28, 0xa510);
- __phy_write(phydev, 28, 0x21f4);
- __phy_write(phydev, 27, 0xa01a);
- __phy_write(phydev, 28, 0x0000);
- __phy_write(phydev, 27, 0xa000);
- __phy_write(phydev, 28, 0x11ef);
- __phy_write(phydev, 27, 0xb820);
- __phy_write(phydev, 28, 0x0210);
- __phy_write(phydev, 27, 0xb82e);
- __phy_write(phydev, 28, 0x0000);
- __phy_write(phydev, 27, 0x8020);
- __phy_write(phydev, 28, 0x0000);
- __phy_write(phydev, 27, 0xb820);
- __phy_write(phydev, 28, 0x0000);
+ phy_write(phydev, 27, 0x8020);
+ phy_write(phydev, 28, 0x3300);
+ phy_write(phydev, 27, 0xb82e);
+ phy_write(phydev, 28, 0x0001);
+ phy_write(phydev, 27, 0xb820);
+ phy_write(phydev, 28, 0x0290);
+ phy_write(phydev, 27, 0xa012);
+ phy_write(phydev, 28, 0x0000);
+ phy_write(phydev, 27, 0xa014);
+ phy_write(phydev, 28, 0x401c);
+ phy_write(phydev, 28, 0xa610);
+ phy_write(phydev, 28, 0x8520);
+ phy_write(phydev, 28, 0xa510);
+ phy_write(phydev, 28, 0x21f4);
+ phy_write(phydev, 27, 0xa01a);
+ phy_write(phydev, 28, 0x0000);
+ phy_write(phydev, 27, 0xa000);
+ phy_write(phydev, 28, 0x11ef);
+ phy_write(phydev, 27, 0xb820);
+ phy_write(phydev, 28, 0x0210);
+ phy_write(phydev, 27, 0xb82e);
+ phy_write(phydev, 28, 0x0000);
+ phy_write(phydev, 27, 0x8020);
+ phy_write(phydev, 28, 0x0000);
+ phy_write(phydev, 27, 0xb820);
+ phy_write(phydev, 28, 0x0000);
- __phy_write(phydev, 27, 0xb800);
+ phy_write(phydev, 27, 0xb800);
timer = 2000; // set a 2ms timer
do {
- reg_data = ((u16)__phy_read(phydev, 28) & 0x0040);
+ reg_data = ((u16)phy_read(phydev, 28) & 0x0040);
timer--;
if (timer == 0) {
return -1;
}
} while (reg_data != 0x0000);
- __phy_write(phydev, 0, 0x2100); //power on
- __phy_write(phydev, 9, 0x0); //set slave mode
+ phy_write(phydev, 0, 0x2100); //power on
+ phy_write(phydev, 9, 0x0); //set slave mode
return 0;
}
@@ -904,12 +904,12 @@
reg_data_chk = param_check[i + 2];
if (page == 0) {
- __phy_write(phydev, 27, reg);
- reg_data = __phy_read(phydev, 28);
+ phy_write(phydev, 27, reg);
+ reg_data = phy_read(phydev, 28);
}
else {
- __phy_write(phydev, 31, page);
- reg_data = __phy_read(phydev, reg);
+ phy_write(phydev, 31, page);
+ reg_data = phy_read(phydev, reg);
}
if (reg_data_chk != reg_data) {
printk(KERN_ERR "%dth param error page=0x%04X reg=0x%04X data=0x%04X\r\n", i / 3, page, reg, reg_data);
@@ -917,34 +917,34 @@
}
}
- __phy_write(phydev, 27, 0xB820);
- __phy_write(phydev, 28, 0x0010);
- __phy_write(phydev, 27, 0xB830);
- __phy_write(phydev, 28, 0x8000);
+ phy_write(phydev, 27, 0xB820);
+ phy_write(phydev, 28, 0x0010);
+ phy_write(phydev, 27, 0xB830);
+ phy_write(phydev, 28, 0x8000);
- __phy_write(phydev, 27, 0xB800);
+ phy_write(phydev, 27, 0xB800);
do {
- reg_data = ((u16)__phy_read(phydev, 28) & 0x0040);
+ reg_data = ((u16)phy_read(phydev, 28) & 0x0040);
timer--;
if (timer == 0){
return -1;
}
} while (reg_data != 0x0040);
- __phy_write(phydev, 27, 0x8020);
- __phy_write(phydev, 28, 0x3300);
- __phy_write(phydev, 27, 0xB82E);
- __phy_write(phydev, 28, 0x0001);
+ phy_write(phydev, 27, 0x8020);
+ phy_write(phydev, 28, 0x3300);
+ phy_write(phydev, 27, 0xB82E);
+ phy_write(phydev, 28, 0x0001);
param_address = 0;
for (i = 0; i < 5; i++) {
- __phy_write(phydev, 31, 0xA01);
- reg_data_temp = __phy_read(phydev, 17);
+ phy_write(phydev, 31, 0xA01);
+ reg_data_temp = phy_read(phydev, 17);
reg_data_temp &= ~(0x1ff);
param_address &= 0x1FF;
- __phy_write(phydev, 17, (reg_data_temp | param_address));
- __phy_write(phydev, 31, 0xA01);
- reg_data = __phy_read(phydev, 18);
+ phy_write(phydev, 17, (reg_data_temp | param_address));
+ phy_write(phydev, 31, 0xA01);
+ reg_data = phy_read(phydev, 18);
reg_data_chk = param_check2[i];
if (reg_data_chk != reg_data){
printk(KERN_ERR "%dth param error data=0x%04X expected_data=0x%04X\r\n", i, reg_data, reg_data_chk);
@@ -958,29 +958,29 @@
reg_data_chk = param_check3[i + 2];
if (page == 0) {
- __phy_write(phydev, 27, reg);
- reg_data = __phy_read(phydev, 28);
+ phy_write(phydev, 27, reg);
+ reg_data = phy_read(phydev, 28);
}
else {
- __phy_write(phydev, 31, page);
- reg_data = __phy_read(phydev, reg);
+ phy_write(phydev, 31, page);
+ reg_data = phy_read(phydev, reg);
}
if (reg_data_chk != reg_data) {
printk(KERN_ERR "%dth param error page=0x%04X reg=0x%04X data=0x%04X\r\n", i / 3, page, reg, reg_data);
return -1;
}
}
- __phy_write(phydev, 27, 0xB82E);
- __phy_write(phydev, 28, 0x0000);
- __phy_write(phydev, 27, 0x8020);
- __phy_write(phydev, 28, 0x0000);
- __phy_write(phydev, 27, 0xB820);
- __phy_write(phydev, 28, 0x0000);
+ phy_write(phydev, 27, 0xB82E);
+ phy_write(phydev, 28, 0x0000);
+ phy_write(phydev, 27, 0x8020);
+ phy_write(phydev, 28, 0x0000);
+ phy_write(phydev, 27, 0xB820);
+ phy_write(phydev, 28, 0x0000);
- __phy_write(phydev, 27, 0xB800);
+ phy_write(phydev, 27, 0xB800);
timer = 2000; // set a 2ms timer
do {
- reg_data = ((u16)__phy_read(phydev, 28) & 0x0040);
+ reg_data = ((u16)phy_read(phydev, 28) & 0x0040);
timer--;
if (timer == 0){
return -1;
@@ -995,7 +995,7 @@
{
int ret;
ret = gpio_direction_output(gpio, power_en);
- mdelay(30);
+ mdelay(10);
return ret;
}
@@ -1105,11 +1105,11 @@
/* I/O Power Sllection */
//change page to default value
- __phy_write(phydev, 0x1F, 0x0A4C);
- mdio_data = __phy_read(phydev, 0x12);
+ phy_write(phydev, 0x1F, 0x0A4C);
+ mdio_data = phy_read(phydev, 0x12);
mdio_data &= 0xC7FF;
mdio_data |= 4 << 11;
- __phy_write(phydev, 0x12, mdio_data);
+ phy_write(phydev, 0x12, mdio_data);
printk(KERN_INFO "phy_info: set rgmii driving strengths is 1.8v \n");
phydev->autoneg = AUTONEG_DISABLE;