Commit bdcfa156 authored by David S. Miller's avatar David S. Miller

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 60f06fde 740117a8
...@@ -4011,7 +4011,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -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[] = { ...@@ -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[] = { ...@@ -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[] = { ...@@ -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[] = { ...@@ -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[] = { ...@@ -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,
......
...@@ -193,7 +193,7 @@ static int mv88e6xxx_port_set_speed(struct mv88e6xxx_chip *chip, int port, ...@@ -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... */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment