aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/platforms
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ppc/platforms')
-rw-r--r--arch/ppc/platforms/4xx/bubinga.c2
-rw-r--r--arch/ppc/platforms/4xx/ep405.c2
-rw-r--r--arch/ppc/platforms/4xx/ibmnp405h.h2
-rw-r--r--arch/ppc/platforms/4xx/sycamore.c2
-rw-r--r--arch/ppc/platforms/4xx/walnut.c2
-rw-r--r--arch/ppc/platforms/ev64360.c2
-rw-r--r--arch/ppc/platforms/hdpu.c2
-rw-r--r--arch/ppc/platforms/katana.c2
-rw-r--r--arch/ppc/platforms/mbx.h2
-rw-r--r--arch/ppc/platforms/mvme5100.h2
-rw-r--r--arch/ppc/platforms/pplus.h2
-rw-r--r--arch/ppc/platforms/prep_pci.c22
-rw-r--r--arch/ppc/platforms/prep_setup.c6
-rw-r--r--arch/ppc/platforms/prpmc750.h2
-rw-r--r--arch/ppc/platforms/radstone_ppc7d.c2
-rw-r--r--arch/ppc/platforms/sandpoint.c8
16 files changed, 31 insertions, 31 deletions
diff --git a/arch/ppc/platforms/4xx/bubinga.c b/arch/ppc/platforms/4xx/bubinga.c
index 75857b38e894..1a7f075b754f 100644
--- a/arch/ppc/platforms/4xx/bubinga.c
+++ b/arch/ppc/platforms/4xx/bubinga.c
@@ -197,7 +197,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
197 hose->first_busno, PCI_SLOT(hose->first_busno), 197 hose->first_busno, PCI_SLOT(hose->first_busno),
198 PCI_FUNC(hose->first_busno), bar, bar_response); 198 PCI_FUNC(hose->first_busno), bar, bar_response);
199 } 199 }
200 /* end work arround */ 200 /* end workaround */
201 201
202#ifdef DEBUG 202#ifdef DEBUG
203 printk("PCI bridge regs after fixup \n"); 203 printk("PCI bridge regs after fixup \n");
diff --git a/arch/ppc/platforms/4xx/ep405.c b/arch/ppc/platforms/4xx/ep405.c
index e5adf9ba1fca..5aa295022804 100644
--- a/arch/ppc/platforms/4xx/ep405.c
+++ b/arch/ppc/platforms/4xx/ep405.c
@@ -130,7 +130,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
130 hose->first_busno, PCI_SLOT(hose->first_busno), 130 hose->first_busno, PCI_SLOT(hose->first_busno),
131 PCI_FUNC(hose->first_busno), bar, bar_response); 131 PCI_FUNC(hose->first_busno), bar, bar_response);
132 } 132 }
133 /* end work arround */ 133 /* end workaround */
134#endif 134#endif
135} 135}
136 136
diff --git a/arch/ppc/platforms/4xx/ibmnp405h.h b/arch/ppc/platforms/4xx/ibmnp405h.h
index 4aa8821b478b..08a6a7791903 100644
--- a/arch/ppc/platforms/4xx/ibmnp405h.h
+++ b/arch/ppc/platforms/4xx/ibmnp405h.h
@@ -80,7 +80,7 @@
80#define DCRN_CPMFR_BASE 0x0B9 80#define DCRN_CPMFR_BASE 0x0B9
81#define DCRN_CPMER_BASE 0x0B8 81#define DCRN_CPMER_BASE 0x0B8
82 82
83/* CPM Clocking & Power Mangement defines */ 83/* CPM Clocking & Power Management defines */
84#define IBM_CPM_PCI 0x40000000 /* PCI */ 84#define IBM_CPM_PCI 0x40000000 /* PCI */
85#define IBM_CPM_EMAC2 0x20000000 /* EMAC 2 MII */ 85#define IBM_CPM_EMAC2 0x20000000 /* EMAC 2 MII */
86#define IBM_CPM_EMAC3 0x04000000 /* EMAC 3 MII */ 86#define IBM_CPM_EMAC3 0x04000000 /* EMAC 3 MII */
diff --git a/arch/ppc/platforms/4xx/sycamore.c b/arch/ppc/platforms/4xx/sycamore.c
index c47493e344c2..8689f3e8ef3a 100644
--- a/arch/ppc/platforms/4xx/sycamore.c
+++ b/arch/ppc/platforms/4xx/sycamore.c
@@ -225,7 +225,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
225 hose->first_busno, PCI_SLOT(hose->first_busno), 225 hose->first_busno, PCI_SLOT(hose->first_busno),
226 PCI_FUNC(hose->first_busno), bar, bar_response); 226 PCI_FUNC(hose->first_busno), bar, bar_response);
227 } 227 }
228 /* end work arround */ 228 /* end workaround */
229 229
230#ifdef DEBUG 230#ifdef DEBUG
231 printk("PCI bridge regs after fixup \n"); 231 printk("PCI bridge regs after fixup \n");
diff --git a/arch/ppc/platforms/4xx/walnut.c b/arch/ppc/platforms/4xx/walnut.c
index f414d2d4c58e..2f9772340854 100644
--- a/arch/ppc/platforms/4xx/walnut.c
+++ b/arch/ppc/platforms/4xx/walnut.c
@@ -200,7 +200,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
200 hose->first_busno, PCI_SLOT(hose->first_busno), 200 hose->first_busno, PCI_SLOT(hose->first_busno),
201 PCI_FUNC(hose->first_busno), bar, bar_response); 201 PCI_FUNC(hose->first_busno), bar, bar_response);
202 } 202 }
203 /* end work arround */ 203 /* end work around */
204 204
205#ifdef DEBUG 205#ifdef DEBUG
206 printk("PCI bridge regs after fixup \n"); 206 printk("PCI bridge regs after fixup \n");
diff --git a/arch/ppc/platforms/ev64360.c b/arch/ppc/platforms/ev64360.c
index f87e06f6bab9..f8baf05f16ce 100644
--- a/arch/ppc/platforms/ev64360.c
+++ b/arch/ppc/platforms/ev64360.c
@@ -473,7 +473,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
473 * are non-zero, then we should use the board info from the bd_t 473 * are non-zero, then we should use the board info from the bd_t
474 * structure and the cmdline pointed to by r6 instead of the 474 * structure and the cmdline pointed to by r6 instead of the
475 * information from birecs, if any. Otherwise, use the information 475 * information from birecs, if any. Otherwise, use the information
476 * from birecs as discovered by the preceeding call to 476 * from birecs as discovered by the preceding call to
477 * parse_bootinfo(). This rule should work with both PPCBoot, which 477 * parse_bootinfo(). This rule should work with both PPCBoot, which
478 * uses a bd_t board info structure, and the kernel boot wrapper, 478 * uses a bd_t board info structure, and the kernel boot wrapper,
479 * which uses birecs. 479 * which uses birecs.
diff --git a/arch/ppc/platforms/hdpu.c b/arch/ppc/platforms/hdpu.c
index d809e17aa536..ca5de13712fd 100644
--- a/arch/ppc/platforms/hdpu.c
+++ b/arch/ppc/platforms/hdpu.c
@@ -144,7 +144,7 @@ static void __init hdpu_setup_peripherals(void)
144 144
145 /* Enable pipelining */ 145 /* Enable pipelining */
146 mv64x60_set_bits(&bh, MV64x60_CPU_CONFIG, (1 << 13)); 146 mv64x60_set_bits(&bh, MV64x60_CPU_CONFIG, (1 << 13));
147 /* Enable Snoop Pipelineing */ 147 /* Enable Snoop Pipelining */
148 mv64x60_set_bits(&bh, MV64360_D_UNIT_CONTROL_HIGH, (1 << 24)); 148 mv64x60_set_bits(&bh, MV64360_D_UNIT_CONTROL_HIGH, (1 << 24));
149 149
150 /* 150 /*
diff --git a/arch/ppc/platforms/katana.c b/arch/ppc/platforms/katana.c
index 720f8b3e2fbc..c289e9f1b251 100644
--- a/arch/ppc/platforms/katana.c
+++ b/arch/ppc/platforms/katana.c
@@ -880,7 +880,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
880 * are non-zero, then we should use the board info from the bd_t 880 * are non-zero, then we should use the board info from the bd_t
881 * structure and the cmdline pointed to by r6 instead of the 881 * structure and the cmdline pointed to by r6 instead of the
882 * information from birecs, if any. Otherwise, use the information 882 * information from birecs, if any. Otherwise, use the information
883 * from birecs as discovered by the preceeding call to 883 * from birecs as discovered by the preceding call to
884 * parse_bootinfo(). This rule should work with both PPCBoot, which 884 * parse_bootinfo(). This rule should work with both PPCBoot, which
885 * uses a bd_t board info structure, and the kernel boot wrapper, 885 * uses a bd_t board info structure, and the kernel boot wrapper,
886 * which uses birecs. 886 * which uses birecs.
diff --git a/arch/ppc/platforms/mbx.h b/arch/ppc/platforms/mbx.h
index fe81ca4ea0a2..1cf36fa3592d 100644
--- a/arch/ppc/platforms/mbx.h
+++ b/arch/ppc/platforms/mbx.h
@@ -37,7 +37,7 @@ typedef struct bd_info {
37 37
38/* Memory map for the MBX as configured by EPPC-Bug. We could reprogram 38/* Memory map for the MBX as configured by EPPC-Bug. We could reprogram
39 * The SIU and PCI bridge, and try to use larger MMU pages, but the 39 * The SIU and PCI bridge, and try to use larger MMU pages, but the
40 * performance gain is not measureable and it certainly complicates the 40 * performance gain is not measurable and it certainly complicates the
41 * generic MMU model. 41 * generic MMU model.
42 * 42 *
43 * In a effort to minimize memory usage for embedded applications, any 43 * In a effort to minimize memory usage for embedded applications, any
diff --git a/arch/ppc/platforms/mvme5100.h b/arch/ppc/platforms/mvme5100.h
index 9e2a09e636ae..fbb5495165c7 100644
--- a/arch/ppc/platforms/mvme5100.h
+++ b/arch/ppc/platforms/mvme5100.h
@@ -69,7 +69,7 @@
69 69
70#define STD_COM_FLAGS ASYNC_BOOT_AUTOCONF 70#define STD_COM_FLAGS ASYNC_BOOT_AUTOCONF
71 71
72/* All UART IRQ's are wire-OR'd to one MPIC IRQ */ 72/* All UART IRQs are wire-OR'd to one MPIC IRQ */
73#define STD_SERIAL_PORT_DFNS \ 73#define STD_SERIAL_PORT_DFNS \
74 { 0, BASE_BAUD, MVME5100_SERIAL_1, \ 74 { 0, BASE_BAUD, MVME5100_SERIAL_1, \
75 MVME5100_SERIAL_IRQ, \ 75 MVME5100_SERIAL_IRQ, \
diff --git a/arch/ppc/platforms/pplus.h b/arch/ppc/platforms/pplus.h
index a07cbbdd72c6..a4bbaa8d858f 100644
--- a/arch/ppc/platforms/pplus.h
+++ b/arch/ppc/platforms/pplus.h
@@ -18,7 +18,7 @@
18#include <asm/io.h> 18#include <asm/io.h>
19 19
20/* 20/*
21 * Due to limiations imposed by legacy hardware (primaryily IDE controllers), 21 * Due to limitations imposed by legacy hardware (primarily IDE controllers),
22 * the PPLUS boards operate using a PReP address map. 22 * the PPLUS boards operate using a PReP address map.
23 * 23 *
24 * From Processor (physical) -> PCI: 24 * From Processor (physical) -> PCI:
diff --git a/arch/ppc/platforms/prep_pci.c b/arch/ppc/platforms/prep_pci.c
index c627ba41335f..1df3150f016e 100644
--- a/arch/ppc/platforms/prep_pci.c
+++ b/arch/ppc/platforms/prep_pci.c
@@ -589,9 +589,9 @@ static unsigned char prep_pci_intpins[4][4] =
589 { 4, 1, 2, 3}, /* Buses 3, 7, 11 ... */ 589 { 4, 1, 2, 3}, /* Buses 3, 7, 11 ... */
590}; 590};
591 591
592/* We have to turn on LEVEL mode for changed IRQ's */ 592/* We have to turn on LEVEL mode for changed IRQs */
593/* All PCI IRQ's need to be level mode, so this should be something 593/* All PCI IRQs need to be level mode, so this should be something
594 * other than hard-coded as well... IRQ's are individually mappable 594 * other than hard-coded as well... IRQs are individually mappable
595 * to either edge or level. 595 * to either edge or level.
596 */ 596 */
597 597
@@ -923,8 +923,8 @@ prep_sandalfoot_setup_pci(char *irq_edge_mask_lo, char *irq_edge_mask_hi)
923 Motherboard_map_name = "IBM 6015/7020 (Sandalfoot/Sandalbow)"; 923 Motherboard_map_name = "IBM 6015/7020 (Sandalfoot/Sandalbow)";
924 Motherboard_map = ibm6015_pci_IRQ_map; 924 Motherboard_map = ibm6015_pci_IRQ_map;
925 Motherboard_routes = ibm6015_pci_IRQ_routes; 925 Motherboard_routes = ibm6015_pci_IRQ_routes;
926 *irq_edge_mask_lo = 0x00; /* irq's 0-7 all edge-triggered */ 926 *irq_edge_mask_lo = 0x00; /* IRQs 0-7 all edge-triggered */
927 *irq_edge_mask_hi = 0xA0; /* irq's 13, 15 level-triggered */ 927 *irq_edge_mask_hi = 0xA0; /* IRQs 13, 15 level-triggered */
928} 928}
929 929
930void __init 930void __init
@@ -933,8 +933,8 @@ prep_thinkpad_setup_pci(char *irq_edge_mask_lo, char *irq_edge_mask_hi)
933 Motherboard_map_name = "IBM Thinkpad 850/860"; 933 Motherboard_map_name = "IBM Thinkpad 850/860";
934 Motherboard_map = Nobis_pci_IRQ_map; 934 Motherboard_map = Nobis_pci_IRQ_map;
935 Motherboard_routes = Nobis_pci_IRQ_routes; 935 Motherboard_routes = Nobis_pci_IRQ_routes;
936 *irq_edge_mask_lo = 0x00; /* irq's 0-7 all edge-triggered */ 936 *irq_edge_mask_lo = 0x00; /* IRQs 0-7 all edge-triggered */
937 *irq_edge_mask_hi = 0xA0; /* irq's 13, 15 level-triggered */ 937 *irq_edge_mask_hi = 0xA0; /* IRQs 13, 15 level-triggered */
938} 938}
939 939
940void __init 940void __init
@@ -943,8 +943,8 @@ prep_carolina_setup_pci(char *irq_edge_mask_lo, char *irq_edge_mask_hi)
943 Motherboard_map_name = "IBM 7248, PowerSeries 830/850 (Carolina)"; 943 Motherboard_map_name = "IBM 7248, PowerSeries 830/850 (Carolina)";
944 Motherboard_map = ibm8xx_pci_IRQ_map; 944 Motherboard_map = ibm8xx_pci_IRQ_map;
945 Motherboard_routes = ibm8xx_pci_IRQ_routes; 945 Motherboard_routes = ibm8xx_pci_IRQ_routes;
946 *irq_edge_mask_lo = 0x00; /* irq's 0-7 all edge-triggered */ 946 *irq_edge_mask_lo = 0x00; /* IRQs 0-7 all edge-triggered */
947 *irq_edge_mask_hi = 0xA4; /* irq's 10, 13, 15 level-triggered */ 947 *irq_edge_mask_hi = 0xA4; /* IRQs 10, 13, 15 level-triggered */
948} 948}
949 949
950void __init 950void __init
@@ -954,8 +954,8 @@ prep_tiger1_setup_pci(char *irq_edge_mask_lo, char *irq_edge_mask_hi)
954 Motherboard_map = ibm43p_pci_IRQ_map; 954 Motherboard_map = ibm43p_pci_IRQ_map;
955 Motherboard_routes = ibm43p_pci_IRQ_routes; 955 Motherboard_routes = ibm43p_pci_IRQ_routes;
956 Motherboard_non0 = ibm43p_pci_map_non0; 956 Motherboard_non0 = ibm43p_pci_map_non0;
957 *irq_edge_mask_lo = 0x00; /* irq's 0-7 all edge-triggered */ 957 *irq_edge_mask_lo = 0x00; /* IRQs 0-7 all edge-triggered */
958 *irq_edge_mask_hi = 0xA0; /* irq's 13, 15 level-triggered */ 958 *irq_edge_mask_hi = 0xA0; /* IRQs 13, 15 level-triggered */
959} 959}
960 960
961void __init 961void __init
diff --git a/arch/ppc/platforms/prep_setup.c b/arch/ppc/platforms/prep_setup.c
index f166299571d6..6f21110a9747 100644
--- a/arch/ppc/platforms/prep_setup.c
+++ b/arch/ppc/platforms/prep_setup.c
@@ -593,7 +593,7 @@ static void __init prep_init_sound(void)
593 PPC_DEVICE *audiodevice = NULL; 593 PPC_DEVICE *audiodevice = NULL;
594 594
595 /* 595 /*
596 * Get the needed resource informations from residual data. 596 * Get the needed resource information from residual data.
597 * 597 *
598 */ 598 */
599 if (have_residual_data) 599 if (have_residual_data)
@@ -632,9 +632,9 @@ static void __init prep_init_sound(void)
632 } 632 }
633 633
634 /* 634 /*
635 * Find a way to push these informations to the cs4232 driver 635 * Find a way to push this information to the cs4232 driver
636 * Give it out with printk, when not in cmd_line? 636 * Give it out with printk, when not in cmd_line?
637 * Append it to cmd_line and boot_command_line? 637 * Append it to cmd_line and boot_command_line?
638 * Format is cs4232=io,irq,dma,dma2 638 * Format is cs4232=io,irq,dma,dma2
639 */ 639 */
640} 640}
diff --git a/arch/ppc/platforms/prpmc750.h b/arch/ppc/platforms/prpmc750.h
index 4c7adcc9ae33..c4dcff09d7ca 100644
--- a/arch/ppc/platforms/prpmc750.h
+++ b/arch/ppc/platforms/prpmc750.h
@@ -16,7 +16,7 @@
16#define __ASM_PRPMC750_H__ 16#define __ASM_PRPMC750_H__
17 17
18/* 18/*
19 * Due to limiations imposed by legacy hardware (primaryily IDE controllers), 19 * Due to limitations imposed by legacy hardware (primarily IDE controllers),
20 * the PrPMC750 carrier board operates using a PReP address map. 20 * the PrPMC750 carrier board operates using a PReP address map.
21 * 21 *
22 * From Processor (physical) -> PCI: 22 * From Processor (physical) -> PCI:
diff --git a/arch/ppc/platforms/radstone_ppc7d.c b/arch/ppc/platforms/radstone_ppc7d.c
index 13d70ab50bf1..b55860734a72 100644
--- a/arch/ppc/platforms/radstone_ppc7d.c
+++ b/arch/ppc/platforms/radstone_ppc7d.c
@@ -1371,7 +1371,7 @@ void __init platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
1371 * are non-zero, then we should use the board info from the bd_t 1371 * are non-zero, then we should use the board info from the bd_t
1372 * structure and the cmdline pointed to by r6 instead of the 1372 * structure and the cmdline pointed to by r6 instead of the
1373 * information from birecs, if any. Otherwise, use the information 1373 * information from birecs, if any. Otherwise, use the information
1374 * from birecs as discovered by the preceeding call to 1374 * from birecs as discovered by the preceding call to
1375 * parse_bootinfo(). This rule should work with both PPCBoot, which 1375 * parse_bootinfo(). This rule should work with both PPCBoot, which
1376 * uses a bd_t board info structure, and the kernel boot wrapper, 1376 * uses a bd_t board info structure, and the kernel boot wrapper,
1377 * which uses birecs. 1377 * which uses birecs.
diff --git a/arch/ppc/platforms/sandpoint.c b/arch/ppc/platforms/sandpoint.c
index a76002af686f..3352fae1c722 100644
--- a/arch/ppc/platforms/sandpoint.c
+++ b/arch/ppc/platforms/sandpoint.c
@@ -54,7 +54,7 @@
54 * 54 *
55 * 55 *
56 * Motorola has finally released a version of DINK32 that correctly 56 * Motorola has finally released a version of DINK32 that correctly
57 * (seemingly) initalizes the memory controller correctly, regardless 57 * (seemingly) initializes the memory controller correctly, regardless
58 * of the amount of memory in the system. Once a method of determining 58 * of the amount of memory in the system. Once a method of determining
59 * what version of DINK initializes the system for us, if applicable, is 59 * what version of DINK initializes the system for us, if applicable, is
60 * found, we can hopefully stop hardcoding 32MB of RAM. 60 * found, we can hopefully stop hardcoding 32MB of RAM.
@@ -473,7 +473,7 @@ sandpoint_request_io(void)
473arch_initcall(sandpoint_request_io); 473arch_initcall(sandpoint_request_io);
474 474
475/* 475/*
476 * Interrupt setup and service. Interrrupts on the Sandpoint come 476 * Interrupt setup and service. Interrupts on the Sandpoint come
477 * from the four PCI slots plus the 8259 in the Winbond Super I/O (SIO). 477 * from the four PCI slots plus the 8259 in the Winbond Super I/O (SIO).
478 * The 8259 is cascaded from EPIC IRQ0, IRQ1-4 map to PCI slots 1-4, 478 * The 8259 is cascaded from EPIC IRQ0, IRQ1-4 map to PCI slots 1-4,
479 * IDE is on EPIC 7 and 8. 479 * IDE is on EPIC 7 and 8.
@@ -505,7 +505,7 @@ sandpoint_find_end_of_memory(void)
505 if (bp->bi_memsize) 505 if (bp->bi_memsize)
506 return bp->bi_memsize; 506 return bp->bi_memsize;
507 507
508 /* DINK32 13.0 correctly initalizes things, so iff you use 508 /* DINK32 13.0 correctly initializes things, so iff you use
509 * this you _should_ be able to change this instead of a 509 * this you _should_ be able to change this instead of a
510 * hardcoded value. */ 510 * hardcoded value. */
511#if 0 511#if 0
@@ -677,7 +677,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
677 * are non-zero, then we should use the board info from the bd_t 677 * are non-zero, then we should use the board info from the bd_t
678 * structure and the cmdline pointed to by r6 instead of the 678 * structure and the cmdline pointed to by r6 instead of the
679 * information from birecs, if any. Otherwise, use the information 679 * information from birecs, if any. Otherwise, use the information
680 * from birecs as discovered by the preceeding call to 680 * from birecs as discovered by the preceding call to
681 * parse_bootinfo(). This rule should work with both PPCBoot, which 681 * parse_bootinfo(). This rule should work with both PPCBoot, which
682 * uses a bd_t board info structure, and the kernel boot wrapper, 682 * uses a bd_t board info structure, and the kernel boot wrapper,
683 * which uses birecs. 683 * which uses birecs.