staging: brcm80211: move PCI related header files to appropriate driver folder

The include file pcicfg.h is now only required by brcmfmac driver. Similarly,
nicpci.h is only required by brcmsmac driver. These header files have been
moved to the appropriate driver specific folder.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmfmac/pcicfg.h b/drivers/staging/brcm80211/brcmfmac/pcicfg.h
new file mode 100644 (file)
index 0000000..d0c617a
--- /dev/null
+++ b/drivers/staging/brcm80211/brcmfmac/pcicfg.h
@@ -0,0 +1,50 @@
+/*
+ * 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        _h_pcicfg_
+#define        _h_pcicfg_
+
+#include <linux/pci_regs.h>
+
+/* PCI configuration address space size */
+#define PCI_SZPCR              256
+
+/* Everything below is BRCM HND proprietary */
+
+/* Brcm PCI configuration registers */
+#define PCI_BAR0_WIN           0x80    /* backplane address space accessed by BAR0 */
+#define PCI_SPROM_CONTROL      0x88    /* sprom property control */
+#define PCI_INT_MASK           0x94    /* mask of PCI and other cores interrupts */
+#define  PCI_SBIM_SHIFT                8       /* backplane core interrupt mask bits offset */
+#define PCI_BAR0_WIN2          0xac    /* backplane address space accessed by second 4KB of BAR0 */
+#define PCI_GPIO_IN            0xb0    /* pci config space gpio input (>=rev3) */
+#define PCI_GPIO_OUT           0xb4    /* pci config space gpio output (>=rev3) */
+#define PCI_GPIO_OUTEN         0xb8    /* pci config space gpio output enable (>=rev3) */
+
+#define PCI_BAR0_SPROM_OFFSET  (4 * 1024)      /* bar0 + 4K accesses external sprom */
+#define PCI_BAR0_PCIREGS_OFFSET        (6 * 1024)      /* bar0 + 6K accesses pci core registers */
+#define PCI_BAR0_PCISBR_OFFSET (4 * 1024)      /* pci core SB registers are at the end of the
+                                                * 8KB window, so their address is the "regular"
+                                                * address plus 4K
+                                                */
+#define PCI_BAR0_WINSZ         (16 * 1024)     /* bar0 window size Match with corerev 13 */
+/* On pci corerev >= 13 and all pcie, the bar0 is now 16KB and it maps: */
+#define PCI_16KB0_PCIREGS_OFFSET (8 * 1024)    /* bar0 + 8K accesses pci/pcie core registers */
+#define PCI_16KB0_CCREGS_OFFSET        (12 * 1024)     /* bar0 + 12K accesses chipc core registers */
+
+#define PCI_SBIM_STATUS_SERR   0x4     /* backplane SBErr interrupt status */
+
+#endif                         /* _h_pcicfg_ */

diff --git a/drivers/staging/brcm80211/brcmsmac/nicpci.h b/drivers/staging/brcm80211/brcmsmac/nicpci.h
new file mode 100644 (file)
index 0000000..e9058c6
--- /dev/null
+++ b/drivers/staging/brcm80211/brcmsmac/nicpci.h
@@ -0,0 +1,92 @@
+/*
+ * 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        _NICPCI_H
+#define        _NICPCI_H
+
+/* PCI configuration address space size */
+#define PCI_SZPCR              256
+
+/* Brcm PCI configuration registers */
+/* backplane address space accessed by BAR0 */
+#define PCI_BAR0_WIN           0x80
+/* sprom property control */
+#define PCI_SPROM_CONTROL      0x88
+/* mask of PCI and other cores interrupts */
+#define PCI_INT_MASK           0x94
+/* backplane core interrupt mask bits offset */
+#define  PCI_SBIM_SHIFT                8
+/* backplane address space accessed by second 4KB of BAR0 */
+#define PCI_BAR0_WIN2          0xac
+/* pci config space gpio input (>=rev3) */
+#define PCI_GPIO_IN            0xb0
+/* pci config space gpio output (>=rev3) */
+#define PCI_GPIO_OUT           0xb4
+/* pci config space gpio output enable (>=rev3) */
+#define PCI_GPIO_OUTEN         0xb8
+
+/* bar0 + 4K accesses external sprom */
+#define PCI_BAR0_SPROM_OFFSET  (4 * 1024)
+/* bar0 + 6K accesses pci core registers */
+#define PCI_BAR0_PCIREGS_OFFSET        (6 * 1024)
+/*
+ * pci core SB registers are at the end of the
+ * 8KB window, so their address is the "regular"
+ * address plus 4K
+ */
+#define PCI_BAR0_PCISBR_OFFSET (4 * 1024)
+/* bar0 window size Match with corerev 13 */
+#define PCI_BAR0_WINSZ         (16 * 1024)
+/* On pci corerev >= 13 and all pcie, the bar0 is now 16KB and it maps: */
+/* bar0 + 8K accesses pci/pcie core registers */
+#define PCI_16KB0_PCIREGS_OFFSET (8 * 1024)
+/* bar0 + 12K accesses chipc core registers */
+#define PCI_16KB0_CCREGS_OFFSET        (12 * 1024)
+
+struct sbpcieregs;
+struct si_pub;
+
+extern u8 pcicore_find_pci_capability(void *dev, u8 req_cap_id,
+                                        unsigned char *buf, u32 *buflen);
+extern uint pcie_readreg(struct sbpcieregs *pcieregs,
+                        uint addrtype, uint offset);
+extern uint pcie_writereg(struct sbpcieregs *pcieregs,
+                         uint addrtype, uint offset, uint val);
+
+extern u8 pcie_clkreq(void *pch, u32 mask, u32 val);
+extern u32 pcie_lcreg(void *pch, u32 mask, u32 val);
+
+extern void *pcicore_init(struct si_pub *sih, void *pdev, void *regs);
+extern void pcicore_deinit(void *pch);
+extern void pcicore_attach(void *pch, char *pvars, int state);
+extern void pcicore_hwup(void *pch);
+extern void pcicore_up(void *pch, int state);
+extern void pcicore_sleep(void *pch);
+extern void pcicore_down(void *pch, int state);
+
+extern void pcie_war_ovr_aspm_update(void *pch, u8 aspm);
+extern u32 pcicore_pcieserdesreg(void *pch, u32 mdioslave, u32 offset,
+                                   u32 mask, u32 val);
+
+extern u32 pcicore_pciereg(void *pch, u32 offset, u32 mask,
+                             u32 val, uint type);
+
+extern bool pcicore_pmecap_fast(void *pch);
+extern void pcicore_pmeen(void *pch);
+extern void pcicore_pmeclr(void *pch);
+extern bool pcicore_pmestat(void *pch);
+
+#endif /* _NICPCI_H */

diff --git a/drivers/staging/brcm80211/include/nicpci.h b/drivers/staging/brcm80211/include/nicpci.h
deleted file mode 100644 (file)
index e9058c6..0000000
--- a/drivers/staging/brcm80211/include/nicpci.h
+++ /dev/null
@@ -1,92 +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        _NICPCI_H
-#define        _NICPCI_H
-
-/* PCI configuration address space size */
-#define PCI_SZPCR              256
-
-/* Brcm PCI configuration registers */
-/* backplane address space accessed by BAR0 */
-#define PCI_BAR0_WIN           0x80
-/* sprom property control */
-#define PCI_SPROM_CONTROL      0x88
-/* mask of PCI and other cores interrupts */
-#define PCI_INT_MASK           0x94
-/* backplane core interrupt mask bits offset */
-#define  PCI_SBIM_SHIFT                8
-/* backplane address space accessed by second 4KB of BAR0 */
-#define PCI_BAR0_WIN2          0xac
-/* pci config space gpio input (>=rev3) */
-#define PCI_GPIO_IN            0xb0
-/* pci config space gpio output (>=rev3) */
-#define PCI_GPIO_OUT           0xb4
-/* pci config space gpio output enable (>=rev3) */
-#define PCI_GPIO_OUTEN         0xb8
-
-/* bar0 + 4K accesses external sprom */
-#define PCI_BAR0_SPROM_OFFSET  (4 * 1024)
-/* bar0 + 6K accesses pci core registers */
-#define PCI_BAR0_PCIREGS_OFFSET        (6 * 1024)
-/*
- * pci core SB registers are at the end of the
- * 8KB window, so their address is the "regular"
- * address plus 4K
- */
-#define PCI_BAR0_PCISBR_OFFSET (4 * 1024)
-/* bar0 window size Match with corerev 13 */
-#define PCI_BAR0_WINSZ         (16 * 1024)
-/* On pci corerev >= 13 and all pcie, the bar0 is now 16KB and it maps: */
-/* bar0 + 8K accesses pci/pcie core registers */
-#define PCI_16KB0_PCIREGS_OFFSET (8 * 1024)
-/* bar0 + 12K accesses chipc core registers */
-#define PCI_16KB0_CCREGS_OFFSET        (12 * 1024)
-
-struct sbpcieregs;
-struct si_pub;
-
-extern u8 pcicore_find_pci_capability(void *dev, u8 req_cap_id,
-                                        unsigned char *buf, u32 *buflen);
-extern uint pcie_readreg(struct sbpcieregs *pcieregs,
-                        uint addrtype, uint offset);
-extern uint pcie_writereg(struct sbpcieregs *pcieregs,
-                         uint addrtype, uint offset, uint val);
-
-extern u8 pcie_clkreq(void *pch, u32 mask, u32 val);
-extern u32 pcie_lcreg(void *pch, u32 mask, u32 val);
-
-extern void *pcicore_init(struct si_pub *sih, void *pdev, void *regs);
-extern void pcicore_deinit(void *pch);
-extern void pcicore_attach(void *pch, char *pvars, int state);
-extern void pcicore_hwup(void *pch);
-extern void pcicore_up(void *pch, int state);
-extern void pcicore_sleep(void *pch);
-extern void pcicore_down(void *pch, int state);
-
-extern void pcie_war_ovr_aspm_update(void *pch, u8 aspm);
-extern u32 pcicore_pcieserdesreg(void *pch, u32 mdioslave, u32 offset,
-                                   u32 mask, u32 val);
-
-extern u32 pcicore_pciereg(void *pch, u32 offset, u32 mask,
-                             u32 val, uint type);
-
-extern bool pcicore_pmecap_fast(void *pch);
-extern void pcicore_pmeen(void *pch);
-extern void pcicore_pmeclr(void *pch);
-extern bool pcicore_pmestat(void *pch);
-
-#endif /* _NICPCI_H */

diff --git a/drivers/staging/brcm80211/include/pcicfg.h b/drivers/staging/brcm80211/include/pcicfg.h
deleted file mode 100644 (file)
index d0c617a..0000000
--- a/drivers/staging/brcm80211/include/pcicfg.h
+++ /dev/null
@@ -1,50 +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        _h_pcicfg_
-#define        _h_pcicfg_
-
-#include <linux/pci_regs.h>
-
-/* PCI configuration address space size */
-#define PCI_SZPCR              256
-
-/* Everything below is BRCM HND proprietary */
-
-/* Brcm PCI configuration registers */
-#define PCI_BAR0_WIN           0x80    /* backplane address space accessed by BAR0 */
-#define PCI_SPROM_CONTROL      0x88    /* sprom property control */
-#define PCI_INT_MASK           0x94    /* mask of PCI and other cores interrupts */
-#define  PCI_SBIM_SHIFT                8       /* backplane core interrupt mask bits offset */
-#define PCI_BAR0_WIN2          0xac    /* backplane address space accessed by second 4KB of BAR0 */
-#define PCI_GPIO_IN            0xb0    /* pci config space gpio input (>=rev3) */
-#define PCI_GPIO_OUT           0xb4    /* pci config space gpio output (>=rev3) */
-#define PCI_GPIO_OUTEN         0xb8    /* pci config space gpio output enable (>=rev3) */
-
-#define PCI_BAR0_SPROM_OFFSET  (4 * 1024)      /* bar0 + 4K accesses external sprom */
-#define PCI_BAR0_PCIREGS_OFFSET        (6 * 1024)      /* bar0 + 6K accesses pci core registers */
-#define PCI_BAR0_PCISBR_OFFSET (4 * 1024)      /* pci core SB registers are at the end of the
-                                                * 8KB window, so their address is the "regular"
-                                                * address plus 4K
-                                                */
-#define PCI_BAR0_WINSZ         (16 * 1024)     /* bar0 window size Match with corerev 13 */
-/* On pci corerev >= 13 and all pcie, the bar0 is now 16KB and it maps: */
-#define PCI_16KB0_PCIREGS_OFFSET (8 * 1024)    /* bar0 + 8K accesses pci/pcie core registers */
-#define PCI_16KB0_CCREGS_OFFSET        (12 * 1024)     /* bar0 + 12K accesses chipc core registers */
-
-#define PCI_SBIM_STATUS_SERR   0x4     /* backplane SBErr interrupt status */
-
-#endif                         /* _h_pcicfg_ */