diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-05-26 11:25:22 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-26 15:26:52 -0400 |
commit | b33cdd283bd917d431469c29419c2cf2624bd683 (patch) | |
tree | 2d686ea140b3d64319af5a349edf0e6a4126dcff /drivers/bus | |
parent | 5a3babfcd2354fb1063de2895cab0320fb2027ca (diff) |
ARM: vexpress: refine dependencies for new code
The versatile express changes for 3.16 introduced a number of
build regressions for randconfig kernels by not tracking dependencies
between the components right.
This patch tries to rectify that:
* the mach-vexpress code cannot link without the syscfg driver,
which in turn needs MFD_VEXPRESS_SYSREG
* various drivers call devm_regmap_init_vexpress_config(), which
has to be exported so it can be used by loadable modules
* the configuration bus uses OF DT helper functions that are not
available to platforms disable CONFIG_OF
* The sysreg driver exports GPIOs through gpiolib, which can
be disabled on some platforms.
* The clocksource code cannot be built on platforms that don't
use modern timekeeping but rely on gettimeoffset.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/bus')
-rw-r--r-- | drivers/bus/Kconfig | 1 | ||||
-rw-r--r-- | drivers/bus/vexpress-config.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig index f24e79dd51bf..286342778884 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig | |||
@@ -46,6 +46,7 @@ config VEXPRESS_CONFIG | |||
46 | bool "Versatile Express configuration bus" | 46 | bool "Versatile Express configuration bus" |
47 | default y if ARCH_VEXPRESS | 47 | default y if ARCH_VEXPRESS |
48 | depends on ARM || ARM64 | 48 | depends on ARM || ARM64 |
49 | depends on OF | ||
49 | select REGMAP | 50 | select REGMAP |
50 | help | 51 | help |
51 | Platform configuration infrastructure for the ARM Ltd. | 52 | Platform configuration infrastructure for the ARM Ltd. |
diff --git a/drivers/bus/vexpress-config.c b/drivers/bus/vexpress-config.c index 27a07dfcd626..a64763b6b5fd 100644 --- a/drivers/bus/vexpress-config.c +++ b/drivers/bus/vexpress-config.c | |||
@@ -118,7 +118,7 @@ struct regmap *devm_regmap_init_vexpress_config(struct device *dev) | |||
118 | 118 | ||
119 | return regmap; | 119 | return regmap; |
120 | } | 120 | } |
121 | 121 | EXPORT_SYMBOL_GPL(devm_regmap_init_vexpress_config); | |
122 | 122 | ||
123 | struct device *vexpress_config_bridge_register(struct device *parent, | 123 | struct device *vexpress_config_bridge_register(struct device *parent, |
124 | struct vexpress_config_bridge_ops *ops, void *context) | 124 | struct vexpress_config_bridge_ops *ops, void *context) |