net: dsa: microchip: Replace ad-hoc polling with regmap

[linux-2.6-microblaze.git] / drivers / net / dsa / microchip / ksz9477.c

diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index 7be6d84..ece25f3 100644 (file)
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -65,33 +65,28 @@ static const struct {
        { 0x83, "tx_discards" },
 };
 
-static void ksz9477_cfg32(struct ksz_device *dev, u32 addr, u32 bits, bool set)
+static void ksz_cfg(struct ksz_device *dev, u32 addr, u8 bits, bool set)
 {
-       u32 data;
+       regmap_update_bits(dev->regmap[0], addr, bits, set ? bits : 0);
+}
 
-       ksz_read32(dev, addr, &data);
-       if (set)
-               data |= bits;
-       else
-               data &= ~bits;
-       ksz_write32(dev, addr, data);
+static void ksz_port_cfg(struct ksz_device *dev, int port, int offset, u8 bits,
+                        bool set)
+{
+       regmap_update_bits(dev->regmap[0], PORT_CTRL_ADDR(port, offset),
+                          bits, set ? bits : 0);
+}
+
+static void ksz9477_cfg32(struct ksz_device *dev, u32 addr, u32 bits, bool set)
+{
+       regmap_update_bits(dev->regmap[2], addr, bits, set ? bits : 0);
 }
 
 static void ksz9477_port_cfg32(struct ksz_device *dev, int port, int offset,
                               u32 bits, bool set)
 {
-       u32 addr;
-       u32 data;
-
-       addr = PORT_CTRL_ADDR(port, offset);
-       ksz_read32(dev, addr, &data);
-
-       if (set)
-               data |= bits;
-       else
-               data &= ~bits;
-
-       ksz_write32(dev, addr, data);
+       regmap_update_bits(dev->regmap[2], PORT_CTRL_ADDR(port, offset),
+                          bits, set ? bits : 0);
 }
 
 static int ksz9477_wait_vlan_ctrl_ready(struct ksz_device *dev, u32 waiton,
@@ -258,18 +253,18 @@ static int ksz9477_reset_switch(struct ksz_device *dev)
        data16 |= (BROADCAST_STORM_VALUE * BROADCAST_STORM_PROT_RATE) / 100;
        ksz_write16(dev, REG_SW_MAC_CTRL_2, data16);
 
+       if (dev->synclko_125)
+               ksz_write8(dev, REG_SW_GLOBAL_OUTPUT_CTRL__1,
+                          SW_ENABLE_REFCLKO | SW_REFCLKO_IS_125MHZ);
+
        return 0;
 }
 
 static void ksz9477_r_mib_cnt(struct ksz_device *dev, int port, u16 addr,
                              u64 *cnt)
 {
-       struct ksz_poll_ctx ctx = {
-               .dev = dev,
-               .port = port,
-               .offset = REG_PORT_MIB_CTRL_STAT__4,
-       };
        struct ksz_port *p = &dev->ports[port];
+       unsigned int val;
        u32 data;
        int ret;
 
@@ -279,11 +274,11 @@ static void ksz9477_r_mib_cnt(struct ksz_device *dev, int port, u16 addr,
        data |= (addr << MIB_COUNTER_INDEX_S);
        ksz_pwrite32(dev, port, REG_PORT_MIB_CTRL_STAT__4, data);
 
-       ret = readx_poll_timeout(ksz_pread32_poll, &ctx, data,
-                                !(data & MIB_COUNTER_READ), 10, 1000);
-
+       ret = regmap_read_poll_timeout(dev->regmap[2],
+                       PORT_CTRL_ADDR(port, REG_PORT_MIB_CTRL_STAT__4),
+                       val, !(val & MIB_COUNTER_READ), 10, 1000);
        /* failed to read MIB. get out of loop */
-       if (ret < 0) {
+       if (ret) {
                dev_dbg(dev->dev, "Failed to get MIB\n");
                return;
        }