Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9aa79549 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: pm-8x60: Remove direct access to GIC registers"

parents a3bb242f 44a1ce17

arch/arm/mach-msm/pm-8x60.c

+3 −17
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include <linux/of_platform.h>

#include <linux/regulator/krait-regulator.h>

#include <linux/cpu.h>

#include <mach/msm_iomap.h>

#include <mach/socinfo.h>

#include <mach/scm.h>

#include <mach/socinfo.h>
@@ -635,23 +634,10 @@ static bool msm_pm_power_collapse(bool from_idle) 
	if (cp15_data.save_cp15)

		msm_pm_restore_cpu_reg();



	if (cpu_online(cpu) && !msm_no_ramp_down_pc) {

	if (cpu_online(cpu) && !msm_no_ramp_down_pc)

		ramp_up_first_cpu(cpu, saved_acpuclk_rate);

	} else {

		unsigned int gic_dist_enabled;

		unsigned int gic_dist_pending;

		gic_dist_enabled = readl_relaxed(

				MSM_QGIC_DIST_BASE + GIC_DIST_ENABLE_CLEAR);

		gic_dist_pending = readl_relaxed(

				MSM_QGIC_DIST_BASE + GIC_DIST_PENDING_SET);

		mb();

		gic_dist_pending &= gic_dist_enabled;



		if (gic_dist_pending)

			pr_err("CPU %d interrupted during hotplug.Pending int 0x%x\n",

					cpu, gic_dist_pending);

	}



	else

		__WARN();



	avs_set_avsdscr(avsdscr);

	avs_set_avscsr(avscsr);