diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-04-25 16:31:32 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@cam.org> | 2008-04-28 15:59:19 -0400 |
commit | b46926bb2d9977799c88aef17a4386ee02c326d8 (patch) | |
tree | 39bd519e97568d13c141d41457519de37ef4bbe6 /arch/arm | |
parent | 994cab846422bc9c636cc780a48b7370e837a3bb (diff) |
[ARM] Orion: catch a couple more alternative spellings of PCIe
Unify a couple more spellings of "PCIe" ("PCI-E", "PCIE".)
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-orion5x/addr-map.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/common.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/dns323-setup.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/kurobox_pro-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/rd88f5182-setup.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/ts209-setup.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c index 6b179371e0a2..9608503d67f5 100644 --- a/arch/arm/mach-orion5x/addr-map.c +++ b/arch/arm/mach-orion5x/addr-map.c | |||
@@ -19,14 +19,14 @@ | |||
19 | 19 | ||
20 | /* | 20 | /* |
21 | * The Orion has fully programable address map. There's a separate address | 21 | * The Orion has fully programable address map. There's a separate address |
22 | * map for each of the device _master_ interfaces, e.g. CPU, PCI, PCIE, USB, | 22 | * map for each of the device _master_ interfaces, e.g. CPU, PCI, PCIe, USB, |
23 | * Gigabit Ethernet, DMA/XOR engines, etc. Each interface has its own | 23 | * Gigabit Ethernet, DMA/XOR engines, etc. Each interface has its own |
24 | * address decode windows that allow it to access any of the Orion resources. | 24 | * address decode windows that allow it to access any of the Orion resources. |
25 | * | 25 | * |
26 | * CPU address decoding -- | 26 | * CPU address decoding -- |
27 | * Linux assumes that it is the boot loader that already setup the access to | 27 | * Linux assumes that it is the boot loader that already setup the access to |
28 | * DDR and internal registers. | 28 | * DDR and internal registers. |
29 | * Setup access to PCI and PCI-E IO/MEM space is issued by this file. | 29 | * Setup access to PCI and PCIe IO/MEM space is issued by this file. |
30 | * Setup access to various devices located on the device bus interface (e.g. | 30 | * Setup access to various devices located on the device bus interface (e.g. |
31 | * flashes, RTC, etc) should be issued by machine-setup.c according to | 31 | * flashes, RTC, etc) should be issued by machine-setup.c according to |
32 | * specific board population (by using orion5x_setup_*_win()). | 32 | * specific board population (by using orion5x_setup_*_win()). |
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index c13800b8e372..968deb58be01 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c | |||
@@ -317,7 +317,7 @@ struct sys_timer orion5x_timer = { | |||
317 | ****************************************************************************/ | 317 | ****************************************************************************/ |
318 | 318 | ||
319 | /* | 319 | /* |
320 | * Identify device ID and rev from PCIE configuration header space '0'. | 320 | * Identify device ID and rev from PCIe configuration header space '0'. |
321 | */ | 321 | */ |
322 | static void __init orion5x_id(u32 *dev, u32 *rev, char **dev_name) | 322 | static void __init orion5x_id(u32 *dev, u32 *rev, char **dev_name) |
323 | { | 323 | { |
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c index 46181737fb75..5bc064b8bb44 100644 --- a/arch/arm/mach-orion5x/dns323-setup.c +++ b/arch/arm/mach-orion5x/dns323-setup.c | |||
@@ -258,9 +258,9 @@ static void __init dns323_init(void) | |||
258 | */ | 258 | */ |
259 | orion5x_setup_dev_boot_win(DNS323_NOR_BOOT_BASE, DNS323_NOR_BOOT_SIZE); | 259 | orion5x_setup_dev_boot_win(DNS323_NOR_BOOT_BASE, DNS323_NOR_BOOT_SIZE); |
260 | 260 | ||
261 | /* DNS-323 has a Marvell 88X7042 SATA controller attached via PCIE | 261 | /* DNS-323 has a Marvell 88X7042 SATA controller attached via PCIe |
262 | * | 262 | * |
263 | * Open a special address decode windows for the PCIE WA. | 263 | * Open a special address decode windows for the PCIe WA. |
264 | */ | 264 | */ |
265 | orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE, | 265 | orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE, |
266 | ORION5X_PCIE_WA_SIZE); | 266 | ORION5X_PCIE_WA_SIZE); |
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c index 36cf76388693..36760c6e54c0 100644 --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c | |||
@@ -199,7 +199,7 @@ static void __init kurobox_pro_init(void) | |||
199 | orion5x_setup_dev0_win(KUROBOX_PRO_NAND_BASE, KUROBOX_PRO_NAND_SIZE); | 199 | orion5x_setup_dev0_win(KUROBOX_PRO_NAND_BASE, KUROBOX_PRO_NAND_SIZE); |
200 | 200 | ||
201 | /* | 201 | /* |
202 | * Open a special address decode windows for the PCIE WA. | 202 | * Open a special address decode windows for the PCIe WA. |
203 | */ | 203 | */ |
204 | orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE, | 204 | orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE, |
205 | ORION5X_PCIE_WA_SIZE); | 205 | ORION5X_PCIE_WA_SIZE); |
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c index b4315dfd4a35..aebe6b8e5059 100644 --- a/arch/arm/mach-orion5x/rd88f5182-setup.c +++ b/arch/arm/mach-orion5x/rd88f5182-setup.c | |||
@@ -262,7 +262,7 @@ static void __init rd88f5182_init(void) | |||
262 | orion5x_setup_dev1_win(RD88F5182_NOR_BASE, RD88F5182_NOR_SIZE); | 262 | orion5x_setup_dev1_win(RD88F5182_NOR_BASE, RD88F5182_NOR_SIZE); |
263 | 263 | ||
264 | /* | 264 | /* |
265 | * Open a special address decode windows for the PCIE WA. | 265 | * Open a special address decode windows for the PCIe WA. |
266 | */ | 266 | */ |
267 | orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE, | 267 | orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE, |
268 | ORION5X_PCIE_WA_SIZE); | 268 | ORION5X_PCIE_WA_SIZE); |
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c index d3a892283dd0..161c965f3906 100644 --- a/arch/arm/mach-orion5x/ts209-setup.c +++ b/arch/arm/mach-orion5x/ts209-setup.c | |||
@@ -376,7 +376,7 @@ static void __init qnap_ts209_init(void) | |||
376 | QNAP_TS209_NOR_BOOT_SIZE); | 376 | QNAP_TS209_NOR_BOOT_SIZE); |
377 | 377 | ||
378 | /* | 378 | /* |
379 | * Open a special address decode windows for the PCIE WA. | 379 | * Open a special address decode windows for the PCIe WA. |
380 | */ | 380 | */ |
381 | orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE, | 381 | orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE, |
382 | ORION5X_PCIE_WA_SIZE); | 382 | ORION5X_PCIE_WA_SIZE); |