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

Merge branch 'pm-devfreq' 

* pm-devfreq:
  PM / devfreq: exynos: Enable building exynos PPMU as module
  PM / devfreq: Export helper functions for drivers
  PM / devfreq: Remove ARCH_HAS_OPP completely
parents 4734c6ef c8bc5f1b

drivers/devfreq/Kconfig

+1 −2
Original line number Original line Diff line number Diff line
@@ -78,9 +78,8 @@ config ARM_EXYNOS4_BUS_DEVFREQ 
	  This does not yet operate with optimal voltages.

	  This does not yet operate with optimal voltages.





config ARM_EXYNOS5_BUS_DEVFREQ

config ARM_EXYNOS5_BUS_DEVFREQ

	bool "ARM Exynos5250 Bus DEVFREQ Driver"

	tristate "ARM Exynos5250 Bus DEVFREQ Driver"

	depends on SOC_EXYNOS5250

	depends on SOC_EXYNOS5250

	select ARCH_HAS_OPP

	select DEVFREQ_GOV_SIMPLE_ONDEMAND

	select DEVFREQ_GOV_SIMPLE_ONDEMAND

	select PM_OPP

	select PM_OPP

	help

	help

drivers/devfreq/devfreq.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1119,6 +1119,7 @@ struct dev_pm_opp *devfreq_recommended_opp(struct device *dev, 




	return opp;

	return opp;

}

}

EXPORT_SYMBOL(devfreq_recommended_opp);





/**

/**

 * devfreq_register_opp_notifier() - Helper function to get devfreq notified

 * devfreq_register_opp_notifier() - Helper function to get devfreq notified
@@ -1142,6 +1143,7 @@ int devfreq_register_opp_notifier(struct device *dev, struct devfreq *devfreq) 




	return ret;

	return ret;

}

}

EXPORT_SYMBOL(devfreq_register_opp_notifier);





/**

/**

 * devfreq_unregister_opp_notifier() - Helper function to stop getting devfreq

 * devfreq_unregister_opp_notifier() - Helper function to stop getting devfreq
@@ -1168,6 +1170,7 @@ int devfreq_unregister_opp_notifier(struct device *dev, struct devfreq *devfreq) 




	return ret;

	return ret;

}

}

EXPORT_SYMBOL(devfreq_unregister_opp_notifier);





static void devm_devfreq_opp_release(struct device *dev, void *res)

static void devm_devfreq_opp_release(struct device *dev, void *res)

{

{

drivers/devfreq/exynos/exynos_ppmu.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -73,6 +73,7 @@ void busfreq_mon_reset(struct busfreq_ppmu_data *ppmu_data) 
		exynos_ppmu_start(ppmu_base);

		exynos_ppmu_start(ppmu_base);

	}

	}

}

}

EXPORT_SYMBOL(busfreq_mon_reset);





void exynos_read_ppmu(struct busfreq_ppmu_data *ppmu_data)

void exynos_read_ppmu(struct busfreq_ppmu_data *ppmu_data)

{

{
@@ -97,6 +98,7 @@ void exynos_read_ppmu(struct busfreq_ppmu_data *ppmu_data) 




	busfreq_mon_reset(ppmu_data);

	busfreq_mon_reset(ppmu_data);

}

}

EXPORT_SYMBOL(exynos_read_ppmu);





int exynos_get_busier_ppmu(struct busfreq_ppmu_data *ppmu_data)

int exynos_get_busier_ppmu(struct busfreq_ppmu_data *ppmu_data)

{

{
@@ -114,3 +116,4 @@ int exynos_get_busier_ppmu(struct busfreq_ppmu_data *ppmu_data) 




	return busy;

	return busy;

}

}

EXPORT_SYMBOL(exynos_get_busier_ppmu);