diff options
| -rw-r--r-- | arch/microblaze/kernel/Makefile | 2 | ||||
| -rw-r--r-- | arch/microblaze/kernel/prom_parse.c | 35 |
2 files changed, 1 insertions, 36 deletions
diff --git a/arch/microblaze/kernel/Makefile b/arch/microblaze/kernel/Makefile index 08d50cc55e7d..f08bacaf8a95 100644 --- a/arch/microblaze/kernel/Makefile +++ b/arch/microblaze/kernel/Makefile | |||
| @@ -16,7 +16,7 @@ extra-y := head.o vmlinux.lds | |||
| 16 | 16 | ||
| 17 | obj-y += dma.o exceptions.o \ | 17 | obj-y += dma.o exceptions.o \ |
| 18 | hw_exception_handler.o intc.o irq.o \ | 18 | hw_exception_handler.o intc.o irq.o \ |
| 19 | platform.o process.o prom.o prom_parse.o ptrace.o \ | 19 | platform.o process.o prom.o ptrace.o \ |
| 20 | reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o | 20 | reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o |
| 21 | 21 | ||
| 22 | obj-y += cpu/ | 22 | obj-y += cpu/ |
diff --git a/arch/microblaze/kernel/prom_parse.c b/arch/microblaze/kernel/prom_parse.c deleted file mode 100644 index 068762f55fd6..000000000000 --- a/arch/microblaze/kernel/prom_parse.c +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | #undef DEBUG | ||
| 2 | |||
| 3 | #include <linux/export.h> | ||
| 4 | #include <linux/kernel.h> | ||
| 5 | #include <linux/string.h> | ||
| 6 | #include <linux/ioport.h> | ||
| 7 | #include <linux/etherdevice.h> | ||
| 8 | #include <linux/of_address.h> | ||
| 9 | #include <asm/prom.h> | ||
| 10 | |||
| 11 | void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop, | ||
| 12 | unsigned long *busno, unsigned long *phys, unsigned long *size) | ||
| 13 | { | ||
| 14 | const u32 *dma_window; | ||
| 15 | u32 cells; | ||
| 16 | const unsigned char *prop; | ||
| 17 | |||
| 18 | dma_window = dma_window_prop; | ||
| 19 | |||
| 20 | /* busno is always one cell */ | ||
| 21 | *busno = *(dma_window++); | ||
| 22 | |||
| 23 | prop = of_get_property(dn, "ibm,#dma-address-cells", NULL); | ||
| 24 | if (!prop) | ||
| 25 | prop = of_get_property(dn, "#address-cells", NULL); | ||
| 26 | |||
| 27 | cells = prop ? *(u32 *)prop : of_n_addr_cells(dn); | ||
| 28 | *phys = of_read_number(dma_window, cells); | ||
| 29 | |||
| 30 | dma_window += cells; | ||
| 31 | |||
| 32 | prop = of_get_property(dn, "ibm,#dma-size-cells", NULL); | ||
| 33 | cells = prop ? *(u32 *)prop : of_n_size_cells(dn); | ||
| 34 | *size = of_read_number(dma_window, cells); | ||
| 35 | } | ||
