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

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

Merge branches 'powercap' and 'pm-devfreq' 

* powercap:
  powercap / RAPL: mark rapl_ids array as __initconst
  powercap / RAPL: add ID for Broadwell server

* pm-devfreq:
  PM / devfreq: tegra: Register governor on module init
  PM / devfreq: tegra: Enable interrupts after resuming the devfreq monitor
  PM / devfreq: tegra: Set drvdata before enabling the irq
  PM / devfreq: tegra: remove operating-points
  PM / devfreq: tegra: Use clock rate constraints
  PM / devfreq: tegra: Update to v5 of the submitted patches
  PM / devfreq: correct misleading comment
  PM / devfreq: event: Add const keyword for devfreq_event_ops structure
parents 03aecbcd ea85dbca 66776a67

drivers/devfreq/devfreq.c

+0 −1
Original line number Diff line number Diff line
@@ -392,7 +392,6 @@ static int devfreq_notifier_call(struct notifier_block *nb, unsigned long type, 
/**

 * _remove_devfreq() - Remove devfreq from the list and release its resources.

 * @devfreq:	the devfreq struct

 * @skip:	skip calling device_unregister().

 */

static void _remove_devfreq(struct devfreq *devfreq)

{

drivers/devfreq/event/exynos-ppmu.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static int exynos_ppmu_get_event(struct devfreq_event_dev *edev, 
	return 0;

}



static struct devfreq_event_ops exynos_ppmu_ops = {

static const struct devfreq_event_ops exynos_ppmu_ops = {

	.disable = exynos_ppmu_disable,

	.set_event = exynos_ppmu_set_event,

	.get_event = exynos_ppmu_get_event,

drivers/devfreq/tegra-devfreq.c

+288 −221

File changed.

Preview size limit exceeded, changes collapsed.

drivers/powercap/intel_rapl.c

+2 −1
Original line number Diff line number Diff line
@@ -1054,7 +1054,7 @@ static const struct rapl_defaults rapl_defaults_atom = { 
		.driver_data = (kernel_ulong_t)&_ops,	\

		}



static const struct x86_cpu_id rapl_ids[] = {

static const struct x86_cpu_id rapl_ids[] __initconst = {

	RAPL_CPU(0x2a, rapl_defaults_core),/* Sandy Bridge */

	RAPL_CPU(0x2d, rapl_defaults_core),/* Sandy Bridge EP */

	RAPL_CPU(0x37, rapl_defaults_atom),/* Valleyview */
@@ -1062,6 +1062,7 @@ static const struct x86_cpu_id rapl_ids[] = { 
	RAPL_CPU(0x3c, rapl_defaults_core),/* Haswell */

	RAPL_CPU(0x3d, rapl_defaults_core),/* Broadwell */

	RAPL_CPU(0x3f, rapl_defaults_hsw_server),/* Haswell servers */

	RAPL_CPU(0x4f, rapl_defaults_hsw_server),/* Broadwell servers */

	RAPL_CPU(0x45, rapl_defaults_core),/* Haswell ULT */

	RAPL_CPU(0x4C, rapl_defaults_atom),/* Braswell */

	RAPL_CPU(0x4A, rapl_defaults_atom),/* Tangier */

include/linux/devfreq-event.h

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ struct devfreq_event_desc { 
	const char *name;

	void *driver_data;



	struct devfreq_event_ops *ops;

	const struct devfreq_event_ops *ops;

};



#if defined(CONFIG_PM_DEVFREQ_EVENT)