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

Merge back earlier cpufreq material for v4.1.

parents e5e02de0 5acb972f

drivers/cpufreq/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -293,5 +293,13 @@ config SH_CPU_FREQ 
	  If unsure, say N.

endif



config QORIQ_CPUFREQ

	tristate "CPU frequency scaling driver for Freescale QorIQ SoCs"

	depends on OF && COMMON_CLK && (PPC_E500MC || ARM)

	select CLK_QORIQ

	help

	  This adds the CPUFreq driver support for Freescale QorIQ SoCs

	  which are capable of changing the CPU's frequency dynamically.



endif

endmenu

drivers/cpufreq/Kconfig.arm

+9 −0
Original line number Diff line number Diff line
@@ -108,6 +108,15 @@ config ARM_HIGHBANK_CPUFREQ 


	  If in doubt, say N.



config ARM_HISI_ACPU_CPUFREQ

	tristate "Hisilicon ACPU CPUfreq driver"

	depends on ARCH_HISI && CPUFREQ_DT

	select PM_OPP

	help

	  This enables the hisilicon ACPU CPUfreq driver.



	  If in doubt, say N.



config ARM_IMX6Q_CPUFREQ

	tristate "Freescale i.MX6 cpufreq support"

	depends on ARCH_MXC

drivers/cpufreq/Kconfig.powerpc

+0 −9
Original line number Diff line number Diff line
@@ -23,15 +23,6 @@ config CPU_FREQ_MAPLE 
	  This adds support for frequency switching on Maple 970FX

	  Evaluation Board and compatible boards (IBM JS2x blades).



config PPC_CORENET_CPUFREQ

	tristate "CPU frequency scaling driver for Freescale E500MC SoCs"

	depends on PPC_E500MC && OF && COMMON_CLK

	select CLK_QORIQ

	help

	  This adds the CPUFreq driver support for Freescale e500mc,

	  e5500 and e6500 series SoCs which are capable of changing

	  the CPU's frequency dynamically.



config CPU_FREQ_PMAC

	bool "Support for Apple PowerBooks"

	depends on ADB_PMU && PPC32

drivers/cpufreq/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ arm-exynos-cpufreq-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o 
arm-exynos-cpufreq-$(CONFIG_ARM_EXYNOS5250_CPUFREQ)	+= exynos5250-cpufreq.o

obj-$(CONFIG_ARM_EXYNOS5440_CPUFREQ)	+= exynos5440-cpufreq.o

obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ)	+= highbank-cpufreq.o

obj-$(CONFIG_ARM_HISI_ACPU_CPUFREQ)	+= hisi-acpu-cpufreq.o

obj-$(CONFIG_ARM_IMX6Q_CPUFREQ)		+= imx6q-cpufreq.o

obj-$(CONFIG_ARM_INTEGRATOR)		+= integrator-cpufreq.o

obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ)	+= kirkwood-cpufreq.o
@@ -85,7 +86,7 @@ obj-$(CONFIG_CPU_FREQ_CBE) += ppc-cbe-cpufreq.o 
ppc-cbe-cpufreq-y			+= ppc_cbe_cpufreq_pervasive.o ppc_cbe_cpufreq.o

obj-$(CONFIG_CPU_FREQ_CBE_PMI)		+= ppc_cbe_cpufreq_pmi.o

obj-$(CONFIG_CPU_FREQ_MAPLE)		+= maple-cpufreq.o

obj-$(CONFIG_PPC_CORENET_CPUFREQ)   += ppc-corenet-cpufreq.o

obj-$(CONFIG_QORIQ_CPUFREQ)   		+= qoriq-cpufreq.o

obj-$(CONFIG_CPU_FREQ_PMAC)		+= pmac32-cpufreq.o

obj-$(CONFIG_CPU_FREQ_PMAC64)		+= pmac64-cpufreq.o

obj-$(CONFIG_PPC_PASEMI_CPUFREQ)	+= pasemi-cpufreq.o

drivers/cpufreq/hisi-acpu-cpufreq.c

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/*

 * Hisilicon Platforms Using ACPU CPUFreq Support

 *

 * Copyright (c) 2015 Hisilicon Limited.

 * Copyright (c) 2015 Linaro Limited.

 *

 * Leo Yan <leo.yan@linaro.org>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed "as is" WITHOUT ANY WARRANTY of any

 * kind, whether express or implied; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/err.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/platform_device.h>



static int __init hisi_acpu_cpufreq_driver_init(void)

{

	struct platform_device *pdev;



	if (!of_machine_is_compatible("hisilicon,hi6220"))

		return -ENODEV;



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

	return PTR_ERR_OR_ZERO(pdev);

}

module_init(hisi_acpu_cpufreq_driver_init);



MODULE_AUTHOR("Leo Yan <leo.yan@linaro.org>");

MODULE_DESCRIPTION("Hisilicon acpu cpufreq driver");

MODULE_LICENSE("GPL v2");