rk: revert to v3.10

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-vexpress / v2m.c

diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 057f99b62eaff24daaee3c70a4f8b7ed3dec231c..8802030df98d0fbac53f4cd1f01df30f598f1773 100644 (file)
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -10,7 +10,6 @@
 #include <linux/smp.h>
 #include <linux/init.h>
 #include <linux/irqchip.h>
-#include <linux/memblock.h>
 #include <linux/of_address.h>
 #include <linux/of_fdt.h>
 #include <linux/of_irq.h>
@@ -374,31 +373,6 @@ MACHINE_START(VEXPRESS, "ARM-Versatile Express")
        .init_machine   = v2m_init,
 MACHINE_END
 
-static void __init v2m_dt_hdlcd_init(void)
-{
-       struct device_node *node;
-       int len, na, ns;
-       const __be32 *prop;
-       phys_addr_t fb_base, fb_size;
-
-       node = of_find_compatible_node(NULL, NULL, "arm,hdlcd");
-       if (!node)
-               return;
-
-       na = of_n_addr_cells(node);
-       ns = of_n_size_cells(node);
-
-       prop = of_get_property(node, "framebuffer", &len);
-       if (WARN_ON(!prop || len < (na + ns) * sizeof(*prop)))
-               return;
-
-       fb_base = of_read_number(prop, na);
-       fb_size = of_read_number(prop + na, ns);
-
-       if (WARN_ON(memblock_remove(fb_base, fb_size)))
-               return;
-};
-
 static struct map_desc v2m_rs1_io_desc __initdata = {
        .virtual        = V2M_PERIPH,
        .pfn            = __phys_to_pfn(0x1c000000),
@@ -449,8 +423,6 @@ void __init v2m_dt_init_early(void)
                        pr_warning("vexpress: DT HBI (%x) is not matching "
                                        "hardware (%x)!\n", dt_hbi, hbi);
        }
-
-       v2m_dt_hdlcd_init();
 }
 
 static void __init v2m_dt_timer_init(void)
@@ -484,7 +456,6 @@ static const char * const v2m_dt_match[] __initconst = {
 DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express")
        .dt_compat      = v2m_dt_match,
        .smp            = smp_ops(vexpress_smp_ops),
-       .smp_init       = smp_init_ops(vexpress_smp_init_ops),
        .map_io         = v2m_dt_map_io,
        .init_early     = v2m_dt_init_early,
        .init_irq       = irqchip_init,