[adm5120] remove hardware accelerated byte swapping feature, and resync kernel config

[openwrt.git] / target / linux / adm5120-2.6 / files / drivers / net / adm5120sw.h

diff --git a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h b/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h
index e915a41..35e7876 100644 (file)
--- a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h
+++ b/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h
@@ -12,7 +12,6 @@
 
 #define SW_BASE        KSEG1ADDR(0x12000000)
 #define SW_DEVS        6
 
 #define SW_BASE        KSEG1ADDR(0x12000000)
 #define SW_DEVS        6

-#define SW_IRQ         9

 
 #define ETH_TX_TIMEOUT HZ/4
 #define ETH_FCS 4;
 
 #define ETH_TX_TIMEOUT HZ/4
 #define ETH_FCS 4;


@@ -39,6 +38,8 @@
 #define ADM5120_MAC_WRITE_DONE 0x00000002
 #define ADM5120_VLAN_EN                0x00000040
 #define ADM5120_MAC_WT1                0x5c
 #define ADM5120_MAC_WRITE_DONE 0x00000002
 #define ADM5120_VLAN_EN                0x00000040
 #define ADM5120_MAC_WT1                0x5c

+#define ADM5120_BW_CTL0                0x60            /* Bandwidth control 0 */
+#define ADM5120_BW_CTL1                0x64            /* Bandwidth control 1 */

 #define ADM5120_PHY_CNTL2      0x7c
 #define ADM5120_AUTONEG                0x0000001f      /* Auto negotiate */
 #define ADM5120_NORMAL         0x01f00000      /* PHY normal mode */
 #define ADM5120_PHY_CNTL2      0x7c
 #define ADM5120_AUTONEG                0x0000001f      /* Auto negotiate */
 #define ADM5120_NORMAL         0x01f00000      /* PHY normal mode */


@@ -69,7 +70,7 @@ struct adm5120_dma {
        u32 status;
 } __attribute__ ((packed));
 
        u32 status;
 } __attribute__ ((packed));
 

-#define        ADM5120_DMA_MASK        0x00ffffff
+#define        ADM5120_DMA_MASK        0x01ffffff

 #define ADM5120_DMA_OWN                0x80000000      /* buffer owner */
 #define ADM5120_DMA_RINGEND    0x10000000      /* Last in DMA ring */
 
 #define ADM5120_DMA_OWN                0x80000000      /* buffer owner */
 #define ADM5120_DMA_RINGEND    0x10000000      /* Last in DMA ring */
 


@@ -96,18 +97,13 @@ struct adm5120_sw {
 #define SIOCSMATRIX    SIOCDEVPRIVATE
 #define SIOCGMATRIX    SIOCDEVPRIVATE+1
 #define SIOCGADMINFO   SIOCDEVPRIVATE+2
 #define SIOCSMATRIX    SIOCDEVPRIVATE
 #define SIOCGMATRIX    SIOCDEVPRIVATE+1
 #define SIOCGADMINFO   SIOCDEVPRIVATE+2

+#define SIOCGETBW      SIOCDEVPRIVATE+3
+#define SIOCSETBW      SIOCDEVPRIVATE+4

 
 

-struct adm5120_info {
+struct adm5120_sw_info {

        u16     magic;
        u16     ports;
        u16     vlan;
 };
        u16     magic;
        u16     ports;
        u16     vlan;
 };

-#define UNKNOWN 0
-
-#define UBOOT 2
-#define MYLOADER 3
-
-/* Type of boot loader, detected by the prom */
-extern boot_loader_type;

 
 #endif /* _INCLUDE_ADM5120SW_H_ */
 
 #endif /* _INCLUDE_ADM5120SW_H_ */