aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/pci/pci-bcm63xx.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2013-01-22 06:59:30 -0500
committerRalf Baechle <ralf@linux-mips.org>2013-02-01 04:00:22 -0500
commit7034228792cc561e79ff8600f02884bd4c80e287 (patch)
tree89b77af37d087d9de236fc5d21f60bf552d0a2c6 /arch/mips/pci/pci-bcm63xx.c
parent405ab01c70e18058d9c01a1256769a61fc65413e (diff)
MIPS: Whitespace cleanup.
Having received another series of whitespace patches I decided to do this once and for all rather than dealing with this kind of patches trickling in forever. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/pci/pci-bcm63xx.c')
-rw-r--r--arch/mips/pci/pci-bcm63xx.c62
1 files changed, 31 insertions, 31 deletions
diff --git a/arch/mips/pci/pci-bcm63xx.c b/arch/mips/pci/pci-bcm63xx.c
index ca179b6ff39b..88e781c6b5ba 100644
--- a/arch/mips/pci/pci-bcm63xx.c
+++ b/arch/mips/pci/pci-bcm63xx.c
@@ -25,21 +25,21 @@
25int bcm63xx_pci_enabled; 25int bcm63xx_pci_enabled;
26 26
27static struct resource bcm_pci_mem_resource = { 27static struct resource bcm_pci_mem_resource = {
28 .name = "bcm63xx PCI memory space", 28 .name = "bcm63xx PCI memory space",
29 .start = BCM_PCI_MEM_BASE_PA, 29 .start = BCM_PCI_MEM_BASE_PA,
30 .end = BCM_PCI_MEM_END_PA, 30 .end = BCM_PCI_MEM_END_PA,
31 .flags = IORESOURCE_MEM 31 .flags = IORESOURCE_MEM
32}; 32};
33 33
34static struct resource bcm_pci_io_resource = { 34static struct resource bcm_pci_io_resource = {
35 .name = "bcm63xx PCI IO space", 35 .name = "bcm63xx PCI IO space",
36 .start = BCM_PCI_IO_BASE_PA, 36 .start = BCM_PCI_IO_BASE_PA,
37#ifdef CONFIG_CARDBUS 37#ifdef CONFIG_CARDBUS
38 .end = BCM_PCI_IO_HALF_PA, 38 .end = BCM_PCI_IO_HALF_PA,
39#else 39#else
40 .end = BCM_PCI_IO_END_PA, 40 .end = BCM_PCI_IO_END_PA,
41#endif 41#endif
42 .flags = IORESOURCE_IO 42 .flags = IORESOURCE_IO
43}; 43};
44 44
45struct pci_controller bcm63xx_controller = { 45struct pci_controller bcm63xx_controller = {
@@ -55,17 +55,17 @@ struct pci_controller bcm63xx_controller = {
55 */ 55 */
56#ifdef CONFIG_CARDBUS 56#ifdef CONFIG_CARDBUS
57static struct resource bcm_cb_mem_resource = { 57static struct resource bcm_cb_mem_resource = {
58 .name = "bcm63xx Cardbus memory space", 58 .name = "bcm63xx Cardbus memory space",
59 .start = BCM_CB_MEM_BASE_PA, 59 .start = BCM_CB_MEM_BASE_PA,
60 .end = BCM_CB_MEM_END_PA, 60 .end = BCM_CB_MEM_END_PA,
61 .flags = IORESOURCE_MEM 61 .flags = IORESOURCE_MEM
62}; 62};
63 63
64static struct resource bcm_cb_io_resource = { 64static struct resource bcm_cb_io_resource = {
65 .name = "bcm63xx Cardbus IO space", 65 .name = "bcm63xx Cardbus IO space",
66 .start = BCM_PCI_IO_HALF_PA + 1, 66 .start = BCM_PCI_IO_HALF_PA + 1,
67 .end = BCM_PCI_IO_END_PA, 67 .end = BCM_PCI_IO_END_PA,
68 .flags = IORESOURCE_IO 68 .flags = IORESOURCE_IO
69}; 69};
70 70
71struct pci_controller bcm63xx_cb_controller = { 71struct pci_controller bcm63xx_cb_controller = {
@@ -76,17 +76,17 @@ struct pci_controller bcm63xx_cb_controller = {
76#endif 76#endif
77 77
78static struct resource bcm_pcie_mem_resource = { 78static struct resource bcm_pcie_mem_resource = {
79 .name = "bcm63xx PCIe memory space", 79 .name = "bcm63xx PCIe memory space",
80 .start = BCM_PCIE_MEM_BASE_PA, 80 .start = BCM_PCIE_MEM_BASE_PA,
81 .end = BCM_PCIE_MEM_END_PA, 81 .end = BCM_PCIE_MEM_END_PA,
82 .flags = IORESOURCE_MEM, 82 .flags = IORESOURCE_MEM,
83}; 83};
84 84
85static struct resource bcm_pcie_io_resource = { 85static struct resource bcm_pcie_io_resource = {
86 .name = "bcm63xx PCIe IO space", 86 .name = "bcm63xx PCIe IO space",
87 .start = 0, 87 .start = 0,
88 .end = 0, 88 .end = 0,
89 .flags = 0, 89 .flags = 0,
90}; 90};
91 91
92struct pci_controller bcm63xx_pcie_controller = { 92struct pci_controller bcm63xx_pcie_controller = {
@@ -111,7 +111,7 @@ static void bcm63xx_int_cfg_writel(u32 val, u32 reg)
111 u32 tmp; 111 u32 tmp;
112 112
113 tmp = reg & MPI_PCICFGCTL_CFGADDR_MASK; 113 tmp = reg & MPI_PCICFGCTL_CFGADDR_MASK;
114 tmp |= MPI_PCICFGCTL_WRITEEN_MASK; 114 tmp |= MPI_PCICFGCTL_WRITEEN_MASK;
115 bcm_mpi_writel(tmp, MPI_PCICFGCTL_REG); 115 bcm_mpi_writel(tmp, MPI_PCICFGCTL_REG);
116 bcm_mpi_writel(val, MPI_PCICFGDATA_REG); 116 bcm_mpi_writel(val, MPI_PCICFGDATA_REG);
117} 117}
@@ -211,7 +211,7 @@ static int __init bcm63xx_register_pci(void)
211 * first bytes to access it from CPU. 211 * first bytes to access it from CPU.
212 * 212 *
213 * this means that no io access from CPU should happen while 213 * this means that no io access from CPU should happen while
214 * we do a configuration cycle, but there's no way we can add 214 * we do a configuration cycle, but there's no way we can add
215 * a spinlock for each io access, so this is currently kind of 215 * a spinlock for each io access, so this is currently kind of
216 * broken on SMP. 216 * broken on SMP.
217 */ 217 */
@@ -244,9 +244,9 @@ static int __init bcm63xx_register_pci(void)
244 bcm_mpi_writel(0, MPI_L2PMEMREMAP2_REG); 244 bcm_mpi_writel(0, MPI_L2PMEMREMAP2_REG);
245#endif 245#endif
246 246
247 /* setup local bus to PCI access (IO memory), we have only 1 247 /* setup local bus to PCI access (IO memory), we have only 1
248 * IO window for both PCI and cardbus, but it cannot handle 248 * IO window for both PCI and cardbus, but it cannot handle
249 * both at the same time, assume standard PCI for now, if 249 * both at the same time, assume standard PCI for now, if
250 * cardbus card has IO zone, PCI fixup will change window to 250 * cardbus card has IO zone, PCI fixup will change window to
251 * cardbus */ 251 * cardbus */
252 val = BCM_PCI_IO_BASE_PA & MPI_L2P_BASE_MASK; 252 val = BCM_PCI_IO_BASE_PA & MPI_L2P_BASE_MASK;
@@ -284,7 +284,7 @@ static int __init bcm63xx_register_pci(void)
284 bcm_mpi_writel(0, MPI_SP1_RANGE_REG); 284 bcm_mpi_writel(0, MPI_SP1_RANGE_REG);
285 } 285 }
286 286
287 /* change host bridge retry counter to infinite number of 287 /* change host bridge retry counter to infinite number of
288 * retry, needed for some broadcom wifi cards with Silicon 288 * retry, needed for some broadcom wifi cards with Silicon
289 * Backplane bus where access to srom seems very slow */ 289 * Backplane bus where access to srom seems very slow */
290 val = bcm63xx_int_cfg_readl(BCMPCI_REG_TIMERS); 290 val = bcm63xx_int_cfg_readl(BCMPCI_REG_TIMERS);