mac80211: update to latest version, fix tx gain patch
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 845-brcmsmac-use-core-id-constants-from-bcma.patch
1 --- a/drivers/net/wireless/brcm80211/brcmsmac/dma.c
2 +++ b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
3 @@ -640,10 +640,10 @@ struct dma_pub *dma_attach(char *name, s
4 di->dataoffsetlow = di->ddoffsetlow;
5 di->dataoffsethigh = di->ddoffsethigh;
6 /* WAR64450 : DMACtl.Addr ext fields are not supported in SDIOD core. */
7 - if ((core->id.id == SDIOD_CORE_ID)
8 + if ((core->id.id == BCMA_CORE_SDIO_DEV)
9 && ((rev > 0) && (rev <= 2)))
10 di->addrext = false;
11 - else if ((core->id.id == I2S_CORE_ID) &&
12 + else if ((core->id.id == BCMA_CORE_I2S) &&
13 ((rev == 0) || (rev == 1)))
14 di->addrext = false;
15 else
16 --- a/drivers/net/wireless/brcm80211/include/soc.h
17 +++ b/drivers/net/wireless/brcm80211/include/soc.h
18 @@ -19,68 +19,6 @@
19
20 #define SI_ENUM_BASE 0x18000000 /* Enumeration space base */
21
22 -/* core codes */
23 -#define NODEV_CORE_ID 0x700 /* Invalid coreid */
24 -#define CC_CORE_ID 0x800 /* chipcommon core */
25 -#define ILINE20_CORE_ID 0x801 /* iline20 core */
26 -#define SRAM_CORE_ID 0x802 /* sram core */
27 -#define SDRAM_CORE_ID 0x803 /* sdram core */
28 -#define PCI_CORE_ID 0x804 /* pci core */
29 -#define MIPS_CORE_ID 0x805 /* mips core */
30 -#define ENET_CORE_ID 0x806 /* enet mac core */
31 -#define CODEC_CORE_ID 0x807 /* v90 codec core */
32 -#define USB_CORE_ID 0x808 /* usb 1.1 host/device core */
33 -#define ADSL_CORE_ID 0x809 /* ADSL core */
34 -#define ILINE100_CORE_ID 0x80a /* iline100 core */
35 -#define IPSEC_CORE_ID 0x80b /* ipsec core */
36 -#define UTOPIA_CORE_ID 0x80c /* utopia core */
37 -#define PCMCIA_CORE_ID 0x80d /* pcmcia core */
38 -#define SOCRAM_CORE_ID 0x80e /* internal memory core */
39 -#define MEMC_CORE_ID 0x80f /* memc sdram core */
40 -#define OFDM_CORE_ID 0x810 /* OFDM phy core */
41 -#define EXTIF_CORE_ID 0x811 /* external interface core */
42 -#define D11_CORE_ID 0x812 /* 802.11 MAC core */
43 -#define APHY_CORE_ID 0x813 /* 802.11a phy core */
44 -#define BPHY_CORE_ID 0x814 /* 802.11b phy core */
45 -#define GPHY_CORE_ID 0x815 /* 802.11g phy core */
46 -#define MIPS33_CORE_ID 0x816 /* mips3302 core */
47 -#define USB11H_CORE_ID 0x817 /* usb 1.1 host core */
48 -#define USB11D_CORE_ID 0x818 /* usb 1.1 device core */
49 -#define USB20H_CORE_ID 0x819 /* usb 2.0 host core */
50 -#define USB20D_CORE_ID 0x81a /* usb 2.0 device core */
51 -#define SDIOH_CORE_ID 0x81b /* sdio host core */
52 -#define ROBO_CORE_ID 0x81c /* roboswitch core */
53 -#define ATA100_CORE_ID 0x81d /* parallel ATA core */
54 -#define SATAXOR_CORE_ID 0x81e /* serial ATA & XOR DMA core */
55 -#define GIGETH_CORE_ID 0x81f /* gigabit ethernet core */
56 -#define PCIE_CORE_ID 0x820 /* pci express core */
57 -#define NPHY_CORE_ID 0x821 /* 802.11n 2x2 phy core */
58 -#define SRAMC_CORE_ID 0x822 /* SRAM controller core */
59 -#define MINIMAC_CORE_ID 0x823 /* MINI MAC/phy core */
60 -#define ARM11_CORE_ID 0x824 /* ARM 1176 core */
61 -#define ARM7S_CORE_ID 0x825 /* ARM7tdmi-s core */
62 -#define LPPHY_CORE_ID 0x826 /* 802.11a/b/g phy core */
63 -#define PMU_CORE_ID 0x827 /* PMU core */
64 -#define SSNPHY_CORE_ID 0x828 /* 802.11n single-stream phy core */
65 -#define SDIOD_CORE_ID 0x829 /* SDIO device core */
66 -#define ARMCM3_CORE_ID 0x82a /* ARM Cortex M3 core */
67 -#define HTPHY_CORE_ID 0x82b /* 802.11n 4x4 phy core */
68 -#define MIPS74K_CORE_ID 0x82c /* mips 74k core */
69 -#define GMAC_CORE_ID 0x82d /* Gigabit MAC core */
70 -#define DMEMC_CORE_ID 0x82e /* DDR1/2 memory controller core */
71 -#define PCIERC_CORE_ID 0x82f /* PCIE Root Complex core */
72 -#define OCP_CORE_ID 0x830 /* OCP2OCP bridge core */
73 -#define SC_CORE_ID 0x831 /* shared common core */
74 -#define AHB_CORE_ID 0x832 /* OCP2AHB bridge core */
75 -#define SPIH_CORE_ID 0x833 /* SPI host core */
76 -#define I2S_CORE_ID 0x834 /* I2S core */
77 -#define DMEMS_CORE_ID 0x835 /* SDR/DDR1 memory controller core */
78 -#define DEF_SHIM_COMP 0x837 /* SHIM component in ubus/6362 */
79 -#define OOB_ROUTER_CORE_ID 0x367 /* OOB router core ID */
80 -#define DEF_AI_COMP 0xfff /* Default component, in ai chips it
81 - * maps all unused address ranges
82 - */
83 -
84 /* Common core control flags */
85 #define SICF_BIST_EN 0x8000
86 #define SICF_PME_EN 0x4000