| Message ID | 20190823212603.13456-4-marek.behun@nic.cz |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: dsa: mv88e6xxx: Peridot/Topaz SERDES changes | expand |
Hi Marek, On Fri, 23 Aug 2019 23:25:57 +0200, Marek Behún <marek.behun@nic.cz> wrote: > /* Offset 0x1a: Magic undocumented errata register */ /* Offset 0x1A: Reserved */ (nitpicking here, for consistency this other definitions as shown in docs.) > -#define PORT_RESERVED_1A 0x1a > -#define PORT_RESERVED_1A_BUSY BIT(15) > -#define PORT_RESERVED_1A_WRITE BIT(14) > -#define PORT_RESERVED_1A_READ 0 > -#define PORT_RESERVED_1A_PORT_SHIFT 5 > -#define PORT_RESERVED_1A_BLOCK (0xf << 10) > -#define PORT_RESERVED_1A_CTRL_PORT 4 > -#define PORT_RESERVED_1A_DATA_PORT 5 > +#define MV88E6XXX_PORT_RESERVED_1A 0x1a > +#define MV88E6XXX_PORT_RESERVED_1A_BUSY 0x8000 > +#define MV88E6XXX_PORT_RESERVED_1A_WRITE 0x4000 > +#define MV88E6XXX_PORT_RESERVED_1A_READ 0x0000 > +#define MV88E6XXX_PORT_RESERVED_1A_PORT_SHIFT 5 > +#define MV88E6XXX_PORT_RESERVED_1A_BLOCK 0x3c00 > +#define MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT 0x04 > +#define MV88E6XXX_PORT_RESERVED_1A_DATA_PORT 0x05 You are already using these macros in the previous patch. I guess you meant to introduce this patch before. But since you are moving and renaming the same code without functional changes, you may squash them together. Thanks, Vivien
On Sat, 24 Aug 2019 15:32:54 -0400 Vivien Didelot <vivien.didelot@gmail.com> wrote: > You are already using these macros in the previous patch. I guess you meant > to introduce this patch before. But since you are moving and renaming the > same code without functional changes, you may squash them together. Hm, you are right, I accidently created a commit which would not build. :( I thought that I tried to build after each commit, but it seems I forgot at least one.
diff --git a/drivers/net/dsa/mv88e6xxx/port.h b/drivers/net/dsa/mv88e6xxx/port.h index 2b251ba30e52..58aecf5a7cb4 100644 --- a/drivers/net/dsa/mv88e6xxx/port.h +++ b/drivers/net/dsa/mv88e6xxx/port.h @@ -261,14 +261,14 @@ #define MV88E6095_PORT_IEEE_PRIO_REMAP_4567 0x19 /* Offset 0x1a: Magic undocumented errata register */ -#define PORT_RESERVED_1A 0x1a -#define PORT_RESERVED_1A_BUSY BIT(15) -#define PORT_RESERVED_1A_WRITE BIT(14) -#define PORT_RESERVED_1A_READ 0 -#define PORT_RESERVED_1A_PORT_SHIFT 5 -#define PORT_RESERVED_1A_BLOCK (0xf << 10) -#define PORT_RESERVED_1A_CTRL_PORT 4 -#define PORT_RESERVED_1A_DATA_PORT 5 +#define MV88E6XXX_PORT_RESERVED_1A 0x1a +#define MV88E6XXX_PORT_RESERVED_1A_BUSY 0x8000 +#define MV88E6XXX_PORT_RESERVED_1A_WRITE 0x4000 +#define MV88E6XXX_PORT_RESERVED_1A_READ 0x0000 +#define MV88E6XXX_PORT_RESERVED_1A_PORT_SHIFT 5 +#define MV88E6XXX_PORT_RESERVED_1A_BLOCK 0x3c00 +#define MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT 0x04 +#define MV88E6XXX_PORT_RESERVED_1A_DATA_PORT 0x05 int mv88e6xxx_port_read(struct mv88e6xxx_chip *chip, int port, int reg, u16 *val);