diff options
| author |  Ahmad Fatoum <a.fatoum@pengutronix.de>
| 2020-01-16 15:18:49 +0100 |
|---|---|---|
| committer |  Shawn Guo <shawnguo@kernel.org>
| 2020-02-13 21:21:44 +0800 |
| commit | 512a928affd51c2dc631401e56ad5ee5d5dd68b6 (patch) | |
| tree | e249bcec170fff0b1edfd087245901689c5c15ae /arch/arm/mach-imx/Makefile | |
| parent | ARM: dts: imx6: phycore-som: fix emmc supply (diff) | |
| download | linux-512a928affd51c2dc631401e56ad5ee5d5dd68b6.tar.gz linux-512a928affd51c2dc631401e56ad5ee5d5dd68b6.tar.bz2 linux-512a928affd51c2dc631401e56ad5ee5d5dd68b6.zip | |
ARM: imx: build v7_cpu_resume() unconditionally
This function is not only needed by the platform suspend code, but is also
reused as the CPU resume function when the ARM cores can be powered down
completely in deep idle, which is the case on i.MX6SX and i.MX6UL(L).
Providing the static inline stub whenever CONFIG_SUSPEND is disabled means
that those platforms will hang on resume from cpuidle if suspend is disabled.
So there are two problems:
- The static inline stub masks the linker error
- The function is not available where needed
Fix both by just building the function unconditionally, when
CONFIG_SOC_IMX6 is enabled. The actual code is three instructions long,
so it's arguably ok to just leave it in for all i.MX6 kernel configurations.
Fixes: 05136f0897b5 ("ARM: imx: support arm power off in cpuidle for i.mx6sx")
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/mach-imx/Makefile')
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 35ff620537e6..03506ce46149 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -91,6 +91,8 @@ AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o endif +AFLAGS_resume-imx6.o :=-Wa,-march=armv7-a +obj-$(CONFIG_SOC_IMX6) += resume-imx6.o obj-$(CONFIG_SOC_IMX6) += pm-imx6.o obj-$(CONFIG_SOC_IMX1) += mach-imx1.o |