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

Commit 0f4685d0 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq' 

* pm-cpufreq:
  cpufreq: cpufreq-dt: fix potential double put of cpu OF node
  cpufreq: cpu0: rename driver and internals to 'cpufreq_dt'
  cpufreq: ppc-corenet: remove duplicate update of cpu_data
  cpufreq: Replace strnicmp with strncasecmp
  cpufreq: powernv: Set the cpus to nominal frequency during reboot/kexec
  cpufreq: powernv: Set the pstate of the last hotplugged out cpu in policy->cpus to minimum
  cpufreq: Allow stop CPU callback to be used by all cpufreq drivers
  cpufreq: cpu0: Make allocate_resources() work for any CPU
  cpufreq: cpu0: try regulators with name "cpu-supply"
  cpufreq: cpu0: Move per-cluster initialization code to ->init()
  cpufreq: cpu0: use dev_{err|warn|dbg} instead of pr_{err|warn|debug}
  cpufreq: cpu0: print relevant error when we defer probe
  cpufreq: cpu0: don't validate clock on clk_put()
  cpufreq: cpu0: Update Module Author
  cpufreq: Add support for per-policy driver data
parents b2eed302 6f1293ff

Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt→Documentation/devicetree/bindings/cpufreq/cpufreq-dt.txt

+4 −4
Original line number Original line Diff line number Diff line 
Generic CPU0 cpufreq driver

Generic cpufreq driver





It is a generic cpufreq driver for CPU0 frequency management.  It

It is a generic DT based cpufreq driver for frequency management.  It supports

supports both uniprocessor (UP) and symmetric multiprocessor (SMP)

both uniprocessor (UP) and symmetric multiprocessor (SMP) systems which share

systems which share clock and voltage across all CPUs.

clock and voltage across all CPUs.





Both required and optional properties listed below must be defined

Both required and optional properties listed below must be defined

under node /cpus/cpu@0.

under node /cpus/cpu@0.

arch/arm/configs/mvebu_v7_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y 
CONFIG_CPU_IDLE=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_MVEBU_V7_CPUIDLE=y

CONFIG_ARM_MVEBU_V7_CPUIDLE=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ=y

CONFIG_CPUFREQ_GENERIC=y

CONFIG_CPUFREQ_DT=y

CONFIG_VFP=y

CONFIG_VFP=y

CONFIG_NET=y

CONFIG_NET=y

CONFIG_INET=y

CONFIG_INET=y

arch/arm/mach-imx/imx27-dt.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 




static void __init imx27_dt_init(void)

static void __init imx27_dt_init(void)

{

{

	struct platform_device_info devinfo = { .name = "cpufreq-cpu0", };

	struct platform_device_info devinfo = { .name = "cpufreq-dt", };





	mxc_arch_reset_init_dt();

	mxc_arch_reset_init_dt();

arch/arm/mach-imx/mach-imx51.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ static void __init imx51_ipu_mipi_setup(void) 




static void __init imx51_dt_init(void)

static void __init imx51_dt_init(void)

{

{

	struct platform_device_info devinfo = { .name = "cpufreq-cpu0", };

	struct platform_device_info devinfo = { .name = "cpufreq-dt", };





	mxc_arch_reset_init_dt();

	mxc_arch_reset_init_dt();

	imx51_ipu_mipi_setup();

	imx51_ipu_mipi_setup();

arch/arm/mach-mvebu/pmsu.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -644,7 +644,7 @@ static int __init armada_xp_pmsu_cpufreq_init(void) 
		}

		}

	}

	}





	platform_device_register_simple("cpufreq-generic", -1, NULL, 0);

	platform_device_register_simple("cpufreq-dt", -1, NULL, 0);

	return 0;

	return 0;

}

}