diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-11 10:53:31 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 19:46:12 +0100 |
| commit | 48352e5286b455eaffed19a89d3a07e609bfa6d2 (patch) | |
| tree | 6ecfe9fe2764b36cba4a915f21db330be49f9aec /arch/arm/mach-prima2/common.c | |
| parent | Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/c... (diff) | |
| download | linux-48352e5286b455eaffed19a89d3a07e609bfa6d2.tar.xz linux-48352e5286b455eaffed19a89d3a07e609bfa6d2.zip | |
ARM: prima2: build reset code standalone
The prima2 platform code currently depends on the rstc
implementation and that in turn depends on the reset
controller framework. This removes the platform dependency
by letting the driver access arm_pm_restart directly
to turn the driver into a standalone entity, and also
removes the dependency on the reset controller framework
by using "if (IS_ENABLED(CONFIG_RESET_CONTROLLER))". This
will cause all code that is used for the reset controller
to be dropped by the compiler if the framework is disabled.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-prima2/common.c')
| -rw-r--r-- | arch/arm/mach-prima2/common.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c index 3b8865a140ee..47c7819edb9b 100644 --- a/arch/arm/mach-prima2/common.c +++ b/arch/arm/mach-prima2/common.c @@ -37,7 +37,6 @@ DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)") .map_io = sirfsoc_map_io, .init_late = sirfsoc_init_late, .dt_compat = atlas6_dt_match, - .restart = sirfsoc_restart, MACHINE_END #endif @@ -53,7 +52,6 @@ DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)") .dma_zone_size = SZ_256M, .init_late = sirfsoc_init_late, .dt_compat = prima2_dt_match, - .restart = sirfsoc_restart, MACHINE_END #endif @@ -69,6 +67,5 @@ DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)") .map_io = sirfsoc_map_io, .init_late = sirfsoc_init_late, .dt_compat = marco_dt_match, - .restart = sirfsoc_restart, MACHINE_END #endif |