diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/Kconfig | 8 | ||||
-rw-r--r-- | arch/powerpc/kernel/prom_init.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/setup_64.c | 6 | ||||
-rw-r--r-- | arch/powerpc/kernel/traps.c | 4 | ||||
-rw-r--r-- | arch/ppc64/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/ppc64/kernel/bpa_iic.c | 8 | ||||
-rw-r--r-- | arch/ppc64/kernel/bpa_iic.h | 8 | ||||
-rw-r--r-- | arch/ppc64/kernel/bpa_iommu.c | 44 | ||||
-rw-r--r-- | arch/ppc64/kernel/bpa_iommu.h | 10 | ||||
-rw-r--r-- | arch/ppc64/kernel/bpa_nvram.c | 60 | ||||
-rw-r--r-- | arch/ppc64/kernel/bpa_setup.c | 46 | ||||
-rw-r--r-- | arch/ppc64/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/ppc64/kernel/proc_ppc64.c | 2 | ||||
-rw-r--r-- | arch/ppc64/kernel/prom_init.c | 4 | ||||
-rw-r--r-- | arch/ppc64/kernel/spider-pic.c | 2 |
15 files changed, 104 insertions, 104 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 967ecf92d6a7..0bd315de156b 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -319,8 +319,8 @@ config PPC_MAPLE | |||
319 | This option enables support for the Maple 970FX Evaluation Board. | 319 | This option enables support for the Maple 970FX Evaluation Board. |
320 | For more informations, refer to <http://www.970eval.com> | 320 | For more informations, refer to <http://www.970eval.com> |
321 | 321 | ||
322 | config PPC_BPA | 322 | config PPC_CELL |
323 | bool " Broadband Processor Architecture" | 323 | bool " Cell Broadband Processor Architecture" |
324 | depends on PPC_MULTIPLATFORM && PPC64 | 324 | depends on PPC_MULTIPLATFORM && PPC64 |
325 | select PPC_RTAS | 325 | select PPC_RTAS |
326 | 326 | ||
@@ -358,8 +358,8 @@ config MPIC_BROKEN_U3 | |||
358 | depends on PPC_MAPLE | 358 | depends on PPC_MAPLE |
359 | default y | 359 | default y |
360 | 360 | ||
361 | config BPA_IIC | 361 | config CELL_IIC |
362 | depends on PPC_BPA | 362 | depends on PPC_CELL |
363 | bool | 363 | bool |
364 | default y | 364 | default y |
365 | 365 | ||
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 9750b3cd8ecd..c758b6624d7b 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c | |||
@@ -2000,7 +2000,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, | |||
2000 | #endif | 2000 | #endif |
2001 | 2001 | ||
2002 | /* | 2002 | /* |
2003 | * On pSeries and BPA, copy the CPU hold code | 2003 | * Copy the CPU hold code |
2004 | */ | 2004 | */ |
2005 | if (RELOC(of_platform) != PLATFORM_POWERMAC) | 2005 | if (RELOC(of_platform) != PLATFORM_POWERMAC) |
2006 | copy_and_flush(0, KERNELBASE + offset, 0x100, 0); | 2006 | copy_and_flush(0, KERNELBASE + offset, 0x100, 0); |
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 19530ce9cd27..70ead7d0d12e 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
@@ -296,7 +296,7 @@ static void __init setup_cpu_maps(void) | |||
296 | extern struct machdep_calls pSeries_md; | 296 | extern struct machdep_calls pSeries_md; |
297 | extern struct machdep_calls pmac_md; | 297 | extern struct machdep_calls pmac_md; |
298 | extern struct machdep_calls maple_md; | 298 | extern struct machdep_calls maple_md; |
299 | extern struct machdep_calls bpa_md; | 299 | extern struct machdep_calls cell_md; |
300 | extern struct machdep_calls iseries_md; | 300 | extern struct machdep_calls iseries_md; |
301 | 301 | ||
302 | /* Ultimately, stuff them in an elf section like initcalls... */ | 302 | /* Ultimately, stuff them in an elf section like initcalls... */ |
@@ -310,8 +310,8 @@ static struct machdep_calls __initdata *machines[] = { | |||
310 | #ifdef CONFIG_PPC_MAPLE | 310 | #ifdef CONFIG_PPC_MAPLE |
311 | &maple_md, | 311 | &maple_md, |
312 | #endif /* CONFIG_PPC_MAPLE */ | 312 | #endif /* CONFIG_PPC_MAPLE */ |
313 | #ifdef CONFIG_PPC_BPA | 313 | #ifdef CONFIG_PPC_CELL |
314 | &bpa_md, | 314 | &cell_md, |
315 | #endif | 315 | #endif |
316 | #ifdef CONFIG_PPC_ISERIES | 316 | #ifdef CONFIG_PPC_ISERIES |
317 | &iseries_md, | 317 | &iseries_md, |
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 5d638ecddbd0..bb0d00284a7e 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c | |||
@@ -147,8 +147,8 @@ int die(const char *str, struct pt_regs *regs, long err) | |||
147 | printk("POWERMAC "); | 147 | printk("POWERMAC "); |
148 | nl = 1; | 148 | nl = 1; |
149 | break; | 149 | break; |
150 | case PLATFORM_BPA: | 150 | case PLATFORM_CELL: |
151 | printk("BPA "); | 151 | printk("CELL "); |
152 | nl = 1; | 152 | nl = 1; |
153 | break; | 153 | break; |
154 | } | 154 | } |
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile index 327c08ce4291..a01a9de9eb56 100644 --- a/arch/ppc64/kernel/Makefile +++ b/arch/ppc64/kernel/Makefile | |||
@@ -31,7 +31,7 @@ endif | |||
31 | 31 | ||
32 | obj-$(CONFIG_PPC_PSERIES) += rtasd.o udbg_16550.o | 32 | obj-$(CONFIG_PPC_PSERIES) += rtasd.o udbg_16550.o |
33 | 33 | ||
34 | obj-$(CONFIG_PPC_BPA) += bpa_setup.o bpa_iommu.o bpa_nvram.o \ | 34 | obj-$(CONFIG_PPC_CELL) += bpa_setup.o bpa_iommu.o bpa_nvram.o \ |
35 | bpa_iic.o spider-pic.o | 35 | bpa_iic.o spider-pic.o |
36 | 36 | ||
37 | obj-$(CONFIG_KEXEC) += machine_kexec.o | 37 | obj-$(CONFIG_KEXEC) += machine_kexec.o |
diff --git a/arch/ppc64/kernel/bpa_iic.c b/arch/ppc64/kernel/bpa_iic.c index 0aaa878e19d3..7fbe78a9327d 100644 --- a/arch/ppc64/kernel/bpa_iic.c +++ b/arch/ppc64/kernel/bpa_iic.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * BPA Internal Interrupt Controller | 2 | * Cell Internal Interrupt Controller |
3 | * | 3 | * |
4 | * (C) Copyright IBM Deutschland Entwicklung GmbH 2005 | 4 | * (C) Copyright IBM Deutschland Entwicklung GmbH 2005 |
5 | * | 5 | * |
@@ -31,7 +31,7 @@ | |||
31 | #include <asm/prom.h> | 31 | #include <asm/prom.h> |
32 | #include <asm/ptrace.h> | 32 | #include <asm/ptrace.h> |
33 | 33 | ||
34 | #include "bpa_iic.h" | 34 | #include "interrupt.h" |
35 | 35 | ||
36 | struct iic_pending_bits { | 36 | struct iic_pending_bits { |
37 | u32 data; | 37 | u32 data; |
@@ -89,7 +89,7 @@ static void iic_end(unsigned int irq) | |||
89 | } | 89 | } |
90 | 90 | ||
91 | static struct hw_interrupt_type iic_pic = { | 91 | static struct hw_interrupt_type iic_pic = { |
92 | .typename = " BPA-IIC ", | 92 | .typename = " CELL-IIC ", |
93 | .startup = iic_startup, | 93 | .startup = iic_startup, |
94 | .enable = iic_enable, | 94 | .enable = iic_enable, |
95 | .disable = iic_disable, | 95 | .disable = iic_disable, |
@@ -106,7 +106,7 @@ static int iic_external_get_irq(struct iic_pending_bits pending) | |||
106 | irq = -1; | 106 | irq = -1; |
107 | 107 | ||
108 | /* | 108 | /* |
109 | * This mapping is specific to the Broadband | 109 | * This mapping is specific to the Cell Broadband |
110 | * Engine. We might need to get the numbers | 110 | * Engine. We might need to get the numbers |
111 | * from the device tree to support future CPUs. | 111 | * from the device tree to support future CPUs. |
112 | */ | 112 | */ |
diff --git a/arch/ppc64/kernel/bpa_iic.h b/arch/ppc64/kernel/bpa_iic.h index 6833c3022166..37d58e6fd0c6 100644 --- a/arch/ppc64/kernel/bpa_iic.h +++ b/arch/ppc64/kernel/bpa_iic.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef ASM_BPA_IIC_H | 1 | #ifndef ASM_CELL_PIC_H |
2 | #define ASM_BPA_IIC_H | 2 | #define ASM_CELL_PIC_H |
3 | #ifdef __KERNEL__ | 3 | #ifdef __KERNEL__ |
4 | /* | 4 | /* |
5 | * Mapping of IIC pending bits into per-node | 5 | * Mapping of IIC pending bits into per-node |
@@ -21,7 +21,7 @@ | |||
21 | * + node number | 21 | * + node number |
22 | * * don't care | 22 | * * don't care |
23 | * | 23 | * |
24 | * A node consists of a Broadband Engine and an optional | 24 | * A node consists of a Cell Broadband Engine and an optional |
25 | * south bridge device providing a maximum of 64 IRQs. | 25 | * south bridge device providing a maximum of 64 IRQs. |
26 | * The south bridge may be connected to either IOIF0 | 26 | * The south bridge may be connected to either IOIF0 |
27 | * or IOIF1. | 27 | * or IOIF1. |
@@ -59,4 +59,4 @@ extern void spider_init_IRQ(void); | |||
59 | extern int spider_get_irq(unsigned long int_pending); | 59 | extern int spider_get_irq(unsigned long int_pending); |
60 | 60 | ||
61 | #endif | 61 | #endif |
62 | #endif /* ASM_BPA_IIC_H */ | 62 | #endif /* ASM_CELL_PIC_H */ |
diff --git a/arch/ppc64/kernel/bpa_iommu.c b/arch/ppc64/kernel/bpa_iommu.c index da1b4b7a3269..74f999b4ac9e 100644 --- a/arch/ppc64/kernel/bpa_iommu.c +++ b/arch/ppc64/kernel/bpa_iommu.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * IOMMU implementation for Broadband Processor Architecture | 2 | * IOMMU implementation for Cell Broadband Processor Architecture |
3 | * We just establish a linear mapping at boot by setting all the | 3 | * We just establish a linear mapping at boot by setting all the |
4 | * IOPT cache entries in the CPU. | 4 | * IOPT cache entries in the CPU. |
5 | * The mapping functions should be identical to pci_direct_iommu, | 5 | * The mapping functions should be identical to pci_direct_iommu, |
@@ -41,7 +41,7 @@ | |||
41 | #include <asm/system.h> | 41 | #include <asm/system.h> |
42 | #include <asm/ppc-pci.h> | 42 | #include <asm/ppc-pci.h> |
43 | 43 | ||
44 | #include "bpa_iommu.h" | 44 | #include "iommu.h" |
45 | 45 | ||
46 | static inline unsigned long | 46 | static inline unsigned long |
47 | get_iopt_entry(unsigned long real_address, unsigned long ioid, | 47 | get_iopt_entry(unsigned long real_address, unsigned long ioid, |
@@ -276,7 +276,7 @@ static void iommu_dev_setup_null(struct pci_dev *d) { } | |||
276 | * for each DMA window used by any device. For now, we | 276 | * for each DMA window used by any device. For now, we |
277 | * happen to know that there is only one DMA window in use, | 277 | * happen to know that there is only one DMA window in use, |
278 | * starting at iopt_phys_offset. */ | 278 | * starting at iopt_phys_offset. */ |
279 | static void bpa_map_iommu(void) | 279 | static void cell_map_iommu(void) |
280 | { | 280 | { |
281 | unsigned long address; | 281 | unsigned long address; |
282 | void __iomem *base; | 282 | void __iomem *base; |
@@ -309,7 +309,7 @@ static void bpa_map_iommu(void) | |||
309 | } | 309 | } |
310 | 310 | ||
311 | 311 | ||
312 | static void *bpa_alloc_coherent(struct device *hwdev, size_t size, | 312 | static void *cell_alloc_coherent(struct device *hwdev, size_t size, |
313 | dma_addr_t *dma_handle, gfp_t flag) | 313 | dma_addr_t *dma_handle, gfp_t flag) |
314 | { | 314 | { |
315 | void *ret; | 315 | void *ret; |
@@ -317,65 +317,65 @@ static void *bpa_alloc_coherent(struct device *hwdev, size_t size, | |||
317 | ret = (void *)__get_free_pages(flag, get_order(size)); | 317 | ret = (void *)__get_free_pages(flag, get_order(size)); |
318 | if (ret != NULL) { | 318 | if (ret != NULL) { |
319 | memset(ret, 0, size); | 319 | memset(ret, 0, size); |
320 | *dma_handle = virt_to_abs(ret) | BPA_DMA_VALID; | 320 | *dma_handle = virt_to_abs(ret) | CELL_DMA_VALID; |
321 | } | 321 | } |
322 | return ret; | 322 | return ret; |
323 | } | 323 | } |
324 | 324 | ||
325 | static void bpa_free_coherent(struct device *hwdev, size_t size, | 325 | static void cell_free_coherent(struct device *hwdev, size_t size, |
326 | void *vaddr, dma_addr_t dma_handle) | 326 | void *vaddr, dma_addr_t dma_handle) |
327 | { | 327 | { |
328 | free_pages((unsigned long)vaddr, get_order(size)); | 328 | free_pages((unsigned long)vaddr, get_order(size)); |
329 | } | 329 | } |
330 | 330 | ||
331 | static dma_addr_t bpa_map_single(struct device *hwdev, void *ptr, | 331 | static dma_addr_t cell_map_single(struct device *hwdev, void *ptr, |
332 | size_t size, enum dma_data_direction direction) | 332 | size_t size, enum dma_data_direction direction) |
333 | { | 333 | { |
334 | return virt_to_abs(ptr) | BPA_DMA_VALID; | 334 | return virt_to_abs(ptr) | CELL_DMA_VALID; |
335 | } | 335 | } |
336 | 336 | ||
337 | static void bpa_unmap_single(struct device *hwdev, dma_addr_t dma_addr, | 337 | static void cell_unmap_single(struct device *hwdev, dma_addr_t dma_addr, |
338 | size_t size, enum dma_data_direction direction) | 338 | size_t size, enum dma_data_direction direction) |
339 | { | 339 | { |
340 | } | 340 | } |
341 | 341 | ||
342 | static int bpa_map_sg(struct device *hwdev, struct scatterlist *sg, | 342 | static int cell_map_sg(struct device *hwdev, struct scatterlist *sg, |
343 | int nents, enum dma_data_direction direction) | 343 | int nents, enum dma_data_direction direction) |
344 | { | 344 | { |
345 | int i; | 345 | int i; |
346 | 346 | ||
347 | for (i = 0; i < nents; i++, sg++) { | 347 | for (i = 0; i < nents; i++, sg++) { |
348 | sg->dma_address = (page_to_phys(sg->page) + sg->offset) | 348 | sg->dma_address = (page_to_phys(sg->page) + sg->offset) |
349 | | BPA_DMA_VALID; | 349 | | CELL_DMA_VALID; |
350 | sg->dma_length = sg->length; | 350 | sg->dma_length = sg->length; |
351 | } | 351 | } |
352 | 352 | ||
353 | return nents; | 353 | return nents; |
354 | } | 354 | } |
355 | 355 | ||
356 | static void bpa_unmap_sg(struct device *hwdev, struct scatterlist *sg, | 356 | static void cell_unmap_sg(struct device *hwdev, struct scatterlist *sg, |
357 | int nents, enum dma_data_direction direction) | 357 | int nents, enum dma_data_direction direction) |
358 | { | 358 | { |
359 | } | 359 | } |
360 | 360 | ||
361 | static int bpa_dma_supported(struct device *dev, u64 mask) | 361 | static int cell_dma_supported(struct device *dev, u64 mask) |
362 | { | 362 | { |
363 | return mask < 0x100000000ull; | 363 | return mask < 0x100000000ull; |
364 | } | 364 | } |
365 | 365 | ||
366 | void bpa_init_iommu(void) | 366 | void cell_init_iommu(void) |
367 | { | 367 | { |
368 | bpa_map_iommu(); | 368 | cell_map_iommu(); |
369 | 369 | ||
370 | /* Direct I/O, IOMMU off */ | 370 | /* Direct I/O, IOMMU off */ |
371 | ppc_md.iommu_dev_setup = iommu_dev_setup_null; | 371 | ppc_md.iommu_dev_setup = iommu_dev_setup_null; |
372 | ppc_md.iommu_bus_setup = iommu_bus_setup_null; | 372 | ppc_md.iommu_bus_setup = iommu_bus_setup_null; |
373 | 373 | ||
374 | pci_dma_ops.alloc_coherent = bpa_alloc_coherent; | 374 | pci_dma_ops.alloc_coherent = cell_alloc_coherent; |
375 | pci_dma_ops.free_coherent = bpa_free_coherent; | 375 | pci_dma_ops.free_coherent = cell_free_coherent; |
376 | pci_dma_ops.map_single = bpa_map_single; | 376 | pci_dma_ops.map_single = cell_map_single; |
377 | pci_dma_ops.unmap_single = bpa_unmap_single; | 377 | pci_dma_ops.unmap_single = cell_unmap_single; |
378 | pci_dma_ops.map_sg = bpa_map_sg; | 378 | pci_dma_ops.map_sg = cell_map_sg; |
379 | pci_dma_ops.unmap_sg = bpa_unmap_sg; | 379 | pci_dma_ops.unmap_sg = cell_unmap_sg; |
380 | pci_dma_ops.dma_supported = bpa_dma_supported; | 380 | pci_dma_ops.dma_supported = cell_dma_supported; |
381 | } | 381 | } |
diff --git a/arch/ppc64/kernel/bpa_iommu.h b/arch/ppc64/kernel/bpa_iommu.h index e547d77dfa04..490d77abfe85 100644 --- a/arch/ppc64/kernel/bpa_iommu.h +++ b/arch/ppc64/kernel/bpa_iommu.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef BPA_IOMMU_H | 1 | #ifndef CELL_IOMMU_H |
2 | #define BPA_IOMMU_H | 2 | #define CELL_IOMMU_H |
3 | 3 | ||
4 | /* some constants */ | 4 | /* some constants */ |
5 | enum { | 5 | enum { |
@@ -55,11 +55,11 @@ enum { | |||
55 | 55 | ||
56 | /* The high bit needs to be set on every DMA address, | 56 | /* The high bit needs to be set on every DMA address, |
57 | only 2GB are addressable */ | 57 | only 2GB are addressable */ |
58 | BPA_DMA_VALID = 0x80000000, | 58 | CELL_DMA_VALID = 0x80000000, |
59 | BPA_DMA_MASK = 0x7fffffff, | 59 | CELL_DMA_MASK = 0x7fffffff, |
60 | }; | 60 | }; |
61 | 61 | ||
62 | 62 | ||
63 | void bpa_init_iommu(void); | 63 | void cell_init_iommu(void); |
64 | 64 | ||
65 | #endif | 65 | #endif |
diff --git a/arch/ppc64/kernel/bpa_nvram.c b/arch/ppc64/kernel/bpa_nvram.c index 06a119cfceb5..74e0d31a3559 100644 --- a/arch/ppc64/kernel/bpa_nvram.c +++ b/arch/ppc64/kernel/bpa_nvram.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * NVRAM for CPBW | 2 | * memory mapped NVRAM |
3 | * | 3 | * |
4 | * (C) Copyright IBM Corp. 2005 | 4 | * (C) Copyright IBM Corp. 2005 |
5 | * | 5 | * |
@@ -30,54 +30,54 @@ | |||
30 | #include <asm/nvram.h> | 30 | #include <asm/nvram.h> |
31 | #include <asm/prom.h> | 31 | #include <asm/prom.h> |
32 | 32 | ||
33 | static void __iomem *bpa_nvram_start; | 33 | static void __iomem *mmio_nvram_start; |
34 | static long bpa_nvram_len; | 34 | static long mmio_nvram_len; |
35 | static spinlock_t bpa_nvram_lock = SPIN_LOCK_UNLOCKED; | 35 | static spinlock_t mmio_nvram_lock = SPIN_LOCK_UNLOCKED; |
36 | 36 | ||
37 | static ssize_t bpa_nvram_read(char *buf, size_t count, loff_t *index) | 37 | static ssize_t mmio_nvram_read(char *buf, size_t count, loff_t *index) |
38 | { | 38 | { |
39 | unsigned long flags; | 39 | unsigned long flags; |
40 | 40 | ||
41 | if (*index >= bpa_nvram_len) | 41 | if (*index >= mmio_nvram_len) |
42 | return 0; | 42 | return 0; |
43 | if (*index + count > bpa_nvram_len) | 43 | if (*index + count > mmio_nvram_len) |
44 | count = bpa_nvram_len - *index; | 44 | count = mmio_nvram_len - *index; |
45 | 45 | ||
46 | spin_lock_irqsave(&bpa_nvram_lock, flags); | 46 | spin_lock_irqsave(&mmio_nvram_lock, flags); |
47 | 47 | ||
48 | memcpy_fromio(buf, bpa_nvram_start + *index, count); | 48 | memcpy_fromio(buf, mmio_nvram_start + *index, count); |
49 | 49 | ||
50 | spin_unlock_irqrestore(&bpa_nvram_lock, flags); | 50 | spin_unlock_irqrestore(&mmio_nvram_lock, flags); |
51 | 51 | ||
52 | *index += count; | 52 | *index += count; |
53 | return count; | 53 | return count; |
54 | } | 54 | } |
55 | 55 | ||
56 | static ssize_t bpa_nvram_write(char *buf, size_t count, loff_t *index) | 56 | static ssize_t mmio_nvram_write(char *buf, size_t count, loff_t *index) |
57 | { | 57 | { |
58 | unsigned long flags; | 58 | unsigned long flags; |
59 | 59 | ||
60 | if (*index >= bpa_nvram_len) | 60 | if (*index >= mmio_nvram_len) |
61 | return 0; | 61 | return 0; |
62 | if (*index + count > bpa_nvram_len) | 62 | if (*index + count > mmio_nvram_len) |
63 | count = bpa_nvram_len - *index; | 63 | count = mmio_nvram_len - *index; |
64 | 64 | ||
65 | spin_lock_irqsave(&bpa_nvram_lock, flags); | 65 | spin_lock_irqsave(&mmio_nvram_lock, flags); |
66 | 66 | ||
67 | memcpy_toio(bpa_nvram_start + *index, buf, count); | 67 | memcpy_toio(mmio_nvram_start + *index, buf, count); |
68 | 68 | ||
69 | spin_unlock_irqrestore(&bpa_nvram_lock, flags); | 69 | spin_unlock_irqrestore(&mmio_nvram_lock, flags); |
70 | 70 | ||
71 | *index += count; | 71 | *index += count; |
72 | return count; | 72 | return count; |
73 | } | 73 | } |
74 | 74 | ||
75 | static ssize_t bpa_nvram_get_size(void) | 75 | static ssize_t mmio_nvram_get_size(void) |
76 | { | 76 | { |
77 | return bpa_nvram_len; | 77 | return mmio_nvram_len; |
78 | } | 78 | } |
79 | 79 | ||
80 | int __init bpa_nvram_init(void) | 80 | int __init mmio_nvram_init(void) |
81 | { | 81 | { |
82 | struct device_node *nvram_node; | 82 | struct device_node *nvram_node; |
83 | unsigned long *buffer; | 83 | unsigned long *buffer; |
@@ -97,20 +97,20 @@ int __init bpa_nvram_init(void) | |||
97 | 97 | ||
98 | ret = -ENODEV; | 98 | ret = -ENODEV; |
99 | nvram_addr = buffer[0]; | 99 | nvram_addr = buffer[0]; |
100 | bpa_nvram_len = buffer[1]; | 100 | mmio_nvram_len = buffer[1]; |
101 | if ( (!bpa_nvram_len) || (!nvram_addr) ) | 101 | if ( (!mmio_nvram_len) || (!nvram_addr) ) |
102 | goto out; | 102 | goto out; |
103 | 103 | ||
104 | bpa_nvram_start = ioremap(nvram_addr, bpa_nvram_len); | 104 | mmio_nvram_start = ioremap(nvram_addr, mmio_nvram_len); |
105 | if (!bpa_nvram_start) | 105 | if (!mmio_nvram_start) |
106 | goto out; | 106 | goto out; |
107 | 107 | ||
108 | printk(KERN_INFO "BPA NVRAM, %luk mapped to %p\n", | 108 | printk(KERN_INFO "mmio NVRAM, %luk mapped to %p\n", |
109 | bpa_nvram_len >> 10, bpa_nvram_start); | 109 | mmio_nvram_len >> 10, mmio_nvram_start); |
110 | 110 | ||
111 | ppc_md.nvram_read = bpa_nvram_read; | 111 | ppc_md.nvram_read = mmio_nvram_read; |
112 | ppc_md.nvram_write = bpa_nvram_write; | 112 | ppc_md.nvram_write = mmio_nvram_write; |
113 | ppc_md.nvram_size = bpa_nvram_get_size; | 113 | ppc_md.nvram_size = mmio_nvram_get_size; |
114 | 114 | ||
115 | out: | 115 | out: |
116 | of_node_put(nvram_node); | 116 | of_node_put(nvram_node); |
diff --git a/arch/ppc64/kernel/bpa_setup.c b/arch/ppc64/kernel/bpa_setup.c index c2dc8f282eb8..9a495634d0c2 100644 --- a/arch/ppc64/kernel/bpa_setup.c +++ b/arch/ppc64/kernel/bpa_setup.c | |||
@@ -1,11 +1,11 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/ppc/kernel/bpa_setup.c | 2 | * linux/arch/powerpc/platforms/cell/cell_setup.c |
3 | * | 3 | * |
4 | * Copyright (C) 1995 Linus Torvalds | 4 | * Copyright (C) 1995 Linus Torvalds |
5 | * Adapted from 'alpha' version by Gary Thomas | 5 | * Adapted from 'alpha' version by Gary Thomas |
6 | * Modified by Cort Dougan (cort@cs.nmt.edu) | 6 | * Modified by Cort Dougan (cort@cs.nmt.edu) |
7 | * Modified by PPC64 Team, IBM Corp | 7 | * Modified by PPC64 Team, IBM Corp |
8 | * Modified by BPA Team, IBM Deutschland Entwicklung GmbH | 8 | * Modified by Cell Team, IBM Deutschland Entwicklung GmbH |
9 | * | 9 | * |
10 | * This program is free software; you can redistribute it and/or | 10 | * This program is free software; you can redistribute it and/or |
11 | * modify it under the terms of the GNU General Public License | 11 | * modify it under the terms of the GNU General Public License |
@@ -46,8 +46,8 @@ | |||
46 | #include <asm/ppc-pci.h> | 46 | #include <asm/ppc-pci.h> |
47 | #include <asm/irq.h> | 47 | #include <asm/irq.h> |
48 | 48 | ||
49 | #include "bpa_iic.h" | 49 | #include "interrupt.h" |
50 | #include "bpa_iommu.h" | 50 | #include "iommu.h" |
51 | 51 | ||
52 | #ifdef DEBUG | 52 | #ifdef DEBUG |
53 | #define DBG(fmt...) udbg_printf(fmt) | 53 | #define DBG(fmt...) udbg_printf(fmt) |
@@ -55,7 +55,7 @@ | |||
55 | #define DBG(fmt...) | 55 | #define DBG(fmt...) |
56 | #endif | 56 | #endif |
57 | 57 | ||
58 | void bpa_show_cpuinfo(struct seq_file *m) | 58 | void cell_show_cpuinfo(struct seq_file *m) |
59 | { | 59 | { |
60 | struct device_node *root; | 60 | struct device_node *root; |
61 | const char *model = ""; | 61 | const char *model = ""; |
@@ -63,22 +63,22 @@ void bpa_show_cpuinfo(struct seq_file *m) | |||
63 | root = of_find_node_by_path("/"); | 63 | root = of_find_node_by_path("/"); |
64 | if (root) | 64 | if (root) |
65 | model = get_property(root, "model", NULL); | 65 | model = get_property(root, "model", NULL); |
66 | seq_printf(m, "machine\t\t: BPA %s\n", model); | 66 | seq_printf(m, "machine\t\t: CHRP %s\n", model); |
67 | of_node_put(root); | 67 | of_node_put(root); |
68 | } | 68 | } |
69 | 69 | ||
70 | static void bpa_progress(char *s, unsigned short hex) | 70 | static void cell_progress(char *s, unsigned short hex) |
71 | { | 71 | { |
72 | printk("*** %04x : %s\n", hex, s ? s : ""); | 72 | printk("*** %04x : %s\n", hex, s ? s : ""); |
73 | } | 73 | } |
74 | 74 | ||
75 | static void __init bpa_setup_arch(void) | 75 | static void __init cell_setup_arch(void) |
76 | { | 76 | { |
77 | ppc_md.init_IRQ = iic_init_IRQ; | 77 | ppc_md.init_IRQ = iic_init_IRQ; |
78 | ppc_md.get_irq = iic_get_irq; | 78 | ppc_md.get_irq = iic_get_irq; |
79 | 79 | ||
80 | #ifdef CONFIG_SMP | 80 | #ifdef CONFIG_SMP |
81 | smp_init_pSeries(); | 81 | smp_init_cell(); |
82 | #endif | 82 | #endif |
83 | 83 | ||
84 | /* init to some ~sane value until calibrate_delay() runs */ | 84 | /* init to some ~sane value until calibrate_delay() runs */ |
@@ -97,39 +97,39 @@ static void __init bpa_setup_arch(void) | |||
97 | conswitchp = &dummy_con; | 97 | conswitchp = &dummy_con; |
98 | #endif | 98 | #endif |
99 | 99 | ||
100 | bpa_nvram_init(); | 100 | mmio_nvram_init(); |
101 | } | 101 | } |
102 | 102 | ||
103 | /* | 103 | /* |
104 | * Early initialization. Relocation is on but do not reference unbolted pages | 104 | * Early initialization. Relocation is on but do not reference unbolted pages |
105 | */ | 105 | */ |
106 | static void __init bpa_init_early(void) | 106 | static void __init cell_init_early(void) |
107 | { | 107 | { |
108 | DBG(" -> bpa_init_early()\n"); | 108 | DBG(" -> cell_init_early()\n"); |
109 | 109 | ||
110 | hpte_init_native(); | 110 | hpte_init_native(); |
111 | 111 | ||
112 | bpa_init_iommu(); | 112 | cell_init_iommu(); |
113 | 113 | ||
114 | ppc64_interrupt_controller = IC_BPA_IIC; | 114 | ppc64_interrupt_controller = IC_CELL_PIC; |
115 | 115 | ||
116 | DBG(" <- bpa_init_early()\n"); | 116 | DBG(" <- cell_init_early()\n"); |
117 | } | 117 | } |
118 | 118 | ||
119 | 119 | ||
120 | static int __init bpa_probe(int platform) | 120 | static int __init cell_probe(int platform) |
121 | { | 121 | { |
122 | if (platform != PLATFORM_BPA) | 122 | if (platform != PLATFORM_CELL) |
123 | return 0; | 123 | return 0; |
124 | 124 | ||
125 | return 1; | 125 | return 1; |
126 | } | 126 | } |
127 | 127 | ||
128 | struct machdep_calls __initdata bpa_md = { | 128 | struct machdep_calls __initdata cell_md = { |
129 | .probe = bpa_probe, | 129 | .probe = cell_probe, |
130 | .setup_arch = bpa_setup_arch, | 130 | .setup_arch = cell_setup_arch, |
131 | .init_early = bpa_init_early, | 131 | .init_early = cell_init_early, |
132 | .show_cpuinfo = bpa_show_cpuinfo, | 132 | .show_cpuinfo = cell_show_cpuinfo, |
133 | .restart = rtas_restart, | 133 | .restart = rtas_restart, |
134 | .power_off = rtas_power_off, | 134 | .power_off = rtas_power_off, |
135 | .halt = rtas_halt, | 135 | .halt = rtas_halt, |
@@ -137,5 +137,5 @@ struct machdep_calls __initdata bpa_md = { | |||
137 | .get_rtc_time = rtas_get_rtc_time, | 137 | .get_rtc_time = rtas_get_rtc_time, |
138 | .set_rtc_time = rtas_set_rtc_time, | 138 | .set_rtc_time = rtas_set_rtc_time, |
139 | .calibrate_decr = generic_calibrate_decr, | 139 | .calibrate_decr = generic_calibrate_decr, |
140 | .progress = bpa_progress, | 140 | .progress = cell_progress, |
141 | }; | 141 | }; |
diff --git a/arch/ppc64/kernel/irq.c b/arch/ppc64/kernel/irq.c index f41afe545045..b072ed6f77ad 100644 --- a/arch/ppc64/kernel/irq.c +++ b/arch/ppc64/kernel/irq.c | |||
@@ -392,7 +392,7 @@ int virt_irq_create_mapping(unsigned int real_irq) | |||
392 | if (ppc64_interrupt_controller == IC_OPEN_PIC) | 392 | if (ppc64_interrupt_controller == IC_OPEN_PIC) |
393 | return real_irq; /* no mapping for openpic (for now) */ | 393 | return real_irq; /* no mapping for openpic (for now) */ |
394 | 394 | ||
395 | if (ppc64_interrupt_controller == IC_BPA_IIC) | 395 | if (ppc64_interrupt_controller == IC_CELL_PIC) |
396 | return real_irq; /* no mapping for iic either */ | 396 | return real_irq; /* no mapping for iic either */ |
397 | 397 | ||
398 | /* don't map interrupts < MIN_VIRT_IRQ */ | 398 | /* don't map interrupts < MIN_VIRT_IRQ */ |
diff --git a/arch/ppc64/kernel/proc_ppc64.c b/arch/ppc64/kernel/proc_ppc64.c index a87c66a9652a..24e955ee9487 100644 --- a/arch/ppc64/kernel/proc_ppc64.c +++ b/arch/ppc64/kernel/proc_ppc64.c | |||
@@ -53,7 +53,7 @@ static int __init proc_ppc64_create(void) | |||
53 | if (!root) | 53 | if (!root) |
54 | return 1; | 54 | return 1; |
55 | 55 | ||
56 | if (!(systemcfg->platform & (PLATFORM_PSERIES | PLATFORM_BPA))) | 56 | if (!(systemcfg->platform & (PLATFORM_PSERIES | PLATFORM_CELL))) |
57 | return 0; | 57 | return 0; |
58 | 58 | ||
59 | if (!proc_mkdir("rtas", root)) | 59 | if (!proc_mkdir("rtas", root)) |
diff --git a/arch/ppc64/kernel/prom_init.c b/arch/ppc64/kernel/prom_init.c index 69924ba4d7d9..a4bbca6dbb8b 100644 --- a/arch/ppc64/kernel/prom_init.c +++ b/arch/ppc64/kernel/prom_init.c | |||
@@ -1939,9 +1939,9 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, unsigned long | |||
1939 | prom_send_capabilities(); | 1939 | prom_send_capabilities(); |
1940 | 1940 | ||
1941 | /* | 1941 | /* |
1942 | * On pSeries and BPA, copy the CPU hold code | 1942 | * On pSeries and Cell, copy the CPU hold code |
1943 | */ | 1943 | */ |
1944 | if (RELOC(of_platform) & (PLATFORM_PSERIES | PLATFORM_BPA)) | 1944 | if (RELOC(of_platform) & (PLATFORM_PSERIES | PLATFORM_CELL)) |
1945 | copy_and_flush(0, KERNELBASE - offset, 0x100, 0); | 1945 | copy_and_flush(0, KERNELBASE - offset, 0x100, 0); |
1946 | 1946 | ||
1947 | /* | 1947 | /* |
diff --git a/arch/ppc64/kernel/spider-pic.c b/arch/ppc64/kernel/spider-pic.c index d5c9a02fb119..e74132188bdf 100644 --- a/arch/ppc64/kernel/spider-pic.c +++ b/arch/ppc64/kernel/spider-pic.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include <asm/prom.h> | 27 | #include <asm/prom.h> |
28 | #include <asm/io.h> | 28 | #include <asm/io.h> |
29 | 29 | ||
30 | #include "bpa_iic.h" | 30 | #include "interrupt.h" |
31 | 31 | ||
32 | /* register layout taken from Spider spec, table 7.4-4 */ | 32 | /* register layout taken from Spider spec, table 7.4-4 */ |
33 | enum { | 33 | enum { |