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

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

Merge branch 'for-4.9-rc' of... 

Merge branch 'for-4.9-rc' of https://kernel.googlesource.com/pub/scm/linux/kernel/git/mzx/devfreq into pm-devfreq

Pull devfreq fixes from MyungJoo Ham.

* 'for-4.9-rc' of https://kernel.googlesource.com/pub/scm/linux/kernel/git/mzx/devfreq:
  PM / devfreq: rk3399_dmc: Use the resource-managed function to add devfreq dev
  PM / devfreq: correct comment typo.
  PM / devfreq: exynos-ppmu: Remove unused mutex from struct exynos_ppmu
  PM / devfreq: exynos-ppmu: ppmu_events array should not be NULL terminated
  PM / devfreq: exynos-ppmu: Fix module autoload
  PM / devfreq: rockchip-dfi: Fix module autoload
  PM / devfreq: exynos-nocp: Fix module autoload
  PM / devfreq: rk3399_dmc: Fix module autoload
parents 9c763584 927b75a6

drivers/devfreq/devfreq.c

+1 −1
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ int devfreq_add_governor(struct devfreq_governor *governor) 
EXPORT_SYMBOL(devfreq_add_governor);



/**

 * devfreq_remove_device() - Remove devfreq feature from a device.

 * devfreq_remove_governor() - Remove devfreq feature from a device.

 * @governor:	the devfreq governor to be removed

 */

int devfreq_remove_governor(struct devfreq_governor *governor)

drivers/devfreq/event/exynos-nocp.c

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ static const struct of_device_id exynos_nocp_id_match[] = { 
	{ .compatible = "samsung,exynos5420-nocp", },

	{ /* sentinel */ },

};

MODULE_DEVICE_TABLE(of, exynos_nocp_id_match);



static struct regmap_config exynos_nocp_regmap_config = {

	.reg_bits = 32,

drivers/devfreq/event/exynos-ppmu.c

+1 −5
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/io.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/of_address.h>

#include <linux/platform_device.h>

#include <linux/suspend.h>
@@ -34,7 +33,6 @@ struct exynos_ppmu { 
	unsigned int num_events;



	struct device *dev;

	struct mutex lock;



	struct exynos_ppmu_data ppmu;

};
@@ -90,8 +88,6 @@ struct __exynos_ppmu_events { 
	PPMU_EVENT(d1-cpu),

	PPMU_EVENT(d1-general),

	PPMU_EVENT(d1-rt),



	{ /* sentinel */ },

};



static int exynos_ppmu_find_ppmu_id(struct devfreq_event_dev *edev)
@@ -351,6 +347,7 @@ static const struct of_device_id exynos_ppmu_id_match[] = { 
	},

	{ /* sentinel */ },

};

MODULE_DEVICE_TABLE(of, exynos_ppmu_id_match);



static struct devfreq_event_ops *exynos_bus_get_ops(struct device_node *np)

{
@@ -463,7 +460,6 @@ static int exynos_ppmu_probe(struct platform_device *pdev) 
	if (!info)

		return -ENOMEM;



	mutex_init(&info->lock);

	info->dev = &pdev->dev;



	/* Parse dt data to get resource */

drivers/devfreq/event/rockchip-dfi.c

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ static const struct of_device_id rockchip_dfi_id_match[] = { 
	{ .compatible = "rockchip,rk3399-dfi" },

	{ },

};

MODULE_DEVICE_TABLE(of, rockchip_dfi_id_match);



static int rockchip_dfi_probe(struct platform_device *pdev)

{

drivers/devfreq/rk3399_dmc.c

+2 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) 


	rk3399_devfreq_dmc_profile.initial_freq = data->rate;



	data->devfreq = devfreq_add_device(dev,

	data->devfreq = devm_devfreq_add_device(dev,

					   &rk3399_devfreq_dmc_profile,

					   "simple_ondemand",

					   &data->ondemand_data);
@@ -454,6 +454,7 @@ static const struct of_device_id rk3399dmc_devfreq_of_match[] = { 
	{ .compatible = "rockchip,rk3399-dmc" },

	{ },

};

MODULE_DEVICE_TABLE(of, rk3399dmc_devfreq_of_match);



static struct platform_driver rk3399_dmcfreq_driver = {

	.probe	= rk3399_dmcfreq_probe,