UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'MV88E6390-fixes' 

Andrew Lunn says:

====================
MV88E6390 fixes

Two patches, which have been posted before. Fix simple issues in the
mv88e6390 support. These don't need to go to stable, since the
mv88e6390 support in stable is insufficient to be usable.

To apply cleanly, these patches rely on "net: dsa: mv88e6xxx:
Workaround missing PHY".

v2: Added Reviewed-by.
    Removed a redundant "the"
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2017-02-02 22:06:45 -05:00
parent 60f06fde4c 740117a8e2
commit bdcfa15603
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/dsa/mv88e6xxx/chip.c
View File

@ -4011,7 +4011,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.port_base_addr = 0x0, .port_base_addr = 0x0,
.global1_addr = 0x1b, .global1_addr = 0x1b,
.tag_protocol = DSA_TAG_PROTO_DSA, .tag_protocol = DSA_TAG_PROTO_DSA,
.age_time_coeff = 15000, .age_time_coeff = 3750,
.g1_irqs = 9, .g1_irqs = 9,
.flags = MV88E6XXX_FLAGS_FAMILY_6390, .flags = MV88E6XXX_FLAGS_FAMILY_6390,
.ops = &mv88e6190_ops, .ops = &mv88e6190_ops,
@ -4025,7 +4025,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.num_ports = 11, /* 10 + Z80 */ .num_ports = 11, /* 10 + Z80 */
.port_base_addr = 0x0, .port_base_addr = 0x0,
.global1_addr = 0x1b, .global1_addr = 0x1b,
.age_time_coeff = 15000, .age_time_coeff = 3750,
.g1_irqs = 9, .g1_irqs = 9,
.tag_protocol = DSA_TAG_PROTO_DSA, .tag_protocol = DSA_TAG_PROTO_DSA,
.flags = MV88E6XXX_FLAGS_FAMILY_6390, .flags = MV88E6XXX_FLAGS_FAMILY_6390,
@ -4040,7 +4040,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.num_ports = 11, /* 10 + Z80 */ .num_ports = 11, /* 10 + Z80 */
.port_base_addr = 0x0, .port_base_addr = 0x0,
.global1_addr = 0x1b, .global1_addr = 0x1b,
.age_time_coeff = 15000, .age_time_coeff = 3750,
.g1_irqs = 9, .g1_irqs = 9,
.tag_protocol = DSA_TAG_PROTO_DSA, .tag_protocol = DSA_TAG_PROTO_DSA,
.flags = MV88E6XXX_FLAGS_FAMILY_6390, .flags = MV88E6XXX_FLAGS_FAMILY_6390,
@ -4070,7 +4070,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.num_ports = 11, /* 10 + Z80 */ .num_ports = 11, /* 10 + Z80 */
.port_base_addr = 0x0, .port_base_addr = 0x0,
.global1_addr = 0x1b, .global1_addr = 0x1b,
.age_time_coeff = 15000, .age_time_coeff = 3750,
.g1_irqs = 9, .g1_irqs = 9,
.tag_protocol = DSA_TAG_PROTO_DSA, .tag_protocol = DSA_TAG_PROTO_DSA,
.flags = MV88E6XXX_FLAGS_FAMILY_6390, .flags = MV88E6XXX_FLAGS_FAMILY_6390,
@ -4187,7 +4187,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.num_ports = 11, /* 10 + Z80 */ .num_ports = 11, /* 10 + Z80 */
.port_base_addr = 0x0, .port_base_addr = 0x0,
.global1_addr = 0x1b, .global1_addr = 0x1b,
.age_time_coeff = 15000, .age_time_coeff = 3750,
.g1_irqs = 9, .g1_irqs = 9,
.tag_protocol = DSA_TAG_PROTO_DSA, .tag_protocol = DSA_TAG_PROTO_DSA,
.flags = MV88E6XXX_FLAGS_FAMILY_6390, .flags = MV88E6XXX_FLAGS_FAMILY_6390,
@ -4201,7 +4201,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.num_ports = 11, /* 10 + Z80 */ .num_ports = 11, /* 10 + Z80 */
.port_base_addr = 0x0, .port_base_addr = 0x0,
.global1_addr = 0x1b, .global1_addr = 0x1b,
.age_time_coeff = 15000, .age_time_coeff = 3750,
.g1_irqs = 9, .g1_irqs = 9,
.tag_protocol = DSA_TAG_PROTO_DSA, .tag_protocol = DSA_TAG_PROTO_DSA,
.flags = MV88E6XXX_FLAGS_FAMILY_6390, .flags = MV88E6XXX_FLAGS_FAMILY_6390,

2
drivers/net/dsa/mv88e6xxx/port.c
View File

@ -193,7 +193,7 @@ static int mv88e6xxx_port_set_speed(struct mv88e6xxx_chip *chip, int port,
ctrl = PORT_PCS_CTRL_SPEED_1000; ctrl = PORT_PCS_CTRL_SPEED_1000;
break; break;
case 2500: case 2500:
ctrl = PORT_PCS_CTRL_SPEED_1000 | PORT_PCS_CTRL_ALTSPEED; ctrl = PORT_PCS_CTRL_SPEED_10000 | PORT_PCS_CTRL_ALTSPEED;
break; break;
case 10000: case 10000:
/* all bits set, fall through... */ /* all bits set, fall through... */