generic: ar8216: add read_port_status field to ar8xxx_chip

[openwrt.git] / target / linux / generic / files / drivers / net / phy / rtl8366_smi.c

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
index 28e1a85..e48ca99 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
@@ -15,6 +15,7 @@
 #include <linux/gpio.h>
 #include <linux/spinlock.h>
 #include <linux/skbuff.h>
 #include <linux/gpio.h>
 #include <linux/spinlock.h>
 #include <linux/skbuff.h>

+#include <linux/rtl8366.h>

 
 #ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
 #include <linux/debugfs.h>
 
 #ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
 #include <linux/debugfs.h>


@@ -23,11 +24,10 @@
 #include "rtl8366_smi.h"
 
 #define RTL8366_SMI_ACK_RETRY_COUNT         5
 #include "rtl8366_smi.h"
 
 #define RTL8366_SMI_ACK_RETRY_COUNT         5

-#define RTL8366_SMI_CLK_DELAY               10 /* nsec */

 
 static inline void rtl8366_smi_clk_delay(struct rtl8366_smi *smi)
 {
 
 static inline void rtl8366_smi_clk_delay(struct rtl8366_smi *smi)
 {

-       ndelay(RTL8366_SMI_CLK_DELAY);
+       ndelay(smi->clk_delay);

 }
 
 static void rtl8366_smi_start(struct rtl8366_smi *smi)
 }
 
 static void rtl8366_smi_start(struct rtl8366_smi *smi)


@@ -142,8 +142,10 @@ static int rtl8366_smi_wait_for_ack(struct rtl8366_smi *smi)
                if (ack == 0)
                        break;
 
                if (ack == 0)
                        break;
 

-               if (++retry_cnt > RTL8366_SMI_ACK_RETRY_COUNT)
-                       return -EIO;
+               if (++retry_cnt > RTL8366_SMI_ACK_RETRY_COUNT) {
+                       dev_err(smi->parent, "ACK timeout\n");
+                       return -ETIMEDOUT;
+               }

        } while (1);
 
        return 0;
        } while (1);
 
        return 0;


@@ -155,6 +157,12 @@ static int rtl8366_smi_write_byte(struct rtl8366_smi *smi, u8 data)
        return rtl8366_smi_wait_for_ack(smi);
 }
 
        return rtl8366_smi_wait_for_ack(smi);
 }
 

+static int rtl8366_smi_write_byte_noack(struct rtl8366_smi *smi, u8 data)
+{
+       rtl8366_smi_write_bits(smi, data, 8);
+       return 0;
+}
+

 static int rtl8366_smi_read_byte0(struct rtl8366_smi *smi, u8 *data)
 {
        u32 t;
 static int rtl8366_smi_read_byte0(struct rtl8366_smi *smi, u8 *data)
 {
        u32 t;


@@ -195,7 +203,7 @@ int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
        rtl8366_smi_start(smi);
 
        /* send READ command */
        rtl8366_smi_start(smi);
 
        /* send READ command */

-       ret = rtl8366_smi_write_byte(smi, 0x0a << 4 | 0x04 << 1 | 0x01);
+       ret = rtl8366_smi_write_byte(smi, smi->cmd_read);

        if (ret)
                goto out;
 
        if (ret)
                goto out;
 


@@ -226,7 +234,8 @@ int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
 }
 EXPORT_SYMBOL_GPL(rtl8366_smi_read_reg);
 
 }
 EXPORT_SYMBOL_GPL(rtl8366_smi_read_reg);
 

-int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
+static int __rtl8366_smi_write_reg(struct rtl8366_smi *smi,
+                                  u32 addr, u32 data, bool ack)

 {
        unsigned long flags;
        int ret;
 {
        unsigned long flags;
        int ret;


@@ -236,7 +245,7 @@ int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
        rtl8366_smi_start(smi);
 
        /* send WRITE command */
        rtl8366_smi_start(smi);
 
        /* send WRITE command */

-       ret = rtl8366_smi_write_byte(smi, 0x0a << 4 | 0x04 << 1 | 0x00);
+       ret = rtl8366_smi_write_byte(smi, smi->cmd_write);

        if (ret)
                goto out;
 
        if (ret)
                goto out;
 


@@ -256,7 +265,10 @@ int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
                goto out;
 
        /* write DATA[15:8] */
                goto out;
 
        /* write DATA[15:8] */

-       ret = rtl8366_smi_write_byte(smi, data >> 8);
+       if (ack)
+               ret = rtl8366_smi_write_byte(smi, data >> 8);
+       else
+               ret = rtl8366_smi_write_byte_noack(smi, data >> 8);

        if (ret)
                goto out;
 
        if (ret)
                goto out;
 


@@ -268,8 +280,19 @@ int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
 
        return ret;
 }
 
        return ret;
 }

+
+int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
+{
+       return __rtl8366_smi_write_reg(smi, addr, data, true);
+}

 EXPORT_SYMBOL_GPL(rtl8366_smi_write_reg);
 
 EXPORT_SYMBOL_GPL(rtl8366_smi_write_reg);
 

+int rtl8366_smi_write_reg_noack(struct rtl8366_smi *smi, u32 addr, u32 data)
+{
+       return __rtl8366_smi_write_reg(smi, addr, data, false);
+}
+EXPORT_SYMBOL_GPL(rtl8366_smi_write_reg_noack);
+

 int rtl8366_smi_rmwr(struct rtl8366_smi *smi, u32 addr, u32 mask, u32 data)
 {
        u32 t;
 int rtl8366_smi_rmwr(struct rtl8366_smi *smi, u32 addr, u32 mask, u32 data)
 {
        u32 t;


@@ -1160,27 +1183,89 @@ struct rtl8366_smi *rtl8366_smi_alloc(struct device *parent)
 }
 EXPORT_SYMBOL_GPL(rtl8366_smi_alloc);
 
 }
 EXPORT_SYMBOL_GPL(rtl8366_smi_alloc);
 

-int rtl8366_smi_init(struct rtl8366_smi *smi)
+static int __rtl8366_smi_init(struct rtl8366_smi *smi, const char *name)

 {
        int err;
 
 {
        int err;
 

-       if (!smi->ops)
-               return -EINVAL;
-
-       err = gpio_request(smi->gpio_sda, dev_name(smi->parent));
+       err = gpio_request(smi->gpio_sda, name);

        if (err) {
        if (err) {

-               dev_err(smi->parent, "gpio_request failed for %u, err=%d\n",
+               printk(KERN_ERR "rtl8366_smi: gpio_request failed for %u, err=%d\n",

                        smi->gpio_sda, err);
                goto err_out;
        }
 
                        smi->gpio_sda, err);
                goto err_out;
        }
 

-       err = gpio_request(smi->gpio_sck, dev_name(smi->parent));
+       err = gpio_request(smi->gpio_sck, name);

        if (err) {
        if (err) {

-               dev_err(smi->parent, "gpio_request failed for %u, err=%d\n",
+               printk(KERN_ERR "rtl8366_smi: gpio_request failed for %u, err=%d\n",

                        smi->gpio_sck, err);
                goto err_free_sda;
        }
 
                        smi->gpio_sck, err);
                goto err_free_sda;
        }
 

+       spin_lock_init(&smi->lock);
+       return 0;
+
+ err_free_sda:
+       gpio_free(smi->gpio_sda);
+ err_out:
+       return err;
+}
+
+static void __rtl8366_smi_cleanup(struct rtl8366_smi *smi)
+{
+       gpio_free(smi->gpio_sck);
+       gpio_free(smi->gpio_sda);
+}
+
+enum rtl8366_type rtl8366_smi_detect(struct rtl8366_platform_data *pdata)
+{
+       static struct rtl8366_smi smi;
+       enum rtl8366_type type = RTL8366_TYPE_UNKNOWN;
+       u32 reg = 0;
+
+       memset(&smi, 0, sizeof(smi));
+       smi.gpio_sda = pdata->gpio_sda;
+       smi.gpio_sck = pdata->gpio_sck;
+       smi.clk_delay = 10;
+       smi.cmd_read  = 0xa9;
+       smi.cmd_write = 0xa8;
+
+       if (__rtl8366_smi_init(&smi, "rtl8366"))
+               goto out;
+
+       if (rtl8366_smi_read_reg(&smi, 0x5c, &reg))
+               goto cleanup;
+
+       switch(reg) {
+       case 0x6027:
+               printk("Found an RTL8366S switch\n");
+               type = RTL8366_TYPE_S;
+               break;
+       case 0x5937:
+               printk("Found an RTL8366RB switch\n");
+               type = RTL8366_TYPE_RB;
+               break;
+       default:
+               printk("Found an Unknown RTL8366 switch (id=0x%04x)\n", reg);
+               break;
+       }
+
+cleanup:
+       __rtl8366_smi_cleanup(&smi);
+out:
+       return type;
+}
+
+int rtl8366_smi_init(struct rtl8366_smi *smi)
+{
+       int err;
+
+       if (!smi->ops)
+               return -EINVAL;
+
+       err = __rtl8366_smi_init(smi, dev_name(smi->parent));
+       if (err)
+               goto err_out;
+

        spin_lock_init(&smi->lock);
 
        dev_info(smi->parent, "using GPIO pins %u (SDA) and %u (SCK)\n",
        spin_lock_init(&smi->lock);
 
        dev_info(smi->parent, "using GPIO pins %u (SDA) and %u (SCK)\n",


@@ -1218,9 +1303,7 @@ int rtl8366_smi_init(struct rtl8366_smi *smi)
        return 0;
 
  err_free_sck:
        return 0;
 
  err_free_sck:

-       gpio_free(smi->gpio_sck);
- err_free_sda:
-       gpio_free(smi->gpio_sda);
+       __rtl8366_smi_cleanup(smi);

  err_out:
        return err;
 }
  err_out:
        return err;
 }