[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 2e84a8d..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;
        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];


@@ -58,16 +61,16 @@ struct rtl8366_smi {
 
 struct rtl8366_vlan_mc {
        u16     vid;
 
 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;
 };
 
        u8      fid;
 };
 


@@ -100,6 +103,7 @@ 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);