]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
staging: brcm80211: deleted header file include/aidmp.h
authorRoland Vossen <rvossen@broadcom.com>
Wed, 1 Jun 2011 11:46:00 +0000 (13:46 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 7 Jun 2011 19:49:30 +0000 (12:49 -0700)
Code cleanup. Merged used contents into brcmsmac/aiutils.c.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/brcm80211/brcmsmac/aiutils.c
drivers/staging/brcm80211/brcmsmac/aiutils.h
drivers/staging/brcm80211/brcmsmac/scb.h
drivers/staging/brcm80211/include/aidmp.h [deleted file]
drivers/staging/brcm80211/include/soc.h

index 1f87b32c11d5dc1981be18bd42eb4659f063f7d5..071279a8581df7d3379962edce672f9d9d257a44 100644 (file)
                (sih->chiprev == 0) && \
                (sii->coreid[sii->curidx] == MIPS74K_CORE_ID))
 
+/* Manufacturer Ids */
+#define        MFGID_ARM               0x43b
+#define        MFGID_BRCM              0x4bf
+#define        MFGID_MIPS              0x4a7
+
+/* Enumeration ROM registers */
+#define        ER_EROMENTRY            0x000
+#define        ER_REMAPCONTROL         0xe00
+#define        ER_REMAPSELECT          0xe04
+#define        ER_MASTERSELECT         0xe10
+#define        ER_ITCR                 0xf00
+#define        ER_ITIP                 0xf04
+
+/* Erom entries */
+#define        ER_TAG                  0xe
+#define        ER_TAG1                 0x6
+#define        ER_VALID                1
+#define        ER_CI                   0
+#define        ER_MP                   2
+#define        ER_ADD                  4
+#define        ER_END                  0xe
+#define        ER_BAD                  0xffffffff
+
+/* EROM CompIdentA */
+#define        CIA_MFG_MASK            0xfff00000
+#define        CIA_MFG_SHIFT           20
+#define        CIA_CID_MASK            0x000fff00
+#define        CIA_CID_SHIFT           8
+#define        CIA_CCL_MASK            0x000000f0
+#define        CIA_CCL_SHIFT           4
+
+/* EROM CompIdentB */
+#define        CIB_REV_MASK            0xff000000
+#define        CIB_REV_SHIFT           24
+#define        CIB_NSW_MASK            0x00f80000
+#define        CIB_NSW_SHIFT           19
+#define        CIB_NMW_MASK            0x0007c000
+#define        CIB_NMW_SHIFT           14
+#define        CIB_NSP_MASK            0x00003e00
+#define        CIB_NSP_SHIFT           9
+#define        CIB_NMP_MASK            0x000001f0
+#define        CIB_NMP_SHIFT           4
+
+/* EROM AddrDesc */
+#define        AD_ADDR_MASK            0xfffff000
+#define        AD_SP_MASK              0x00000f00
+#define        AD_SP_SHIFT             8
+#define        AD_ST_MASK              0x000000c0
+#define        AD_ST_SHIFT             6
+#define        AD_ST_SLAVE             0x00000000
+#define        AD_ST_BRIDGE            0x00000040
+#define        AD_ST_SWRAP             0x00000080
+#define        AD_ST_MWRAP             0x000000c0
+#define        AD_SZ_MASK              0x00000030
+#define        AD_SZ_SHIFT             4
+#define        AD_SZ_4K                0x00000000
+#define        AD_SZ_8K                0x00000010
+#define        AD_SZ_16K               0x00000020
+#define        AD_SZ_SZD               0x00000030
+#define        AD_AG32                 0x00000008
+#define        AD_ADDR_ALIGN           0x00000fff
+#define        AD_SZ_BASE              0x00001000      /* 4KB */
+
+/* EROM SizeDesc */
+#define        SD_SZ_MASK              0xfffff000
+#define        SD_SG32                 0x00000008
+#define        SD_SZ_ALIGN             0x00000fff
+
+/* resetctrl */
+#define        AIRC_RESET              1
+
+typedef volatile struct _aidmp {
+       u32 oobselina30;        /* 0x000 */
+       u32 oobselina74;        /* 0x004 */
+       u32 PAD[6];
+       u32 oobselinb30;        /* 0x020 */
+       u32 oobselinb74;        /* 0x024 */
+       u32 PAD[6];
+       u32 oobselinc30;        /* 0x040 */
+       u32 oobselinc74;        /* 0x044 */
+       u32 PAD[6];
+       u32 oobselind30;        /* 0x060 */
+       u32 oobselind74;        /* 0x064 */
+       u32 PAD[38];
+       u32 oobselouta30;       /* 0x100 */
+       u32 oobselouta74;       /* 0x104 */
+       u32 PAD[6];
+       u32 oobseloutb30;       /* 0x120 */
+       u32 oobseloutb74;       /* 0x124 */
+       u32 PAD[6];
+       u32 oobseloutc30;       /* 0x140 */
+       u32 oobseloutc74;       /* 0x144 */
+       u32 PAD[6];
+       u32 oobseloutd30;       /* 0x160 */
+       u32 oobseloutd74;       /* 0x164 */
+       u32 PAD[38];
+       u32 oobsynca;   /* 0x200 */
+       u32 oobseloutaen;       /* 0x204 */
+       u32 PAD[6];
+       u32 oobsyncb;   /* 0x220 */
+       u32 oobseloutben;       /* 0x224 */
+       u32 PAD[6];
+       u32 oobsyncc;   /* 0x240 */
+       u32 oobseloutcen;       /* 0x244 */
+       u32 PAD[6];
+       u32 oobsyncd;   /* 0x260 */
+       u32 oobseloutden;       /* 0x264 */
+       u32 PAD[38];
+       u32 oobaextwidth;       /* 0x300 */
+       u32 oobainwidth;        /* 0x304 */
+       u32 oobaoutwidth;       /* 0x308 */
+       u32 PAD[5];
+       u32 oobbextwidth;       /* 0x320 */
+       u32 oobbinwidth;        /* 0x324 */
+       u32 oobboutwidth;       /* 0x328 */
+       u32 PAD[5];
+       u32 oobcextwidth;       /* 0x340 */
+       u32 oobcinwidth;        /* 0x344 */
+       u32 oobcoutwidth;       /* 0x348 */
+       u32 PAD[5];
+       u32 oobdextwidth;       /* 0x360 */
+       u32 oobdinwidth;        /* 0x364 */
+       u32 oobdoutwidth;       /* 0x368 */
+       u32 PAD[37];
+       u32 ioctrlset;  /* 0x400 */
+       u32 ioctrlclear;        /* 0x404 */
+       u32 ioctrl;             /* 0x408 */
+       u32 PAD[61];
+       u32 iostatus;   /* 0x500 */
+       u32 PAD[127];
+       u32 ioctrlwidth;        /* 0x700 */
+       u32 iostatuswidth;      /* 0x704 */
+       u32 PAD[62];
+       u32 resetctrl;  /* 0x800 */
+       u32 resetstatus;        /* 0x804 */
+       u32 resetreadid;        /* 0x808 */
+       u32 resetwriteid;       /* 0x80c */
+       u32 PAD[60];
+       u32 errlogctrl; /* 0x900 */
+       u32 errlogdone; /* 0x904 */
+       u32 errlogstatus;       /* 0x908 */
+       u32 errlogaddrlo;       /* 0x90c */
+       u32 errlogaddrhi;       /* 0x910 */
+       u32 errlogid;   /* 0x914 */
+       u32 errloguser; /* 0x918 */
+       u32 errlogflags;        /* 0x91c */
+       u32 PAD[56];
+       u32 intstatus;  /* 0xa00 */
+       u32 PAD[127];
+       u32 config;             /* 0xe00 */
+       u32 PAD[63];
+       u32 itcr;               /* 0xf00 */
+       u32 PAD[3];
+       u32 itipooba;   /* 0xf10 */
+       u32 itipoobb;   /* 0xf14 */
+       u32 itipoobc;   /* 0xf18 */
+       u32 itipoobd;   /* 0xf1c */
+       u32 PAD[4];
+       u32 itipoobaout;        /* 0xf30 */
+       u32 itipoobbout;        /* 0xf34 */
+       u32 itipoobcout;        /* 0xf38 */
+       u32 itipoobdout;        /* 0xf3c */
+       u32 PAD[4];
+       u32 itopooba;   /* 0xf50 */
+       u32 itopoobb;   /* 0xf54 */
+       u32 itopoobc;   /* 0xf58 */
+       u32 itopoobd;   /* 0xf5c */
+       u32 PAD[4];
+       u32 itopoobain; /* 0xf70 */
+       u32 itopoobbin; /* 0xf74 */
+       u32 itopoobcin; /* 0xf78 */
+       u32 itopoobdin; /* 0xf7c */
+       u32 PAD[4];
+       u32 itopreset;  /* 0xf90 */
+       u32 PAD[15];
+       u32 peripherialid4;     /* 0xfd0 */
+       u32 peripherialid5;     /* 0xfd4 */
+       u32 peripherialid6;     /* 0xfd8 */
+       u32 peripherialid7;     /* 0xfdc */
+       u32 peripherialid0;     /* 0xfe0 */
+       u32 peripherialid1;     /* 0xfe4 */
+       u32 peripherialid2;     /* 0xfe8 */
+       u32 peripherialid3;     /* 0xfec */
+       u32 componentid0;       /* 0xff0 */
+       u32 componentid1;       /* 0xff4 */
+       u32 componentid2;       /* 0xff8 */
+       u32 componentid3;       /* 0xffc */
+} aidmp_t;
+
 /* EROM parsing */
 
 static u32
index ad18b3822a0619d6cc61db92acac7199097157ae..f8f5cc1404e5027770e9b891873bb58379fe6455 100644 (file)
@@ -17,9 +17,6 @@
 #ifndef        _BRCM_AIUTILS_H_
 #define        _BRCM_AIUTILS_H_
 
-/* Include the soci specific files */
-#include <aidmp.h>
-
 /*
  * SOC Interconnect Address Map.
  * All regions may not exist on all chips.
index dcad9d0f4226d8eb6f1f0e1152f35b74d58bfcd1..edd471b9de457f60177093aeb9367cddaf3d7d7d 100644 (file)
@@ -18,6 +18,7 @@
 #define _BRCM_SCB_H_
 
 #include <linux/if_ether.h>    /* for ETH_ALEN */
+#include <defs.h>
 
 #define AMPDU_TX_BA_MAX_WSIZE  64      /* max Tx ba window size (in pdu) */
 /* structure to store per-tid state for the ampdu initiator */
diff --git a/drivers/staging/brcm80211/include/aidmp.h b/drivers/staging/brcm80211/include/aidmp.h
deleted file mode 100644 (file)
index d166af4..0000000
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef        _AIDMP_H
-#define        _AIDMP_H
-
-#include "defs.h"              /* for PAD macro */
-
-/* Manufacturer Ids */
-#define        MFGID_ARM               0x43b
-#define        MFGID_BRCM              0x4bf
-#define        MFGID_MIPS              0x4a7
-
-/* Component Classes */
-#define        CC_SIM                  0
-#define        CC_EROM                 1
-#define        CC_CORESIGHT            9
-#define        CC_VERIF                0xb
-#define        CC_OPTIMO               0xd
-#define        CC_GEN                  0xe
-#define        CC_PRIMECELL            0xf
-
-/* Enumeration ROM registers */
-#define        ER_EROMENTRY            0x000
-#define        ER_REMAPCONTROL         0xe00
-#define        ER_REMAPSELECT          0xe04
-#define        ER_MASTERSELECT         0xe10
-#define        ER_ITCR                 0xf00
-#define        ER_ITIP                 0xf04
-
-/* Erom entries */
-#define        ER_TAG                  0xe
-#define        ER_TAG1                 0x6
-#define        ER_VALID                1
-#define        ER_CI                   0
-#define        ER_MP                   2
-#define        ER_ADD                  4
-#define        ER_END                  0xe
-#define        ER_BAD                  0xffffffff
-
-/* EROM CompIdentA */
-#define        CIA_MFG_MASK            0xfff00000
-#define        CIA_MFG_SHIFT           20
-#define        CIA_CID_MASK            0x000fff00
-#define        CIA_CID_SHIFT           8
-#define        CIA_CCL_MASK            0x000000f0
-#define        CIA_CCL_SHIFT           4
-
-/* EROM CompIdentB */
-#define        CIB_REV_MASK            0xff000000
-#define        CIB_REV_SHIFT           24
-#define        CIB_NSW_MASK            0x00f80000
-#define        CIB_NSW_SHIFT           19
-#define        CIB_NMW_MASK            0x0007c000
-#define        CIB_NMW_SHIFT           14
-#define        CIB_NSP_MASK            0x00003e00
-#define        CIB_NSP_SHIFT           9
-#define        CIB_NMP_MASK            0x000001f0
-#define        CIB_NMP_SHIFT           4
-
-/* EROM MasterPortDesc */
-#define        MPD_MUI_MASK            0x0000ff00
-#define        MPD_MUI_SHIFT           8
-#define        MPD_MP_MASK             0x000000f0
-#define        MPD_MP_SHIFT            4
-
-/* EROM AddrDesc */
-#define        AD_ADDR_MASK            0xfffff000
-#define        AD_SP_MASK              0x00000f00
-#define        AD_SP_SHIFT             8
-#define        AD_ST_MASK              0x000000c0
-#define        AD_ST_SHIFT             6
-#define        AD_ST_SLAVE             0x00000000
-#define        AD_ST_BRIDGE            0x00000040
-#define        AD_ST_SWRAP             0x00000080
-#define        AD_ST_MWRAP             0x000000c0
-#define        AD_SZ_MASK              0x00000030
-#define        AD_SZ_SHIFT             4
-#define        AD_SZ_4K                0x00000000
-#define        AD_SZ_8K                0x00000010
-#define        AD_SZ_16K               0x00000020
-#define        AD_SZ_SZD               0x00000030
-#define        AD_AG32                 0x00000008
-#define        AD_ADDR_ALIGN           0x00000fff
-#define        AD_SZ_BASE              0x00001000      /* 4KB */
-
-/* EROM SizeDesc */
-#define        SD_SZ_MASK              0xfffff000
-#define        SD_SG32                 0x00000008
-#define        SD_SZ_ALIGN             0x00000fff
-
-typedef volatile struct _aidmp {
-       u32 oobselina30;        /* 0x000 */
-       u32 oobselina74;        /* 0x004 */
-       u32 PAD[6];
-       u32 oobselinb30;        /* 0x020 */
-       u32 oobselinb74;        /* 0x024 */
-       u32 PAD[6];
-       u32 oobselinc30;        /* 0x040 */
-       u32 oobselinc74;        /* 0x044 */
-       u32 PAD[6];
-       u32 oobselind30;        /* 0x060 */
-       u32 oobselind74;        /* 0x064 */
-       u32 PAD[38];
-       u32 oobselouta30;       /* 0x100 */
-       u32 oobselouta74;       /* 0x104 */
-       u32 PAD[6];
-       u32 oobseloutb30;       /* 0x120 */
-       u32 oobseloutb74;       /* 0x124 */
-       u32 PAD[6];
-       u32 oobseloutc30;       /* 0x140 */
-       u32 oobseloutc74;       /* 0x144 */
-       u32 PAD[6];
-       u32 oobseloutd30;       /* 0x160 */
-       u32 oobseloutd74;       /* 0x164 */
-       u32 PAD[38];
-       u32 oobsynca;   /* 0x200 */
-       u32 oobseloutaen;       /* 0x204 */
-       u32 PAD[6];
-       u32 oobsyncb;   /* 0x220 */
-       u32 oobseloutben;       /* 0x224 */
-       u32 PAD[6];
-       u32 oobsyncc;   /* 0x240 */
-       u32 oobseloutcen;       /* 0x244 */
-       u32 PAD[6];
-       u32 oobsyncd;   /* 0x260 */
-       u32 oobseloutden;       /* 0x264 */
-       u32 PAD[38];
-       u32 oobaextwidth;       /* 0x300 */
-       u32 oobainwidth;        /* 0x304 */
-       u32 oobaoutwidth;       /* 0x308 */
-       u32 PAD[5];
-       u32 oobbextwidth;       /* 0x320 */
-       u32 oobbinwidth;        /* 0x324 */
-       u32 oobboutwidth;       /* 0x328 */
-       u32 PAD[5];
-       u32 oobcextwidth;       /* 0x340 */
-       u32 oobcinwidth;        /* 0x344 */
-       u32 oobcoutwidth;       /* 0x348 */
-       u32 PAD[5];
-       u32 oobdextwidth;       /* 0x360 */
-       u32 oobdinwidth;        /* 0x364 */
-       u32 oobdoutwidth;       /* 0x368 */
-       u32 PAD[37];
-       u32 ioctrlset;  /* 0x400 */
-       u32 ioctrlclear;        /* 0x404 */
-       u32 ioctrl;             /* 0x408 */
-       u32 PAD[61];
-       u32 iostatus;   /* 0x500 */
-       u32 PAD[127];
-       u32 ioctrlwidth;        /* 0x700 */
-       u32 iostatuswidth;      /* 0x704 */
-       u32 PAD[62];
-       u32 resetctrl;  /* 0x800 */
-       u32 resetstatus;        /* 0x804 */
-       u32 resetreadid;        /* 0x808 */
-       u32 resetwriteid;       /* 0x80c */
-       u32 PAD[60];
-       u32 errlogctrl; /* 0x900 */
-       u32 errlogdone; /* 0x904 */
-       u32 errlogstatus;       /* 0x908 */
-       u32 errlogaddrlo;       /* 0x90c */
-       u32 errlogaddrhi;       /* 0x910 */
-       u32 errlogid;   /* 0x914 */
-       u32 errloguser; /* 0x918 */
-       u32 errlogflags;        /* 0x91c */
-       u32 PAD[56];
-       u32 intstatus;  /* 0xa00 */
-       u32 PAD[127];
-       u32 config;             /* 0xe00 */
-       u32 PAD[63];
-       u32 itcr;               /* 0xf00 */
-       u32 PAD[3];
-       u32 itipooba;   /* 0xf10 */
-       u32 itipoobb;   /* 0xf14 */
-       u32 itipoobc;   /* 0xf18 */
-       u32 itipoobd;   /* 0xf1c */
-       u32 PAD[4];
-       u32 itipoobaout;        /* 0xf30 */
-       u32 itipoobbout;        /* 0xf34 */
-       u32 itipoobcout;        /* 0xf38 */
-       u32 itipoobdout;        /* 0xf3c */
-       u32 PAD[4];
-       u32 itopooba;   /* 0xf50 */
-       u32 itopoobb;   /* 0xf54 */
-       u32 itopoobc;   /* 0xf58 */
-       u32 itopoobd;   /* 0xf5c */
-       u32 PAD[4];
-       u32 itopoobain; /* 0xf70 */
-       u32 itopoobbin; /* 0xf74 */
-       u32 itopoobcin; /* 0xf78 */
-       u32 itopoobdin; /* 0xf7c */
-       u32 PAD[4];
-       u32 itopreset;  /* 0xf90 */
-       u32 PAD[15];
-       u32 peripherialid4;     /* 0xfd0 */
-       u32 peripherialid5;     /* 0xfd4 */
-       u32 peripherialid6;     /* 0xfd8 */
-       u32 peripherialid7;     /* 0xfdc */
-       u32 peripherialid0;     /* 0xfe0 */
-       u32 peripherialid1;     /* 0xfe4 */
-       u32 peripherialid2;     /* 0xfe8 */
-       u32 peripherialid3;     /* 0xfec */
-       u32 componentid0;       /* 0xff0 */
-       u32 componentid1;       /* 0xff4 */
-       u32 componentid2;       /* 0xff8 */
-       u32 componentid3;       /* 0xffc */
-} aidmp_t;
-
-/* Out-of-band Router registers */
-#define        OOB_BUSCONFIG           0x020
-#define        OOB_STATUSA             0x100
-#define        OOB_STATUSB             0x104
-#define        OOB_STATUSC             0x108
-#define        OOB_STATUSD             0x10c
-#define        OOB_ENABLEA0            0x200
-#define        OOB_ENABLEA1            0x204
-#define        OOB_ENABLEA2            0x208
-#define        OOB_ENABLEA3            0x20c
-#define        OOB_ENABLEB0            0x280
-#define        OOB_ENABLEB1            0x284
-#define        OOB_ENABLEB2            0x288
-#define        OOB_ENABLEB3            0x28c
-#define        OOB_ENABLEC0            0x300
-#define        OOB_ENABLEC1            0x304
-#define        OOB_ENABLEC2            0x308
-#define        OOB_ENABLEC3            0x30c
-#define        OOB_ENABLED0            0x380
-#define        OOB_ENABLED1            0x384
-#define        OOB_ENABLED2            0x388
-#define        OOB_ENABLED3            0x38c
-#define        OOB_ITCR                0xf00
-#define        OOB_ITIPOOBA            0xf10
-#define        OOB_ITIPOOBB            0xf14
-#define        OOB_ITIPOOBC            0xf18
-#define        OOB_ITIPOOBD            0xf1c
-#define        OOB_ITOPOOBA            0xf30
-#define        OOB_ITOPOOBB            0xf34
-#define        OOB_ITOPOOBC            0xf38
-#define        OOB_ITOPOOBD            0xf3c
-
-/* DMP wrapper registers */
-#define        AI_OOBSELINA30          0x000
-#define        AI_OOBSELINA74          0x004
-#define        AI_OOBSELINB30          0x020
-#define        AI_OOBSELINB74          0x024
-#define        AI_OOBSELINC30          0x040
-#define        AI_OOBSELINC74          0x044
-#define        AI_OOBSELIND30          0x060
-#define        AI_OOBSELIND74          0x064
-#define        AI_OOBSELOUTA30         0x100
-#define        AI_OOBSELOUTA74         0x104
-#define        AI_OOBSELOUTB30         0x120
-#define        AI_OOBSELOUTB74         0x124
-#define        AI_OOBSELOUTC30         0x140
-#define        AI_OOBSELOUTC74         0x144
-#define        AI_OOBSELOUTD30         0x160
-#define        AI_OOBSELOUTD74         0x164
-#define        AI_OOBSYNCA             0x200
-#define        AI_OOBSELOUTAEN         0x204
-#define        AI_OOBSYNCB             0x220
-#define        AI_OOBSELOUTBEN         0x224
-#define        AI_OOBSYNCC             0x240
-#define        AI_OOBSELOUTCEN         0x244
-#define        AI_OOBSYNCD             0x260
-#define        AI_OOBSELOUTDEN         0x264
-#define        AI_OOBAEXTWIDTH         0x300
-#define        AI_OOBAINWIDTH          0x304
-#define        AI_OOBAOUTWIDTH         0x308
-#define        AI_OOBBEXTWIDTH         0x320
-#define        AI_OOBBINWIDTH          0x324
-#define        AI_OOBBOUTWIDTH         0x328
-#define        AI_OOBCEXTWIDTH         0x340
-#define        AI_OOBCINWIDTH          0x344
-#define        AI_OOBCOUTWIDTH         0x348
-#define        AI_OOBDEXTWIDTH         0x360
-#define        AI_OOBDINWIDTH          0x364
-#define        AI_OOBDOUTWIDTH         0x368
-
-#if    defined(__BIG_ENDIAN) && defined(BCMHND74K)
-/* Selective swapped defines for those registers we need in
- * big-endian code.
- */
-#define        AI_IOCTRLSET            0x404
-#define        AI_IOCTRLCLEAR          0x400
-#define        AI_IOCTRL               0x40c
-#define        AI_IOSTATUS             0x504
-#define        AI_RESETCTRL            0x804
-#define        AI_RESETSTATUS          0x800
-
-#else                          /* !__BIG_ENDIAN || !BCMHND74K */
-
-#define        AI_IOCTRLSET            0x400
-#define        AI_IOCTRLCLEAR          0x404
-#define        AI_IOCTRL               0x408
-#define        AI_IOSTATUS             0x500
-#define        AI_RESETCTRL            0x800
-#define        AI_RESETSTATUS          0x804
-
-#endif                         /* __BIG_ENDIAN && BCMHND74K */
-
-#define        AI_IOCTRLWIDTH          0x700
-#define        AI_IOSTATUSWIDTH        0x704
-
-#define        AI_RESETREADID          0x808
-#define        AI_RESETWRITEID         0x80c
-#define        AI_ERRLOGCTRL           0xa00
-#define        AI_ERRLOGDONE           0xa04
-#define        AI_ERRLOGSTATUS         0xa08
-#define        AI_ERRLOGADDRLO         0xa0c
-#define        AI_ERRLOGADDRHI         0xa10
-#define        AI_ERRLOGID             0xa14
-#define        AI_ERRLOGUSER           0xa18
-#define        AI_ERRLOGFLAGS          0xa1c
-#define        AI_INTSTATUS            0xa00
-#define        AI_CONFIG               0xe00
-#define        AI_ITCR                 0xf00
-#define        AI_ITIPOOBA             0xf10
-#define        AI_ITIPOOBB             0xf14
-#define        AI_ITIPOOBC             0xf18
-#define        AI_ITIPOOBD             0xf1c
-#define        AI_ITIPOOBAOUT          0xf30
-#define        AI_ITIPOOBBOUT          0xf34
-#define        AI_ITIPOOBCOUT          0xf38
-#define        AI_ITIPOOBDOUT          0xf3c
-#define        AI_ITOPOOBA             0xf50
-#define        AI_ITOPOOBB             0xf54
-#define        AI_ITOPOOBC             0xf58
-#define        AI_ITOPOOBD             0xf5c
-#define        AI_ITOPOOBAIN           0xf70
-#define        AI_ITOPOOBBIN           0xf74
-#define        AI_ITOPOOBCIN           0xf78
-#define        AI_ITOPOOBDIN           0xf7c
-#define        AI_ITOPRESET            0xf90
-#define        AI_PERIPHERIALID4       0xfd0
-#define        AI_PERIPHERIALID5       0xfd4
-#define        AI_PERIPHERIALID6       0xfd8
-#define        AI_PERIPHERIALID7       0xfdc
-#define        AI_PERIPHERIALID0       0xfe0
-#define        AI_PERIPHERIALID1       0xfe4
-#define        AI_PERIPHERIALID2       0xfe8
-#define        AI_PERIPHERIALID3       0xfec
-#define        AI_COMPONENTID0         0xff0
-#define        AI_COMPONENTID1         0xff4
-#define        AI_COMPONENTID2         0xff8
-#define        AI_COMPONENTID3         0xffc
-
-/* resetctrl */
-#define        AIRC_RESET              1
-
-/* config */
-#define        AICFG_OOB               0x00000020
-#define        AICFG_IOS               0x00000010
-#define        AICFG_IOC               0x00000008
-#define        AICFG_TO                0x00000004
-#define        AICFG_ERRL              0x00000002
-#define        AICFG_RST               0x00000001
-
-#endif                         /* _AIDMP_H */
index 89e6719f66e9b89c92649387f2adfe4bf3278db0..ccbd58f4e28429a5ea7e726f380c39d9734a458e 100644 (file)
@@ -17,9 +17,6 @@
 #ifndef        _BRCM_SOC_H
 #define        _BRCM_SOC_H
 
-/* Include the soci specific files */
-#include <aidmp.h>
-
 /*
  * SOC Interconnect Address Map.
  * All regions may not exist on all chips.