Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / microblaze / kernel / prom_parse.c

diff --git a/arch/microblaze/kernel/prom_parse.c b/arch/microblaze/kernel/prom_parse.c
deleted file mode 100644 (file)
index 068762f..0000000
--- a/arch/microblaze/kernel/prom_parse.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#undef DEBUG
-
-#include <linux/export.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/ioport.h>
-#include <linux/etherdevice.h>
-#include <linux/of_address.h>
-#include <asm/prom.h>
-
-void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
-               unsigned long *busno, unsigned long *phys, unsigned long *size)
-{
-       const u32 *dma_window;
-       u32 cells;
-       const unsigned char *prop;
-
-       dma_window = dma_window_prop;
-
-       /* busno is always one cell */
-       *busno = *(dma_window++);
-
-       prop = of_get_property(dn, "ibm,#dma-address-cells", NULL);
-       if (!prop)
-               prop = of_get_property(dn, "#address-cells", NULL);
-
-       cells = prop ? *(u32 *)prop : of_n_addr_cells(dn);
-       *phys = of_read_number(dma_window, cells);
-
-       dma_window += cells;
-
-       prop = of_get_property(dn, "ibm,#dma-size-cells", NULL);
-       cells = prop ? *(u32 *)prop : of_n_size_cells(dn);
-       *size = of_read_number(dma_window, cells);
-}