for (port = 0; port < num_phys_ports; port++) {
                struct ocelot_port *ocelot_port;
-               void __iomem *port_regs;
+               struct regmap *target;
 
                ocelot_port = devm_kzalloc(ocelot->dev,
                                           sizeof(struct ocelot_port),
                res.start += switch_base;
                res.end += switch_base;
 
-               port_regs = devm_ioremap_resource(ocelot->dev, &res);
-               if (IS_ERR(port_regs)) {
+               target = ocelot_regmap_init(ocelot, &res);
+               if (IS_ERR(target)) {
                        dev_err(ocelot->dev,
-                               "failed to map registers for port %d\n", port);
+                               "Failed to map memory space for port %d\n",
+                               port);
                        kfree(port_phy_modes);
-                       return PTR_ERR(port_regs);
+                       return PTR_ERR(target);
                }
 
                ocelot_port->phy_mode = port_phy_modes[port];
                ocelot_port->ocelot = ocelot;
-               ocelot_port->regs = port_regs;
+               ocelot_port->target = target;
                ocelot->ports[port] = ocelot_port;
        }
 
 
        REG(GCB_SOFT_RST,                       0x000004),
 };
 
-static const u32 *vsc9959_regmap[] = {
+static const u32 vsc9959_dev_gmii_regmap[] = {
+       REG(DEV_CLOCK_CFG,                      0x0),
+       REG(DEV_PORT_MISC,                      0x4),
+       REG(DEV_EVENTS,                         0x8),
+       REG(DEV_EEE_CFG,                        0xc),
+       REG(DEV_RX_PATH_DELAY,                  0x10),
+       REG(DEV_TX_PATH_DELAY,                  0x14),
+       REG(DEV_PTP_PREDICT_CFG,                0x18),
+       REG(DEV_MAC_ENA_CFG,                    0x1c),
+       REG(DEV_MAC_MODE_CFG,                   0x20),
+       REG(DEV_MAC_MAXLEN_CFG,                 0x24),
+       REG(DEV_MAC_TAGS_CFG,                   0x28),
+       REG(DEV_MAC_ADV_CHK_CFG,                0x2c),
+       REG(DEV_MAC_IFG_CFG,                    0x30),
+       REG(DEV_MAC_HDX_CFG,                    0x34),
+       REG(DEV_MAC_DBG_CFG,                    0x38),
+       REG(DEV_MAC_FC_MAC_LOW_CFG,             0x3c),
+       REG(DEV_MAC_FC_MAC_HIGH_CFG,            0x40),
+       REG(DEV_MAC_STICKY,                     0x44),
+       REG_RESERVED(PCS1G_CFG),
+       REG_RESERVED(PCS1G_MODE_CFG),
+       REG_RESERVED(PCS1G_SD_CFG),
+       REG_RESERVED(PCS1G_ANEG_CFG),
+       REG_RESERVED(PCS1G_ANEG_NP_CFG),
+       REG_RESERVED(PCS1G_LB_CFG),
+       REG_RESERVED(PCS1G_DBG_CFG),
+       REG_RESERVED(PCS1G_CDET_CFG),
+       REG_RESERVED(PCS1G_ANEG_STATUS),
+       REG_RESERVED(PCS1G_ANEG_NP_STATUS),
+       REG_RESERVED(PCS1G_LINK_STATUS),
+       REG_RESERVED(PCS1G_LINK_DOWN_CNT),
+       REG_RESERVED(PCS1G_STICKY),
+       REG_RESERVED(PCS1G_DEBUG_STATUS),
+       REG_RESERVED(PCS1G_LPI_CFG),
+       REG_RESERVED(PCS1G_LPI_WAKE_ERROR_CNT),
+       REG_RESERVED(PCS1G_LPI_STATUS),
+       REG_RESERVED(PCS1G_TSTPAT_MODE_CFG),
+       REG_RESERVED(PCS1G_TSTPAT_STATUS),
+       REG_RESERVED(DEV_PCS_FX100_CFG),
+       REG_RESERVED(DEV_PCS_FX100_STATUS),
+};
+
+static const u32 *vsc9959_regmap[TARGET_MAX] = {
        [ANA]   = vsc9959_ana_regmap,
        [QS]    = vsc9959_qs_regmap,
        [QSYS]  = vsc9959_qsys_regmap,
        [S2]    = vsc9959_s2_regmap,
        [PTP]   = vsc9959_ptp_regmap,
        [GCB]   = vsc9959_gcb_regmap,
+       [DEV_GMII] = vsc9959_dev_gmii_regmap,
 };
 
 /* Addresses are relative to the PCI device's base address */
-static const struct resource vsc9959_target_io_res[] = {
+static const struct resource vsc9959_target_io_res[TARGET_MAX] = {
        [ANA] = {
                .start  = 0x0280000,
                .end    = 0x028ffff,
 
 #define ocelot_field_write(ocelot, reg, val) regmap_field_write((ocelot)->regfields[(reg)], (val))
 #define ocelot_field_read(ocelot, reg, val) regmap_field_read((ocelot)->regfields[(reg)], (val))
 
-int ocelot_probe_port(struct ocelot *ocelot, u8 port,
-                     void __iomem *regs,
+int ocelot_probe_port(struct ocelot *ocelot, int port, struct regmap *target,
                      struct phy_device *phy);
 
 void ocelot_set_cpu_port(struct ocelot *ocelot, int cpu,
 
 
 u32 ocelot_port_readl(struct ocelot_port *port, u32 reg)
 {
-       return readl(port->regs + reg);
+       struct ocelot *ocelot = port->ocelot;
+       u16 target = reg >> TARGET_OFFSET;
+       u32 val;
+
+       WARN_ON(!target);
+
+       regmap_read(port->target, ocelot->map[target][reg & REG_MASK], &val);
+       return val;
 }
 EXPORT_SYMBOL(ocelot_port_readl);
 
 void ocelot_port_writel(struct ocelot_port *port, u32 val, u32 reg)
 {
-       writel(val, port->regs + reg);
+       struct ocelot *ocelot = port->ocelot;
+       u16 target = reg >> TARGET_OFFSET;
+
+       WARN_ON(!target);
+
+       regmap_write(port->target, ocelot->map[target][reg & REG_MASK], val);
 }
 EXPORT_SYMBOL(ocelot_port_writel);
 
 
        .notifier_call = ocelot_switchdev_blocking_event,
 };
 
-int ocelot_probe_port(struct ocelot *ocelot, u8 port,
-                     void __iomem *regs,
+int ocelot_probe_port(struct ocelot *ocelot, int port, struct regmap *target,
                      struct phy_device *phy)
 {
        struct ocelot_port_private *priv;
        priv->chip_port = port;
        ocelot_port = &priv->port;
        ocelot_port->ocelot = ocelot;
-       ocelot_port->regs = regs;
+       ocelot_port->target = target;
        ocelot->ports[port] = ocelot_port;
 
        dev->netdev_ops = &ocelot_port_netdev_ops;
 
        REG(PTP_CLK_CFG_ADJ_FREQ,                       0x0000a8),
 };
 
-static const u32 *ocelot_regmap[] = {
+static const u32 ocelot_dev_gmii_regmap[] = {
+       REG(DEV_CLOCK_CFG,                              0x0),
+       REG(DEV_PORT_MISC,                              0x4),
+       REG(DEV_EVENTS,                                 0x8),
+       REG(DEV_EEE_CFG,                                0xc),
+       REG(DEV_RX_PATH_DELAY,                          0x10),
+       REG(DEV_TX_PATH_DELAY,                          0x14),
+       REG(DEV_PTP_PREDICT_CFG,                        0x18),
+       REG(DEV_MAC_ENA_CFG,                            0x1c),
+       REG(DEV_MAC_MODE_CFG,                           0x20),
+       REG(DEV_MAC_MAXLEN_CFG,                         0x24),
+       REG(DEV_MAC_TAGS_CFG,                           0x28),
+       REG(DEV_MAC_ADV_CHK_CFG,                        0x2c),
+       REG(DEV_MAC_IFG_CFG,                            0x30),
+       REG(DEV_MAC_HDX_CFG,                            0x34),
+       REG(DEV_MAC_DBG_CFG,                            0x38),
+       REG(DEV_MAC_FC_MAC_LOW_CFG,                     0x3c),
+       REG(DEV_MAC_FC_MAC_HIGH_CFG,                    0x40),
+       REG(DEV_MAC_STICKY,                             0x44),
+       REG(PCS1G_CFG,                                  0x48),
+       REG(PCS1G_MODE_CFG,                             0x4c),
+       REG(PCS1G_SD_CFG,                               0x50),
+       REG(PCS1G_ANEG_CFG,                             0x54),
+       REG(PCS1G_ANEG_NP_CFG,                          0x58),
+       REG(PCS1G_LB_CFG,                               0x5c),
+       REG(PCS1G_DBG_CFG,                              0x60),
+       REG(PCS1G_CDET_CFG,                             0x64),
+       REG(PCS1G_ANEG_STATUS,                          0x68),
+       REG(PCS1G_ANEG_NP_STATUS,                       0x6c),
+       REG(PCS1G_LINK_STATUS,                          0x70),
+       REG(PCS1G_LINK_DOWN_CNT,                        0x74),
+       REG(PCS1G_STICKY,                               0x78),
+       REG(PCS1G_DEBUG_STATUS,                         0x7c),
+       REG(PCS1G_LPI_CFG,                              0x80),
+       REG(PCS1G_LPI_WAKE_ERROR_CNT,                   0x84),
+       REG(PCS1G_LPI_STATUS,                           0x88),
+       REG(PCS1G_TSTPAT_MODE_CFG,                      0x8c),
+       REG(PCS1G_TSTPAT_STATUS,                        0x90),
+       REG(DEV_PCS_FX100_CFG,                          0x94),
+       REG(DEV_PCS_FX100_STATUS,                       0x98),
+};
+
+static const u32 *ocelot_regmap[TARGET_MAX] = {
        [ANA] = ocelot_ana_regmap,
        [QS] = ocelot_qs_regmap,
        [QSYS] = ocelot_qsys_regmap,
        [SYS] = ocelot_sys_regmap,
        [S2] = ocelot_s2_regmap,
        [PTP] = ocelot_ptp_regmap,
+       [DEV_GMII] = ocelot_dev_gmii_regmap,
 };
 
 static const struct reg_field ocelot_regfields[] = {
                struct device_node *phy_node;
                phy_interface_t phy_mode;
                struct phy_device *phy;
+               struct regmap *target;
                struct resource *res;
                struct phy *serdes;
-               void __iomem *regs;
                char res_name[8];
                u32 port;
 
 
                res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
                                                   res_name);
-               regs = devm_ioremap_resource(&pdev->dev, res);
-               if (IS_ERR(regs))
+               target = ocelot_regmap_init(ocelot, res);
+               if (IS_ERR(target))
                        continue;
 
                phy_node = of_parse_phandle(portnp, "phy-handle", 0);
                if (!phy)
                        continue;
 
-               err = ocelot_probe_port(ocelot, port, regs, phy);
+               err = ocelot_probe_port(ocelot, port, target, phy);
                if (err) {
                        of_node_put(portnp);
                        goto out_put_ports;
 
        HSIO,
        PTP,
        GCB,
+       DEV_GMII,
        TARGET_MAX,
 };
 
        PTP_CLK_CFG_ADJ_CFG,
        PTP_CLK_CFG_ADJ_FREQ,
        GCB_SOFT_RST = GCB << TARGET_OFFSET,
+       DEV_CLOCK_CFG = DEV_GMII << TARGET_OFFSET,
+       DEV_PORT_MISC,
+       DEV_EVENTS,
+       DEV_EEE_CFG,
+       DEV_RX_PATH_DELAY,
+       DEV_TX_PATH_DELAY,
+       DEV_PTP_PREDICT_CFG,
+       DEV_MAC_ENA_CFG,
+       DEV_MAC_MODE_CFG,
+       DEV_MAC_MAXLEN_CFG,
+       DEV_MAC_TAGS_CFG,
+       DEV_MAC_ADV_CHK_CFG,
+       DEV_MAC_IFG_CFG,
+       DEV_MAC_HDX_CFG,
+       DEV_MAC_DBG_CFG,
+       DEV_MAC_FC_MAC_LOW_CFG,
+       DEV_MAC_FC_MAC_HIGH_CFG,
+       DEV_MAC_STICKY,
+       PCS1G_CFG,
+       PCS1G_MODE_CFG,
+       PCS1G_SD_CFG,
+       PCS1G_ANEG_CFG,
+       PCS1G_ANEG_NP_CFG,
+       PCS1G_LB_CFG,
+       PCS1G_DBG_CFG,
+       PCS1G_CDET_CFG,
+       PCS1G_ANEG_STATUS,
+       PCS1G_ANEG_NP_STATUS,
+       PCS1G_LINK_STATUS,
+       PCS1G_LINK_DOWN_CNT,
+       PCS1G_STICKY,
+       PCS1G_DEBUG_STATUS,
+       PCS1G_LPI_CFG,
+       PCS1G_LPI_WAKE_ERROR_CNT,
+       PCS1G_LPI_STATUS,
+       PCS1G_TSTPAT_MODE_CFG,
+       PCS1G_TSTPAT_STATUS,
+       DEV_PCS_FX100_CFG,
+       DEV_PCS_FX100_STATUS,
 };
 
 enum ocelot_regfield {
 struct ocelot_port {
        struct ocelot                   *ocelot;
 
-       void __iomem                    *regs;
+       struct regmap                   *target;
 
        bool                            vlan_aware;
 
 
 #ifndef _MSCC_OCELOT_DEV_H_
 #define _MSCC_OCELOT_DEV_H_
 
-#define DEV_CLOCK_CFG                                     0x0
-
 #define DEV_CLOCK_CFG_MAC_TX_RST                          BIT(7)
 #define DEV_CLOCK_CFG_MAC_RX_RST                          BIT(6)
 #define DEV_CLOCK_CFG_PCS_TX_RST                          BIT(5)
 #define DEV_CLOCK_CFG_LINK_SPEED(x)                       ((x) & GENMASK(1, 0))
 #define DEV_CLOCK_CFG_LINK_SPEED_M                        GENMASK(1, 0)
 
-#define DEV_PORT_MISC                                     0x4
-
 #define DEV_PORT_MISC_FWD_ERROR_ENA                       BIT(4)
 #define DEV_PORT_MISC_FWD_PAUSE_ENA                       BIT(3)
 #define DEV_PORT_MISC_FWD_CTRL_ENA                        BIT(2)
 #define DEV_PORT_MISC_DEV_LOOP_ENA                        BIT(1)
 #define DEV_PORT_MISC_HDX_FAST_DIS                        BIT(0)
 
-#define DEV_EVENTS                                        0x8
-
-#define DEV_EEE_CFG                                       0xc
-
 #define DEV_EEE_CFG_EEE_ENA                               BIT(22)
 #define DEV_EEE_CFG_EEE_TIMER_AGE(x)                      (((x) << 15) & GENMASK(21, 15))
 #define DEV_EEE_CFG_EEE_TIMER_AGE_M                       GENMASK(21, 15)
 #define DEV_EEE_CFG_EEE_TIMER_HOLDOFF_X(x)                (((x) & GENMASK(7, 1)) >> 1)
 #define DEV_EEE_CFG_PORT_LPI                              BIT(0)
 
-#define DEV_RX_PATH_DELAY                                 0x10
-
-#define DEV_TX_PATH_DELAY                                 0x14
-
-#define DEV_PTP_PREDICT_CFG                               0x18
-
 #define DEV_PTP_PREDICT_CFG_PTP_PHY_PREDICT_CFG(x)        (((x) << 4) & GENMASK(11, 4))
 #define DEV_PTP_PREDICT_CFG_PTP_PHY_PREDICT_CFG_M         GENMASK(11, 4)
 #define DEV_PTP_PREDICT_CFG_PTP_PHY_PREDICT_CFG_X(x)      (((x) & GENMASK(11, 4)) >> 4)
 #define DEV_PTP_PREDICT_CFG_PTP_PHASE_PREDICT_CFG(x)      ((x) & GENMASK(3, 0))
 #define DEV_PTP_PREDICT_CFG_PTP_PHASE_PREDICT_CFG_M       GENMASK(3, 0)
 
-#define DEV_MAC_ENA_CFG                                   0x1c
-
 #define DEV_MAC_ENA_CFG_RX_ENA                            BIT(4)
 #define DEV_MAC_ENA_CFG_TX_ENA                            BIT(0)
 
-#define DEV_MAC_MODE_CFG                                  0x20
-
 #define DEV_MAC_MODE_CFG_FC_WORD_SYNC_ENA                 BIT(8)
 #define DEV_MAC_MODE_CFG_GIGA_MODE_ENA                    BIT(4)
 #define DEV_MAC_MODE_CFG_FDX_ENA                          BIT(0)
 
-#define DEV_MAC_MAXLEN_CFG                                0x24
-
-#define DEV_MAC_TAGS_CFG                                  0x28
-
 #define DEV_MAC_TAGS_CFG_TAG_ID(x)                        (((x) << 16) & GENMASK(31, 16))
 #define DEV_MAC_TAGS_CFG_TAG_ID_M                         GENMASK(31, 16)
 #define DEV_MAC_TAGS_CFG_TAG_ID_X(x)                      (((x) & GENMASK(31, 16)) >> 16)
 #define DEV_MAC_TAGS_CFG_VLAN_DBL_AWR_ENA                 BIT(1)
 #define DEV_MAC_TAGS_CFG_VLAN_AWR_ENA                     BIT(0)
 
-#define DEV_MAC_ADV_CHK_CFG                               0x2c
-
 #define DEV_MAC_ADV_CHK_CFG_LEN_DROP_ENA                  BIT(0)
 
-#define DEV_MAC_IFG_CFG                                   0x30
-
 #define DEV_MAC_IFG_CFG_RESTORE_OLD_IPG_CHECK             BIT(17)
 #define DEV_MAC_IFG_CFG_REDUCED_TX_IFG                    BIT(16)
 #define DEV_MAC_IFG_CFG_TX_IFG(x)                         (((x) << 8) & GENMASK(12, 8))
 #define DEV_MAC_IFG_CFG_RX_IFG1(x)                        ((x) & GENMASK(3, 0))
 #define DEV_MAC_IFG_CFG_RX_IFG1_M                         GENMASK(3, 0)
 
-#define DEV_MAC_HDX_CFG                                   0x34
-
 #define DEV_MAC_HDX_CFG_BYPASS_COL_SYNC                   BIT(26)
 #define DEV_MAC_HDX_CFG_OB_ENA                            BIT(25)
 #define DEV_MAC_HDX_CFG_WEXC_DIS                          BIT(24)
 #define DEV_MAC_HDX_CFG_LATE_COL_POS(x)                   ((x) & GENMASK(6, 0))
 #define DEV_MAC_HDX_CFG_LATE_COL_POS_M                    GENMASK(6, 0)
 
-#define DEV_MAC_DBG_CFG                                   0x38
-
 #define DEV_MAC_DBG_CFG_TBI_MODE                          BIT(4)
 #define DEV_MAC_DBG_CFG_IFG_CRS_EXT_CHK_ENA               BIT(0)
 
-#define DEV_MAC_FC_MAC_LOW_CFG                            0x3c
-
-#define DEV_MAC_FC_MAC_HIGH_CFG                           0x40
-
-#define DEV_MAC_STICKY                                    0x44
-
 #define DEV_MAC_STICKY_RX_IPG_SHRINK_STICKY               BIT(9)
 #define DEV_MAC_STICKY_RX_PREAM_SHRINK_STICKY             BIT(8)
 #define DEV_MAC_STICKY_RX_CARRIER_EXT_STICKY              BIT(7)
 #define DEV_MAC_STICKY_TX_FRM_LEN_OVR_STICKY              BIT(1)
 #define DEV_MAC_STICKY_TX_ABORT_STICKY                    BIT(0)
 
-#define PCS1G_CFG                                         0x48
-
 #define PCS1G_CFG_LINK_STATUS_TYPE                        BIT(4)
 #define PCS1G_CFG_AN_LINK_CTRL_ENA                        BIT(1)
 #define PCS1G_CFG_PCS_ENA                                 BIT(0)
 
-#define PCS1G_MODE_CFG                                    0x4c
-
 #define PCS1G_MODE_CFG_UNIDIR_MODE_ENA                    BIT(4)
 #define PCS1G_MODE_CFG_SGMII_MODE_ENA                     BIT(0)
 
-#define PCS1G_SD_CFG                                      0x50
-
 #define PCS1G_SD_CFG_SD_SEL                               BIT(8)
 #define PCS1G_SD_CFG_SD_POL                               BIT(4)
 #define PCS1G_SD_CFG_SD_ENA                               BIT(0)
 
-#define PCS1G_ANEG_CFG                                    0x54
-
 #define PCS1G_ANEG_CFG_ADV_ABILITY(x)                     (((x) << 16) & GENMASK(31, 16))
 #define PCS1G_ANEG_CFG_ADV_ABILITY_M                      GENMASK(31, 16)
 #define PCS1G_ANEG_CFG_ADV_ABILITY_X(x)                   (((x) & GENMASK(31, 16)) >> 16)
 #define PCS1G_ANEG_CFG_ANEG_RESTART_ONE_SHOT              BIT(1)
 #define PCS1G_ANEG_CFG_ANEG_ENA                           BIT(0)
 
-#define PCS1G_ANEG_NP_CFG                                 0x58
-
 #define PCS1G_ANEG_NP_CFG_NP_TX(x)                        (((x) << 16) & GENMASK(31, 16))
 #define PCS1G_ANEG_NP_CFG_NP_TX_M                         GENMASK(31, 16)
 #define PCS1G_ANEG_NP_CFG_NP_TX_X(x)                      (((x) & GENMASK(31, 16)) >> 16)
 #define PCS1G_ANEG_NP_CFG_NP_LOADED_ONE_SHOT              BIT(0)
 
-#define PCS1G_LB_CFG                                      0x5c
-
 #define PCS1G_LB_CFG_RA_ENA                               BIT(4)
 #define PCS1G_LB_CFG_GMII_PHY_LB_ENA                      BIT(1)
 #define PCS1G_LB_CFG_TBI_HOST_LB_ENA                      BIT(0)
 
-#define PCS1G_DBG_CFG                                     0x60
-
 #define PCS1G_DBG_CFG_UDLT                                BIT(0)
 
-#define PCS1G_CDET_CFG                                    0x64
-
 #define PCS1G_CDET_CFG_CDET_ENA                           BIT(0)
 
-#define PCS1G_ANEG_STATUS                                 0x68
-
 #define PCS1G_ANEG_STATUS_LP_ADV_ABILITY(x)               (((x) << 16) & GENMASK(31, 16))
 #define PCS1G_ANEG_STATUS_LP_ADV_ABILITY_M                GENMASK(31, 16)
 #define PCS1G_ANEG_STATUS_LP_ADV_ABILITY_X(x)             (((x) & GENMASK(31, 16)) >> 16)
 #define PCS1G_ANEG_STATUS_PAGE_RX_STICKY                  BIT(3)
 #define PCS1G_ANEG_STATUS_ANEG_COMPLETE                   BIT(0)
 
-#define PCS1G_ANEG_NP_STATUS                              0x6c
-
-#define PCS1G_LINK_STATUS                                 0x70
-
 #define PCS1G_LINK_STATUS_DELAY_VAR(x)                    (((x) << 12) & GENMASK(15, 12))
 #define PCS1G_LINK_STATUS_DELAY_VAR_M                     GENMASK(15, 12)
 #define PCS1G_LINK_STATUS_DELAY_VAR_X(x)                  (((x) & GENMASK(15, 12)) >> 12)
 #define PCS1G_LINK_STATUS_LINK_STATUS                     BIT(4)
 #define PCS1G_LINK_STATUS_SYNC_STATUS                     BIT(0)
 
-#define PCS1G_LINK_DOWN_CNT                               0x74
-
-#define PCS1G_STICKY                                      0x78
-
 #define PCS1G_STICKY_LINK_DOWN_STICKY                     BIT(4)
 #define PCS1G_STICKY_OUT_OF_SYNC_STICKY                   BIT(0)
 
-#define PCS1G_DEBUG_STATUS                                0x7c
-
-#define PCS1G_LPI_CFG                                     0x80
-
 #define PCS1G_LPI_CFG_QSGMII_MS_SEL                       BIT(20)
 #define PCS1G_LPI_CFG_RX_LPI_OUT_DIS                      BIT(17)
 #define PCS1G_LPI_CFG_LPI_TESTMODE                        BIT(16)
 #define PCS1G_LPI_CFG_LPI_RX_WTIM_X(x)                    (((x) & GENMASK(5, 4)) >> 4)
 #define PCS1G_LPI_CFG_TX_ASSERT_LPIDLE                    BIT(0)
 
-#define PCS1G_LPI_WAKE_ERROR_CNT                          0x84
-
-#define PCS1G_LPI_STATUS                                  0x88
-
 #define PCS1G_LPI_STATUS_RX_LPI_FAIL                      BIT(16)
 #define PCS1G_LPI_STATUS_RX_LPI_EVENT_STICKY              BIT(12)
 #define PCS1G_LPI_STATUS_RX_QUIET                         BIT(9)
 #define PCS1G_LPI_STATUS_TX_QUIET                         BIT(1)
 #define PCS1G_LPI_STATUS_TX_LPI_MODE                      BIT(0)
 
-#define PCS1G_TSTPAT_MODE_CFG                             0x8c
-
-#define PCS1G_TSTPAT_STATUS                               0x90
-
 #define PCS1G_TSTPAT_STATUS_JTP_ERR_CNT(x)                (((x) << 8) & GENMASK(15, 8))
 #define PCS1G_TSTPAT_STATUS_JTP_ERR_CNT_M                 GENMASK(15, 8)
 #define PCS1G_TSTPAT_STATUS_JTP_ERR_CNT_X(x)              (((x) & GENMASK(15, 8)) >> 8)
 #define PCS1G_TSTPAT_STATUS_JTP_ERR                       BIT(4)
 #define PCS1G_TSTPAT_STATUS_JTP_LOCK                      BIT(0)
 
-#define DEV_PCS_FX100_CFG                                 0x94
-
 #define DEV_PCS_FX100_CFG_SD_SEL                          BIT(26)
 #define DEV_PCS_FX100_CFG_SD_POL                          BIT(25)
 #define DEV_PCS_FX100_CFG_SD_ENA                          BIT(24)
 #define DEV_PCS_FX100_CFG_FEFGEN_ENA                      BIT(1)
 #define DEV_PCS_FX100_CFG_PCS_ENA                         BIT(0)
 
-#define DEV_PCS_FX100_STATUS                              0x98
-
 #define DEV_PCS_FX100_STATUS_EDGE_POS_PTP(x)              (((x) << 8) & GENMASK(11, 8))
 #define DEV_PCS_FX100_STATUS_EDGE_POS_PTP_M               GENMASK(11, 8)
 #define DEV_PCS_FX100_STATUS_EDGE_POS_PTP_X(x)            (((x) & GENMASK(11, 8)) >> 8)