generic: rtl8366_smi: rename and drop conflicting vlan GPL symbols

[openwrt/staging/hauke.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 4bb9e9a66eea93426f7f60c71b76b051e9774d8c..fabc9402780d604ce5c81ac96bf812109cb924f8 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
@@ -14,6 +14,7 @@
 #include <linux/phy.h>
 #include <linux/switch.h>
 #include <linux/platform_device.h>
+#include <linux/reset.h>
 
 struct rtl8366_smi_ops;
 struct rtl8366_vlan_ops;
@@ -33,7 +34,7 @@ struct rtl8366_smi {
        struct device           *parent;
        unsigned int            gpio_sda;
        unsigned int            gpio_sck;
-       void                    (*hw_reset)(bool active);
+       void                    (*hw_reset)(struct rtl8366_smi *smi, bool active);
        unsigned int            clk_delay;      /* ns */
        u8                      cmd_read;
        u8                      cmd_write;
@@ -54,11 +55,15 @@ struct rtl8366_smi {
        int                     vlan4k_enabled;
 
        char                    buf[4096];
+
+       struct reset_control    *reset;
+
 #ifdef CONFIG_RTL8366_SMI_DEBUG_FS
        struct dentry           *debugfs_root;
        u16                     dbg_reg;
        u8                      dbg_vlan_4k_page;
 #endif
+       struct mii_bus          *ext_mbus;
 };
 
 struct rtl8366_vlan_mc {
@@ -110,10 +115,6 @@ 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_RTL8366_SMI_DEBUG_FS
 int rtl8366_debugfs_open(struct inode *inode, struct file *file);
 #endif