Inter-revision diff: patch 4

Comparing v3 (message) to v2 (message)

--- v3
+++ v2
@@ -6,14 +6,14 @@
 
 Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
 ---
- drivers/net/dsa/mv88e6xxx/chip.c      | 76 ++++++++---------------------------
- drivers/net/dsa/mv88e6xxx/global1.c   | 57 ++++++++++++++++++++++++++
+ drivers/net/dsa/mv88e6xxx/chip.c      | 78 +++++++++--------------------------
+ drivers/net/dsa/mv88e6xxx/global1.c   | 57 +++++++++++++++++++++++++
  drivers/net/dsa/mv88e6xxx/global1.h   |  3 ++
  drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 19 ++-------
- 4 files changed, 81 insertions(+), 74 deletions(-)
+ 4 files changed, 83 insertions(+), 74 deletions(-)
 
 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index 5aae5d7..731d262 100644
+index a2fcbcc..8191070 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
 @@ -527,58 +527,18 @@ int mv88e6xxx_update(struct mv88e6xxx_chip *chip, int addr, int reg, u16 update)
@@ -123,7 +123,7 @@
  	.reset = mv88e6185_g1_reset,
  };
  
-@@ -3311,6 +3265,8 @@ static const struct mv88e6xxx_ops mv88e6131_ops = {
+@@ -3266,6 +3220,8 @@ static const struct mv88e6xxx_ops mv88e6097_ops = {
  	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,
  	.g1_set_egress_port = mv88e6095_g1_set_egress_port,
  	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,
@@ -132,7 +132,7 @@
  	.reset = mv88e6185_g1_reset,
  };
  
-@@ -3483,6 +3439,8 @@ static const struct mv88e6xxx_ops mv88e6185_ops = {
+@@ -3311,6 +3267,8 @@ static const struct mv88e6xxx_ops mv88e6131_ops = {
  	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,
  	.g1_set_egress_port = mv88e6095_g1_set_egress_port,
  	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,
@@ -141,7 +141,16 @@
  	.reset = mv88e6185_g1_reset,
  };
  
-@@ -4262,13 +4220,13 @@ static struct mv88e6xxx_chip *mv88e6xxx_alloc_chip(struct device *dev)
+@@ -3483,6 +3441,8 @@ static const struct mv88e6xxx_ops mv88e6185_ops = {
+ 	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,
+ 	.g1_set_egress_port = mv88e6095_g1_set_egress_port,
+ 	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,
++	.ppu_enable = mv88e6185_g1_ppu_enable,
++	.ppu_disable = mv88e6185_g1_ppu_disable,
+ 	.reset = mv88e6185_g1_reset,
+ };
+ 
+@@ -4262,13 +4222,13 @@ static struct mv88e6xxx_chip *mv88e6xxx_alloc_chip(struct device *dev)
  
  static void mv88e6xxx_phy_init(struct mv88e6xxx_chip *chip)
  {
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help