diff options
Diffstat (limited to 'arch/ppc/syslib')
| -rw-r--r-- | arch/ppc/syslib/harrier.c | 2 | ||||
| -rw-r--r-- | arch/ppc/syslib/hawk_common.c | 4 | ||||
| -rw-r--r-- | arch/ppc/syslib/m82xx_pci.c | 2 | ||||
| -rw-r--r-- | arch/ppc/syslib/mpc10x_common.c | 4 | ||||
| -rw-r--r-- | arch/ppc/syslib/mpc52xx_setup.c | 2 | ||||
| -rw-r--r-- | arch/ppc/syslib/mpc8xx_devices.c | 2 | ||||
| -rw-r--r-- | arch/ppc/syslib/mv64x60.c | 10 | ||||
| -rw-r--r-- | arch/ppc/syslib/ocp.c | 2 | ||||
| -rw-r--r-- | arch/ppc/syslib/ppc403_pic.c | 2 | ||||
| -rw-r--r-- | arch/ppc/syslib/ppc405_pci.c | 2 | ||||
| -rw-r--r-- | arch/ppc/syslib/ppc4xx_dma.c | 2 | ||||
| -rw-r--r-- | arch/ppc/syslib/ppc85xx_rio.c | 4 | ||||
| -rw-r--r-- | arch/ppc/syslib/xilinx_pic.c | 2 |
13 files changed, 20 insertions, 20 deletions
diff --git a/arch/ppc/syslib/harrier.c b/arch/ppc/syslib/harrier.c index c1583f488325..45b797b3a336 100644 --- a/arch/ppc/syslib/harrier.c +++ b/arch/ppc/syslib/harrier.c | |||
| @@ -210,7 +210,7 @@ harrier_init(struct pci_controller *hose, | |||
| 210 | * This assumes that PPCBug has initialized the memory controller (SMC) | 210 | * This assumes that PPCBug has initialized the memory controller (SMC) |
| 211 | * on the Harrier correctly (i.e., it does no sanity checking). | 211 | * on the Harrier correctly (i.e., it does no sanity checking). |
| 212 | * It also assumes that the memory base registers are set to configure the | 212 | * It also assumes that the memory base registers are set to configure the |
| 213 | * memory as contigous starting with "RAM A BASE", "RAM B BASE", etc. | 213 | * memory as contiguous starting with "RAM A BASE", "RAM B BASE", etc. |
| 214 | * however, RAM base registers can be skipped (e.g. A, B, C are set, | 214 | * however, RAM base registers can be skipped (e.g. A, B, C are set, |
| 215 | * D is skipped but E is set is okay). | 215 | * D is skipped but E is set is okay). |
| 216 | */ | 216 | */ |
diff --git a/arch/ppc/syslib/hawk_common.c b/arch/ppc/syslib/hawk_common.c index c5bf16b0d6a1..86821d8753ed 100644 --- a/arch/ppc/syslib/hawk_common.c +++ b/arch/ppc/syslib/hawk_common.c | |||
| @@ -165,7 +165,7 @@ hawk_init(struct pci_controller *hose, | |||
| 165 | processor_pci_mem_start + | 165 | processor_pci_mem_start + |
| 166 | hose->mem_space.start) | 0x0); | 166 | hose->mem_space.start) | 0x0); |
| 167 | 167 | ||
| 168 | /* Map MPIC into vitual memory */ | 168 | /* Map MPIC into virtual memory */ |
| 169 | OpenPIC_Addr = ioremap(processor_mpic_base, HAWK_MPIC_SIZE); | 169 | OpenPIC_Addr = ioremap(processor_mpic_base, HAWK_MPIC_SIZE); |
| 170 | 170 | ||
| 171 | return 0; | 171 | return 0; |
| @@ -176,7 +176,7 @@ hawk_init(struct pci_controller *hose, | |||
| 176 | * This assumes that PPCBug has initialized the memory controller (SMC) | 176 | * This assumes that PPCBug has initialized the memory controller (SMC) |
| 177 | * on the Falcon/HAWK correctly (i.e., it does no sanity checking). | 177 | * on the Falcon/HAWK correctly (i.e., it does no sanity checking). |
| 178 | * It also assumes that the memory base registers are set to configure the | 178 | * It also assumes that the memory base registers are set to configure the |
| 179 | * memory as contigous starting with "RAM A BASE", "RAM B BASE", etc. | 179 | * memory as contiguous starting with "RAM A BASE", "RAM B BASE", etc. |
| 180 | * however, RAM base registers can be skipped (e.g. A, B, C are set, | 180 | * however, RAM base registers can be skipped (e.g. A, B, C are set, |
| 181 | * D is skipped but E is set is okay). | 181 | * D is skipped but E is set is okay). |
| 182 | */ | 182 | */ |
diff --git a/arch/ppc/syslib/m82xx_pci.c b/arch/ppc/syslib/m82xx_pci.c index e3b586b1ede9..fe860d52e2e4 100644 --- a/arch/ppc/syslib/m82xx_pci.c +++ b/arch/ppc/syslib/m82xx_pci.c | |||
| @@ -197,7 +197,7 @@ pq2ads_setup_pci(struct pci_controller *hose) | |||
| 197 | CPM high 0b0000 | 197 | CPM high 0b0000 |
| 198 | CPM middle 0b0001 | 198 | CPM middle 0b0001 |
| 199 | CPM low 0b0010 | 199 | CPM low 0b0010 |
| 200 | PCI reguest 0b0011 | 200 | PCI request 0b0011 |
| 201 | Reserved 0b0100 | 201 | Reserved 0b0100 |
| 202 | Reserved 0b0101 | 202 | Reserved 0b0101 |
| 203 | Internal Core 0b0110 | 203 | Internal Core 0b0110 |
diff --git a/arch/ppc/syslib/mpc10x_common.c b/arch/ppc/syslib/mpc10x_common.c index 2fc7c4150a18..437a294527a9 100644 --- a/arch/ppc/syslib/mpc10x_common.c +++ b/arch/ppc/syslib/mpc10x_common.c | |||
| @@ -432,7 +432,7 @@ mpc10x_bridge_init(struct pci_controller *hose, | |||
| 432 | phys_eumb_base); | 432 | phys_eumb_base); |
| 433 | } | 433 | } |
| 434 | 434 | ||
| 435 | /* IRQ's are determined at runtime */ | 435 | /* IRQs are determined at runtime */ |
| 436 | ppc_sys_platform_devices[MPC10X_IIC1].resource[1].start = MPC10X_I2C_IRQ; | 436 | ppc_sys_platform_devices[MPC10X_IIC1].resource[1].start = MPC10X_I2C_IRQ; |
| 437 | ppc_sys_platform_devices[MPC10X_IIC1].resource[1].end = MPC10X_I2C_IRQ; | 437 | ppc_sys_platform_devices[MPC10X_IIC1].resource[1].end = MPC10X_I2C_IRQ; |
| 438 | ppc_sys_platform_devices[MPC10X_DMA0].resource[1].start = MPC10X_DMA0_IRQ; | 438 | ppc_sys_platform_devices[MPC10X_DMA0].resource[1].start = MPC10X_DMA0_IRQ; |
| @@ -646,7 +646,7 @@ void __init mpc10x_set_openpic(void) | |||
| 646 | openpic_set_sources(EPIC_IRQ_BASE, 3, OpenPIC_Addr + 0x11020); | 646 | openpic_set_sources(EPIC_IRQ_BASE, 3, OpenPIC_Addr + 0x11020); |
| 647 | /* Skip reserved space and map Message Unit Interrupt (I2O) */ | 647 | /* Skip reserved space and map Message Unit Interrupt (I2O) */ |
| 648 | openpic_set_sources(EPIC_IRQ_BASE + 3, 1, OpenPIC_Addr + 0x110C0); | 648 | openpic_set_sources(EPIC_IRQ_BASE + 3, 1, OpenPIC_Addr + 0x110C0); |
| 649 | /* Skip reserved space and map Serial Interupts */ | 649 | /* Skip reserved space and map Serial Interrupts */ |
| 650 | openpic_set_sources(EPIC_IRQ_BASE + 4, 2, OpenPIC_Addr + 0x11120); | 650 | openpic_set_sources(EPIC_IRQ_BASE + 4, 2, OpenPIC_Addr + 0x11120); |
| 651 | 651 | ||
| 652 | openpic_init(NUM_8259_INTERRUPTS); | 652 | openpic_init(NUM_8259_INTERRUPTS); |
diff --git a/arch/ppc/syslib/mpc52xx_setup.c b/arch/ppc/syslib/mpc52xx_setup.c index 80c609019bda..ecfa2c0f8ba3 100644 --- a/arch/ppc/syslib/mpc52xx_setup.c +++ b/arch/ppc/syslib/mpc52xx_setup.c | |||
| @@ -252,7 +252,7 @@ mpc52xx_setup_cpu(void) | |||
| 252 | out_be32(&xlb->snoop_window, MPC52xx_PCI_TARGET_MEM | 0x1d); | 252 | out_be32(&xlb->snoop_window, MPC52xx_PCI_TARGET_MEM | 0x1d); |
| 253 | 253 | ||
| 254 | /* Disable XLB pipelining */ | 254 | /* Disable XLB pipelining */ |
| 255 | /* (cfr errate 292. We could do this only just before ATA PIO | 255 | /* (cfr errata 292. We could do this only just before ATA PIO |
| 256 | transaction and re-enable it after ...) */ | 256 | transaction and re-enable it after ...) */ |
| 257 | out_be32(&xlb->config, in_be32(&xlb->config) | MPC52xx_XLB_CFG_PLDIS); | 257 | out_be32(&xlb->config, in_be32(&xlb->config) | MPC52xx_XLB_CFG_PLDIS); |
| 258 | 258 | ||
diff --git a/arch/ppc/syslib/mpc8xx_devices.c b/arch/ppc/syslib/mpc8xx_devices.c index 31fb56593d17..c05ac87ece4c 100644 --- a/arch/ppc/syslib/mpc8xx_devices.c +++ b/arch/ppc/syslib/mpc8xx_devices.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
| 22 | #include <asm/ppc_sys.h> | 22 | #include <asm/ppc_sys.h> |
| 23 | 23 | ||
| 24 | /* We use offsets for IORESOURCE_MEM to do not set dependences at compile time. | 24 | /* We use offsets for IORESOURCE_MEM to do not set dependencies at compile time. |
| 25 | * They will get fixed up by mach_mpc8xx_fixup | 25 | * They will get fixed up by mach_mpc8xx_fixup |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c index a6f8b686ea83..8485a68cd475 100644 --- a/arch/ppc/syslib/mv64x60.c +++ b/arch/ppc/syslib/mv64x60.c | |||
| @@ -490,7 +490,7 @@ static struct platform_device *mv64x60_pd_devs[] __initdata = { | |||
| 490 | /* | 490 | /* |
| 491 | * mv64x60_init() | 491 | * mv64x60_init() |
| 492 | * | 492 | * |
| 493 | * Initialze the bridge based on setting passed in via 'si'. The bridge | 493 | * Initialize the bridge based on setting passed in via 'si'. The bridge |
| 494 | * handle, 'bh', will be set so that it can be used to make subsequent | 494 | * handle, 'bh', will be set so that it can be used to make subsequent |
| 495 | * calls to routines in this file. | 495 | * calls to routines in this file. |
| 496 | */ | 496 | */ |
| @@ -1704,7 +1704,7 @@ gt64260_disable_all_windows(struct mv64x60_handle *bh, | |||
| 1704 | /* | 1704 | /* |
| 1705 | * gt64260a_chip_specific_init() | 1705 | * gt64260a_chip_specific_init() |
| 1706 | * | 1706 | * |
| 1707 | * Implement errata work arounds for the GT64260A. | 1707 | * Implement errata workarounds for the GT64260A. |
| 1708 | */ | 1708 | */ |
| 1709 | static void __init | 1709 | static void __init |
| 1710 | gt64260a_chip_specific_init(struct mv64x60_handle *bh, | 1710 | gt64260a_chip_specific_init(struct mv64x60_handle *bh, |
| @@ -1776,7 +1776,7 @@ gt64260a_chip_specific_init(struct mv64x60_handle *bh, | |||
| 1776 | /* | 1776 | /* |
| 1777 | * gt64260b_chip_specific_init() | 1777 | * gt64260b_chip_specific_init() |
| 1778 | * | 1778 | * |
| 1779 | * Implement errata work arounds for the GT64260B. | 1779 | * Implement errata workarounds for the GT64260B. |
| 1780 | */ | 1780 | */ |
| 1781 | static void __init | 1781 | static void __init |
| 1782 | gt64260b_chip_specific_init(struct mv64x60_handle *bh, | 1782 | gt64260b_chip_specific_init(struct mv64x60_handle *bh, |
| @@ -2316,7 +2316,7 @@ mv64360_set_mpsc2regs_window(struct mv64x60_handle *bh, u32 base) | |||
| 2316 | /* | 2316 | /* |
| 2317 | * mv64360_chip_specific_init() | 2317 | * mv64360_chip_specific_init() |
| 2318 | * | 2318 | * |
| 2319 | * Implement errata work arounds for the MV64360. | 2319 | * Implement errata workarounds for the MV64360. |
| 2320 | */ | 2320 | */ |
| 2321 | static void __init | 2321 | static void __init |
| 2322 | mv64360_chip_specific_init(struct mv64x60_handle *bh, | 2322 | mv64360_chip_specific_init(struct mv64x60_handle *bh, |
| @@ -2336,7 +2336,7 @@ mv64360_chip_specific_init(struct mv64x60_handle *bh, | |||
| 2336 | /* | 2336 | /* |
| 2337 | * mv64460_chip_specific_init() | 2337 | * mv64460_chip_specific_init() |
| 2338 | * | 2338 | * |
| 2339 | * Implement errata work arounds for the MV64460. | 2339 | * Implement errata workarounds for the MV64460. |
| 2340 | */ | 2340 | */ |
| 2341 | static void __init | 2341 | static void __init |
| 2342 | mv64460_chip_specific_init(struct mv64x60_handle *bh, | 2342 | mv64460_chip_specific_init(struct mv64x60_handle *bh, |
diff --git a/arch/ppc/syslib/ocp.c b/arch/ppc/syslib/ocp.c index 50c55622ece9..491fe9a57229 100644 --- a/arch/ppc/syslib/ocp.c +++ b/arch/ppc/syslib/ocp.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | * device model. The devices on the OCP bus are seeded by an | 27 | * device model. The devices on the OCP bus are seeded by an |
| 28 | * an initial OCP device array created by the arch-specific | 28 | * an initial OCP device array created by the arch-specific |
| 29 | * Device entries can be added/removed/modified through OCP | 29 | * Device entries can be added/removed/modified through OCP |
| 30 | * helper functions to accomodate system and board-specific | 30 | * helper functions to accommodate system and board-specific |
| 31 | * parameters commonly found in embedded systems. OCP also | 31 | * parameters commonly found in embedded systems. OCP also |
| 32 | * provides a standard method for devices to describe extended | 32 | * provides a standard method for devices to describe extended |
| 33 | * attributes about themselves to the system. A standard access | 33 | * attributes about themselves to the system. A standard access |
diff --git a/arch/ppc/syslib/ppc403_pic.c b/arch/ppc/syslib/ppc403_pic.c index 607ebd111d44..c3b7b8bfbcfe 100644 --- a/arch/ppc/syslib/ppc403_pic.c +++ b/arch/ppc/syslib/ppc403_pic.c | |||
| @@ -112,7 +112,7 @@ ppc4xx_pic_init(void) | |||
| 112 | 112 | ||
| 113 | /* | 113 | /* |
| 114 | * Disable all external interrupts until they are | 114 | * Disable all external interrupts until they are |
| 115 | * explicity requested. | 115 | * explicitly requested. |
| 116 | */ | 116 | */ |
| 117 | ppc_cached_irq_mask[0] = 0; | 117 | ppc_cached_irq_mask[0] = 0; |
| 118 | 118 | ||
diff --git a/arch/ppc/syslib/ppc405_pci.c b/arch/ppc/syslib/ppc405_pci.c index d6d838b16dac..9e9035693bfa 100644 --- a/arch/ppc/syslib/ppc405_pci.c +++ b/arch/ppc/syslib/ppc405_pci.c | |||
| @@ -137,7 +137,7 @@ ppc4xx_find_bridges(void) | |||
| 137 | hose_a->pci_mem_offset = 0; | 137 | hose_a->pci_mem_offset = 0; |
| 138 | 138 | ||
| 139 | /* Setup bridge memory/IO ranges & resources | 139 | /* Setup bridge memory/IO ranges & resources |
| 140 | * TODO: Handle firmwares setting up a legacy ISA mem base | 140 | * TODO: Handle firmware setting up a legacy ISA mem base |
| 141 | */ | 141 | */ |
| 142 | hose_a->io_space.start = PPC405_PCI_LOWER_IO; | 142 | hose_a->io_space.start = PPC405_PCI_LOWER_IO; |
| 143 | hose_a->io_space.end = PPC405_PCI_UPPER_IO; | 143 | hose_a->io_space.end = PPC405_PCI_UPPER_IO; |
diff --git a/arch/ppc/syslib/ppc4xx_dma.c b/arch/ppc/syslib/ppc4xx_dma.c index 1eef4ffed4fb..bd301868996b 100644 --- a/arch/ppc/syslib/ppc4xx_dma.c +++ b/arch/ppc/syslib/ppc4xx_dma.c | |||
| @@ -241,7 +241,7 @@ ppc4xx_set_dma_count(unsigned int dmanr, unsigned int count) | |||
| 241 | } | 241 | } |
| 242 | 242 | ||
| 243 | /* | 243 | /* |
| 244 | * Returns the number of bytes left to be transfered. | 244 | * Returns the number of bytes left to be transferred. |
| 245 | * After a DMA transfer, this should return zero. | 245 | * After a DMA transfer, this should return zero. |
| 246 | * Reading this while a DMA transfer is still in progress will return | 246 | * Reading this while a DMA transfer is still in progress will return |
| 247 | * unpredictable results. | 247 | * unpredictable results. |
diff --git a/arch/ppc/syslib/ppc85xx_rio.c b/arch/ppc/syslib/ppc85xx_rio.c index 2b097800cdd9..af2425e4655f 100644 --- a/arch/ppc/syslib/ppc85xx_rio.c +++ b/arch/ppc/syslib/ppc85xx_rio.c | |||
| @@ -349,7 +349,7 @@ EXPORT_SYMBOL_GPL(rio_hw_add_outb_message); | |||
| 349 | * @dev_instance: Pointer to interrupt-specific data | 349 | * @dev_instance: Pointer to interrupt-specific data |
| 350 | * | 350 | * |
| 351 | * Handles outbound message interrupts. Executes a register outbound | 351 | * Handles outbound message interrupts. Executes a register outbound |
| 352 | * mailbox event handler and acks the interrupt occurence. | 352 | * mailbox event handler and acks the interrupt occurrence. |
| 353 | */ | 353 | */ |
| 354 | static irqreturn_t | 354 | static irqreturn_t |
| 355 | mpc85xx_rio_tx_handler(int irq, void *dev_instance) | 355 | mpc85xx_rio_tx_handler(int irq, void *dev_instance) |
| @@ -516,7 +516,7 @@ void rio_close_outb_mbox(struct rio_mport *mport, int mbox) | |||
| 516 | * @dev_instance: Pointer to interrupt-specific data | 516 | * @dev_instance: Pointer to interrupt-specific data |
| 517 | * | 517 | * |
| 518 | * Handles inbound message interrupts. Executes a registered inbound | 518 | * Handles inbound message interrupts. Executes a registered inbound |
| 519 | * mailbox event handler and acks the interrupt occurence. | 519 | * mailbox event handler and acks the interrupt occurrence. |
| 520 | */ | 520 | */ |
| 521 | static irqreturn_t | 521 | static irqreturn_t |
| 522 | mpc85xx_rio_rx_handler(int irq, void *dev_instance) | 522 | mpc85xx_rio_rx_handler(int irq, void *dev_instance) |
diff --git a/arch/ppc/syslib/xilinx_pic.c b/arch/ppc/syslib/xilinx_pic.c index 6fd4cdbada72..3b82333e96d8 100644 --- a/arch/ppc/syslib/xilinx_pic.c +++ b/arch/ppc/syslib/xilinx_pic.c | |||
| @@ -130,7 +130,7 @@ ppc4xx_pic_init(void) | |||
| 130 | 130 | ||
| 131 | /* | 131 | /* |
| 132 | * Disable all external interrupts until they are | 132 | * Disable all external interrupts until they are |
| 133 | * explicity requested. | 133 | * explicitly requested. |
| 134 | */ | 134 | */ |
| 135 | intc_out_be32(intc + IER, 0); | 135 | intc_out_be32(intc + IER, 0); |
| 136 | 136 | ||
