From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: cpufreq: mediatek: allow modular build
Date: Fri, 11 Sep 2015 10:15:14 +0200 [thread overview]
Message-ID: <1768766.yu1lxjsjLL@wuerfel> (raw)
The newly merged cpufreq-mt8173 driver breaks the ARM allmodconfig
build because of a dependency on the cpu-cooling infrastructure that
may be built as a loadable module:
drivers/built-in.o: In function `mtk_cpufreq_ready':
binder.c:(.text+0x324c8c): undefined reference to `of_cpufreq_cooling_register'
drivers/built-in.o: In function `mtk_cpufreq_exit':
binder.c:(.text+0x324ea0): undefined reference to `cpufreq_cooling_unregister'
This works around the issue by allowing this driver to be built
as a module as well, and adding a dependency on THERMAL that prevents
it from being built-in when the cpu-cooling driver is a module.
This is not perfect because there is still a case where THERMAL=m
and CPU_COOLING=n that should allow us to have this driver built-in
as well, but I decided to follow existing practice in other drivers
here, and that case seems irrelevant in practice.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
I have not checked if someone else has already sent a patch for this,
just ignore mine if the issue has been fixed already.
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index 77aa34eae92c..28844bdf026d 100644
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -131,8 +131,8 @@ config ARM_KIRKWOOD_CPUFREQ
SoCs.
config ARM_MT8173_CPUFREQ
- bool "Mediatek MT8173 CPUFreq support"
- depends on ARCH_MEDIATEK && REGULATOR
+ tristate "Mediatek MT8173 CPUFreq support"
+ depends on ARCH_MEDIATEK && REGULATOR && THERMAL
select PM_OPP
help
This adds the CPUFreq driver support for Mediatek MT8173 SoC.
diff --git a/drivers/cpufreq/mt8173-cpufreq.c b/drivers/cpufreq/mt8173-cpufreq.c
index 49caed293a3b..2131e1a81be9 100644
--- a/drivers/cpufreq/mt8173-cpufreq.c
+++ b/drivers/cpufreq/mt8173-cpufreq.c
@@ -17,6 +17,7 @@
#include <linux/cpu_cooling.h>
#include <linux/cpufreq.h>
#include <linux/cpumask.h>
+#include <linux/module.h>
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/pm_opp.h>
@@ -524,4 +525,5 @@ static int mt8173_cpufreq_driver_init(void)
return 0;
}
-device_initcall(mt8173_cpufreq_driver_init);
+module_init(mt8173_cpufreq_driver_init);
+MODULE_LICENSE("GPL v2");
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@arndb.de>
To: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Pi-Cheng Chen <pi-cheng.chen@linaro.org>,
Viresh Kumar <viresh.kumar@linaro.org>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: cpufreq: mediatek: allow modular build
Date: Fri, 11 Sep 2015 10:15:14 +0200 [thread overview]
Message-ID: <1768766.yu1lxjsjLL@wuerfel> (raw)
The newly merged cpufreq-mt8173 driver breaks the ARM allmodconfig
build because of a dependency on the cpu-cooling infrastructure that
may be built as a loadable module:
drivers/built-in.o: In function `mtk_cpufreq_ready':
binder.c:(.text+0x324c8c): undefined reference to `of_cpufreq_cooling_register'
drivers/built-in.o: In function `mtk_cpufreq_exit':
binder.c:(.text+0x324ea0): undefined reference to `cpufreq_cooling_unregister'
This works around the issue by allowing this driver to be built
as a module as well, and adding a dependency on THERMAL that prevents
it from being built-in when the cpu-cooling driver is a module.
This is not perfect because there is still a case where THERMAL=m
and CPU_COOLING=n that should allow us to have this driver built-in
as well, but I decided to follow existing practice in other drivers
here, and that case seems irrelevant in practice.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
I have not checked if someone else has already sent a patch for this,
just ignore mine if the issue has been fixed already.
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index 77aa34eae92c..28844bdf026d 100644
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -131,8 +131,8 @@ config ARM_KIRKWOOD_CPUFREQ
SoCs.
config ARM_MT8173_CPUFREQ
- bool "Mediatek MT8173 CPUFreq support"
- depends on ARCH_MEDIATEK && REGULATOR
+ tristate "Mediatek MT8173 CPUFreq support"
+ depends on ARCH_MEDIATEK && REGULATOR && THERMAL
select PM_OPP
help
This adds the CPUFreq driver support for Mediatek MT8173 SoC.
diff --git a/drivers/cpufreq/mt8173-cpufreq.c b/drivers/cpufreq/mt8173-cpufreq.c
index 49caed293a3b..2131e1a81be9 100644
--- a/drivers/cpufreq/mt8173-cpufreq.c
+++ b/drivers/cpufreq/mt8173-cpufreq.c
@@ -17,6 +17,7 @@
#include <linux/cpu_cooling.h>
#include <linux/cpufreq.h>
#include <linux/cpumask.h>
+#include <linux/module.h>
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/pm_opp.h>
@@ -524,4 +525,5 @@ static int mt8173_cpufreq_driver_init(void)
return 0;
}
-device_initcall(mt8173_cpufreq_driver_init);
+module_init(mt8173_cpufreq_driver_init);
+MODULE_LICENSE("GPL v2");
next reply other threads:[~2015-09-11 8:15 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-11 8:15 Arnd Bergmann [this message]
2015-09-11 8:15 ` cpufreq: mediatek: allow modular build Arnd Bergmann
2015-09-11 8:17 ` Viresh Kumar
2015-09-11 8:17 ` Viresh Kumar
2015-09-11 8:22 ` Arnd Bergmann
2015-09-11 8:22 ` Arnd Bergmann
2015-09-11 8:25 ` Viresh Kumar
2015-09-11 8:25 ` Viresh Kumar
2015-09-11 8:36 ` Arnd Bergmann
2015-09-11 8:36 ` Arnd Bergmann
2015-09-11 8:38 ` Viresh Kumar
2015-09-11 8:38 ` Viresh Kumar
2015-09-11 9:34 ` Russell King - ARM Linux
2015-09-11 9:34 ` Russell King - ARM Linux
2015-09-11 9:40 ` Viresh Kumar
2015-09-11 9:40 ` Viresh Kumar
2015-09-11 9:58 ` Russell King - ARM Linux
2015-09-11 9:58 ` Russell King - ARM Linux
2015-09-11 10:09 ` Viresh Kumar
2015-09-11 10:09 ` Viresh Kumar
2015-09-11 10:13 ` Russell King - ARM Linux
2015-09-11 10:13 ` Russell King - ARM Linux
2015-09-11 10:19 ` Viresh Kumar
2015-09-11 10:19 ` Viresh Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1768766.yu1lxjsjLL@wuerfel \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.