[generic] partly revert r30708, it breaks various arches

[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 af02cfd..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
@@ -32,6 +32,9 @@ struct rtl8366_smi {
        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];
@@ -52,21 +55,22 @@ struct rtl8366_smi {
 #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;
-       u8      priority;
-       u8      untag;
-       u8      member;
+       u16     untag;
+       u16     member;
        u8      fid;
+       u8      priority;
 };
 
 struct rtl8366_vlan_4k {
        u16     vid;
-       u8      untag;
-       u8      member;
+       u16     untag;
+       u16     member;
        u8      fid;
 };
 
@@ -92,16 +96,20 @@ struct rtl8366_smi_ops {
        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_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_reset_vlan(struct rtl8366_smi *smi);
+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);
@@ -120,6 +128,12 @@ int rtl8366_sw_get_port_mib(struct switch_dev *dev,
 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,