generic: ar8216: use mdiobus_write in ar8236_hw_init

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

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
index 3b639f2..8b1a70d 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
@@ -12,6 +12,7 @@
 #define _RTL8366_SMI_H
 
 #include <linux/phy.h>
 #define _RTL8366_SMI_H
 
 #include <linux/phy.h>

+#include <linux/switch.h>

 
 struct rtl8366_smi_ops;
 struct rtl8366_vlan_ops;
 
 struct rtl8366_smi_ops;
 struct rtl8366_vlan_ops;


@@ -31,9 +32,13 @@ struct rtl8366_smi {
        struct device           *parent;
        unsigned int            gpio_sda;
        unsigned int            gpio_sck;
        struct device           *parent;
        unsigned int            gpio_sda;
        unsigned int            gpio_sck;

+       unsigned int            clk_delay;      /* ns */
+       u8                      cmd_read;
+       u8                      cmd_write;

        spinlock_t              lock;
        struct mii_bus          *mii_bus;
        int                     mii_irq[PHY_MAX_ADDR];
        spinlock_t              lock;
        struct mii_bus          *mii_bus;
        int                     mii_irq[PHY_MAX_ADDR];

+       struct switch_dev       sw_dev;

 
        unsigned int            cpu_port;
        unsigned int            num_ports;
 
        unsigned int            cpu_port;
        unsigned int            num_ports;


@@ -43,30 +48,35 @@ struct rtl8366_smi {
 
        struct rtl8366_smi_ops  *ops;
 
 
        struct rtl8366_smi_ops  *ops;
 

+       int                     vlan_enabled;
+       int                     vlan4k_enabled;
+

        char                    buf[4096];
 #ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
        struct dentry           *debugfs_root;
        u16                     dbg_reg;
        char                    buf[4096];
 #ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
        struct dentry           *debugfs_root;
        u16                     dbg_reg;

+       u8                      dbg_vlan_4k_page;

 #endif
 };
 
 struct rtl8366_vlan_mc {
        u16     vid;
 #endif
 };
 
 struct rtl8366_vlan_mc {
        u16     vid;

-       u8      priority;
-       u8      untag;
-       u8      member;
+       u16     untag;
+       u16     member;

        u8      fid;
        u8      fid;

+       u8      priority;

 };
 
 struct rtl8366_vlan_4k {
        u16     vid;
 };
 
 struct rtl8366_vlan_4k {
        u16     vid;

-       u8      untag;
-       u8      member;
+       u16     untag;
+       u16     member;

        u8      fid;
 };
 
 struct rtl8366_smi_ops {
        int     (*detect)(struct rtl8366_smi *smi);
        u8      fid;
 };
 
 struct rtl8366_smi_ops {
        int     (*detect)(struct rtl8366_smi *smi);

+       int     (*setup)(struct rtl8366_smi *smi);

 
        int     (*mii_read)(struct mii_bus *bus, int addr, int reg);
        int     (*mii_write)(struct mii_bus *bus, int addr, int reg, u16 val);
 
        int     (*mii_read)(struct mii_bus *bus, int addr, int reg);
        int     (*mii_write)(struct mii_bus *bus, int addr, int reg, u16 val);


@@ -83,22 +93,54 @@ struct rtl8366_smi_ops {
        int     (*set_mc_index)(struct rtl8366_smi *smi, int port, int index);
        int     (*get_mib_counter)(struct rtl8366_smi *smi, int counter,
                                   int port, unsigned long long *val);
        int     (*set_mc_index)(struct rtl8366_smi *smi, int port, int index);
        int     (*get_mib_counter)(struct rtl8366_smi *smi, int counter,
                                   int port, unsigned long long *val);

+       int     (*is_vlan_valid)(struct rtl8366_smi *smi, unsigned vlan);
+       int     (*enable_vlan)(struct rtl8366_smi *smi, int enable);
+       int     (*enable_vlan4k)(struct rtl8366_smi *smi, int enable);
+       int     (*enable_port)(struct rtl8366_smi *smi, int port, int enable);

 };
 
 };
 

+struct rtl8366_smi *rtl8366_smi_alloc(struct device *parent);

 int rtl8366_smi_init(struct rtl8366_smi *smi);
 void rtl8366_smi_cleanup(struct rtl8366_smi *smi);
 int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data);
 int rtl8366_smi_init(struct rtl8366_smi *smi);
 void rtl8366_smi_cleanup(struct rtl8366_smi *smi);
 int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data);

+int rtl8366_smi_write_reg_noack(struct rtl8366_smi *smi, u32 addr, u32 data);

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

-int rtl8366_set_vlan(struct rtl8366_smi *smi, int vid, u32 member, u32 untag,
-                    u32 fid);

 int rtl8366_reset_vlan(struct rtl8366_smi *smi);
 int rtl8366_reset_vlan(struct rtl8366_smi *smi);

-int rtl8366_get_pvid(struct rtl8366_smi *smi, int port, int *val);
-int rtl8366_set_pvid(struct rtl8366_smi *smi, unsigned port, unsigned vid);
+int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable);
+int rtl8366_enable_all_ports(struct rtl8366_smi *smi, int enable);

 
 #ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
 int rtl8366_debugfs_open(struct inode *inode, struct file *file);
 #endif
 
 
 #ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
 int rtl8366_debugfs_open(struct inode *inode, struct file *file);
 #endif
 

+static inline struct rtl8366_smi *sw_to_rtl8366_smi(struct switch_dev *sw)
+{
+       return container_of(sw, struct rtl8366_smi, sw_dev);
+}
+
+int rtl8366_sw_get_port_pvid(struct switch_dev *dev, int port, int *val);
+int rtl8366_sw_set_port_pvid(struct switch_dev *dev, int port, int val);
+int rtl8366_sw_get_port_mib(struct switch_dev *dev,
+                           const struct switch_attr *attr,
+                           struct switch_val *val);
+int rtl8366_sw_get_vlan_info(struct switch_dev *dev,
+                            const struct switch_attr *attr,
+                            struct switch_val *val);
+int rtl8366_sw_get_vlan_fid(struct switch_dev *dev,
+                            const struct switch_attr *attr,
+                            struct switch_val *val);
+int rtl8366_sw_set_vlan_fid(struct switch_dev *dev,
+                            const struct switch_attr *attr,
+                            struct switch_val *val);
+int rtl8366_sw_get_vlan_ports(struct switch_dev *dev, struct switch_val *val);
+int rtl8366_sw_set_vlan_ports(struct switch_dev *dev, struct switch_val *val);
+int rtl8366_sw_get_vlan_enable(struct switch_dev *dev,
+                              const struct switch_attr *attr,
+                              struct switch_val *val);
+int rtl8366_sw_set_vlan_enable(struct switch_dev *dev,
+                              const struct switch_attr *attr,
+                              struct switch_val *val);
+

 #endif /*  _RTL8366_SMI_H */
 #endif /*  _RTL8366_SMI_H */