Merge tag 'imx-soc-5.3' of... (a7d88146) · Commits · 戴 / test

arch/arm/mach-imx/cpuidle-imx6q.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -17,22 +17,22 @@
		#include "hardware.h"

		static int num_idle_cpus = 0;
		static DEFINE_SPINLOCK(cpuidle_lock);
		static DEFINE_RAW_SPINLOCK(cpuidle_lock);

		static int imx6q_enter_wait(struct cpuidle_device *dev,
		struct cpuidle_driver *drv, int index)
		{
		spin_lock(&cpuidle_lock);
		raw_spin_lock(&cpuidle_lock);
		if (++num_idle_cpus == num_online_cpus())
		imx6_set_lpm(WAIT_UNCLOCKED);
		spin_unlock(&cpuidle_lock);
		raw_spin_unlock(&cpuidle_lock);

		cpu_do_idle();

		spin_lock(&cpuidle_lock);
		raw_spin_lock(&cpuidle_lock);
		if (num_idle_cpus-- == num_online_cpus())
		imx6_set_lpm(WAIT_CLOCKED);
		spin_unlock(&cpuidle_lock);
		raw_spin_unlock(&cpuidle_lock);

		return index;
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,12 @@ static void __init imx7d_init_machine(void)
		imx7d_enet_init();
		}

		static void __init imx7d_init_late(void)
		{
		if (IS_ENABLED(CONFIG_ARM_IMX_CPUFREQ_DT))
		platform_device_register_simple("imx-cpufreq-dt", -1, NULL, 0);
		}

		static void __init imx7d_init_irq(void)
		{
		imx_init_revision_from_anatop();
		@@ -113,5 +119,6 @@ static const char *const imx7d_dt_compat[] __initconst = {
		DT_MACHINE_START(IMX7D, "Freescale i.MX7 Dual (Device Tree)")
		.init_irq = imx7d_init_irq,
		.init_machine = imx7d_init_machine,
		.init_late = imx7d_init_late,
		.dt_compat = imx7d_dt_compat,
		MACHINE_END