|
@@ -23,7 +23,6 @@
|
|
#include <linux/of.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/of_platform.h>
|
|
-#include <linux/perf/arm_pmu.h>
|
|
|
|
#include <linux/regulator/machine.h>
|
|
#include <linux/regulator/machine.h>
|
|
|
|
|
|
#include <asm/outercache.h>
|
|
#include <asm/outercache.h>
|
|
@@ -112,37 +111,6 @@ static void ux500_restart(enum reboot_mode mode, const char *cmd)
|
|
prcmu_system_reset(0);
|
|
prcmu_system_reset(0);
|
|
}
|
|
}
|
|
|
|
|
|
-/*
|
|
|
|
- * The PMU IRQ lines of two cores are wired together into a single interrupt.
|
|
|
|
- * Bounce the interrupt to the other core if it's not ours.
|
|
|
|
- */
|
|
|
|
-static irqreturn_t db8500_pmu_handler(int irq, void *dev, irq_handler_t handler)
|
|
|
|
-{
|
|
|
|
- irqreturn_t ret = handler(irq, dev);
|
|
|
|
- int other = !smp_processor_id();
|
|
|
|
-
|
|
|
|
- if (ret == IRQ_NONE && cpu_online(other))
|
|
|
|
- irq_set_affinity(irq, cpumask_of(other));
|
|
|
|
-
|
|
|
|
- /*
|
|
|
|
- * We should be able to get away with the amount of IRQ_NONEs we give,
|
|
|
|
- * while still having the spurious IRQ detection code kick in if the
|
|
|
|
- * interrupt really starts hitting spuriously.
|
|
|
|
- */
|
|
|
|
- return ret;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-static struct arm_pmu_platdata db8500_pmu_platdata = {
|
|
|
|
- .handle_irq = db8500_pmu_handler,
|
|
|
|
- .irq_flags = IRQF_NOBALANCING | IRQF_NO_THREAD,
|
|
|
|
-};
|
|
|
|
-
|
|
|
|
-static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
|
|
|
|
- /* Requires call-back bindings. */
|
|
|
|
- OF_DEV_AUXDATA("arm,cortex-a9-pmu", 0, "arm-pmu", &db8500_pmu_platdata),
|
|
|
|
- {},
|
|
|
|
-};
|
|
|
|
-
|
|
|
|
static struct of_dev_auxdata u8540_auxdata_lookup[] __initdata = {
|
|
static struct of_dev_auxdata u8540_auxdata_lookup[] __initdata = {
|
|
OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", NULL),
|
|
OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", NULL),
|
|
{},
|
|
{},
|
|
@@ -165,9 +133,6 @@ static void __init u8500_init_machine(void)
|
|
if (of_machine_is_compatible("st-ericsson,u8540"))
|
|
if (of_machine_is_compatible("st-ericsson,u8540"))
|
|
of_platform_populate(NULL, u8500_local_bus_nodes,
|
|
of_platform_populate(NULL, u8500_local_bus_nodes,
|
|
u8540_auxdata_lookup, NULL);
|
|
u8540_auxdata_lookup, NULL);
|
|
- else
|
|
|
|
- of_platform_populate(NULL, u8500_local_bus_nodes,
|
|
|
|
- u8500_auxdata_lookup, NULL);
|
|
|
|
}
|
|
}
|
|
|
|
|
|
static const char * stericsson_dt_platform_compat[] = {
|
|
static const char * stericsson_dt_platform_compat[] = {
|