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

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

Merge branch 'pm-cpufreq' 

* pm-cpufreq: (63 commits)
  intel_pstate: Clean up get_target_pstate_use_performance()
  intel_pstate: Use sample.core_avg_perf in get_avg_pstate()
  intel_pstate: Clarify average performance computation
  intel_pstate: Avoid unnecessary synchronize_sched() during initialization
  cpufreq: schedutil: Make default depend on CONFIG_SMP
  cpufreq: powernv: del_timer_sync when global and local pstate are equal
  cpufreq: powernv: Move smp_call_function_any() out of irq safe block
  intel_pstate: Clean up intel_pstate_get()
  cpufreq: schedutil: Make it depend on CONFIG_SMP
  cpufreq: governor: Fix handling of special cases in dbs_update()
  cpufreq: intel_pstate: Ignore _PPC processing under HWP
  cpufreq: arm_big_little: use generic OPP functions for {init, free}_opp_table
  cpufreq: tango: Use generic platdev driver
  cpufreq: Fix GOV_LIMITS handling for the userspace governor
  cpufreq: mvebu: Move cpufreq code into drivers/cpufreq/
  cpufreq: dt: Kill platform-data
  mvebu: Use dev_pm_opp_set_sharing_cpus() to mark OPP tables as shared
  cpufreq: dt: Identify cpu-sharing for platforms without operating-points-v2
  cpufreq: governor: Change confusing struct field and variable names
  cpufreq: intel_pstate: Enable PPC enforcement for servers
  ...
parents 29cff184 1aa7a6e2

Documentation/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -1661,6 +1661,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
		hwp_only

			Only load intel_pstate on systems which support

			hardware P state control (HWP) if available.

		support_acpi_ppc

			Enforce ACPI _PPC performance limits. If the Fixed ACPI

			Description Table, specifies preferred power management

			profile as "Enterprise Server" or "Performance Server",

			then this feature is turned on by default.



	intremap=	[X86-64, Intel-IOMMU]

			on	enable Interrupt Remapping (default)

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1322,6 +1322,7 @@ F: drivers/rtc/rtc-armada38x.c 
F:	arch/arm/boot/dts/armada*

F:	arch/arm/boot/dts/kirkwood*

F:	arch/arm64/boot/dts/marvell/armada*

F:	drivers/cpufreq/mvebu-cpufreq.c





ARM/Marvell Berlin SoC support

arch/arm/mach-berlin/berlin.c

+0 −6
Original line number Diff line number Diff line
@@ -18,11 +18,6 @@ 
#include <asm/hardware/cache-l2x0.h>

#include <asm/mach/arch.h>



static void __init berlin_init_late(void)

{

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

}



static const char * const berlin_dt_compat[] = {

	"marvell,berlin",

	NULL,
@@ -30,7 +25,6 @@ static const char * const berlin_dt_compat[] = { 


DT_MACHINE_START(BERLIN_DT, "Marvell Berlin")

	.dt_compat	= berlin_dt_compat,

	.init_late	= berlin_init_late,

	/*

	 * with DT probing for L2CCs, berlin_init_machine can be removed.

	 * Note: 88DE3005 (Armada 1500-mini) uses pl310 l2cc

arch/arm/mach-exynos/exynos.c

+0 −29
Original line number Diff line number Diff line
@@ -213,33 +213,6 @@ static void __init exynos_init_irq(void) 
	exynos_map_pmu();

}



static const struct of_device_id exynos_cpufreq_matches[] = {

	{ .compatible = "samsung,exynos3250", .data = "cpufreq-dt" },

	{ .compatible = "samsung,exynos4210", .data = "cpufreq-dt" },

	{ .compatible = "samsung,exynos4212", .data = "cpufreq-dt" },

	{ .compatible = "samsung,exynos4412", .data = "cpufreq-dt" },

	{ .compatible = "samsung,exynos5250", .data = "cpufreq-dt" },

#ifndef CONFIG_BL_SWITCHER

	{ .compatible = "samsung,exynos5420", .data = "cpufreq-dt" },

	{ .compatible = "samsung,exynos5800", .data = "cpufreq-dt" },

#endif

	{ /* sentinel */ }

};



static void __init exynos_cpufreq_init(void)

{

	struct device_node *root = of_find_node_by_path("/");

	const struct of_device_id *match;



	match = of_match_node(exynos_cpufreq_matches, root);

	if (!match) {

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

		return;

	}



	platform_device_register_simple(match->data, -1, NULL, 0);

}



static void __init exynos_dt_machine_init(void)

{

	/*
@@ -262,8 +235,6 @@ static void __init exynos_dt_machine_init(void) 
	    of_machine_is_compatible("samsung,exynos5250"))

		platform_device_register(&exynos_cpuidle);



	exynos_cpufreq_init();



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}

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

+0 −10
Original line number Diff line number Diff line
@@ -18,15 +18,6 @@ 
#include "common.h"

#include "mx27.h"



static void __init imx27_dt_init(void)

{

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



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);



	platform_device_register_full(&devinfo);

}



static const char * const imx27_dt_board_compat[] __initconst = {

	"fsl,imx27",

	NULL
@@ -36,6 +27,5 @@ DT_MACHINE_START(IMX27_DT, "Freescale i.MX27 (Device Tree Support)") 
	.map_io		= mx27_map_io,

	.init_early	= imx27_init_early,

	.init_irq	= mx27_init_irq,

	.init_machine	= imx27_dt_init,

	.dt_compat	= imx27_dt_board_compat,

MACHINE_END