[PATCH 1/2] ARM: imx: fix imx6sll-only build

[PATCH 1/2] ARM: imx: fix imx6sll-only build

[Arnd Bergmann]

When selecting SOC_IMX6SLL but not SOC_IMX6SL, we get a link error:

arch/arm/mach-imx/mach-imx6sl.o: In function `imx6sl_init_late':
mach-imx6sl.c:(.init.text+0x14): undefined reference to `imx6sl_cpuidle_init'

This adds the missing line to the Makefile to also build the cpuidle
support that we need here.

Fixes: dee5dee2a5b2 ("ARM: imx: Add basic msl support for imx6sll")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/arm/mach-imx/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 78fa86aedf34..2327e3e876d8 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -26,6 +26,7 @@ ifeq ($(CONFIG_CPU_IDLE),y)
 obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o
 obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o
 obj-$(CONFIG_SOC_IMX6SL) += cpuidle-imx6sl.o
+obj-$(CONFIG_SOC_IMX6SLL) += cpuidle-imx6sl.o
 obj-$(CONFIG_SOC_IMX6SX) += cpuidle-imx6sx.o
 obj-$(CONFIG_SOC_IMX6UL) += cpuidle-imx6sx.o
 endif
-- 
2.9.0

[PATCH 2/2] ARM: imx: select ARM_CPU_SUSPEND for CPU_IDLE as well

[Arnd Bergmann]

The cpuidle support calls cpu_suspend(), which is compiled conditionally,
and fails to link unless something selects CONFIG_ARM_CPU_SUSPEND.

arch/arm/mach-imx/cpuidle-imx6sx.o: In function `imx6sx_enter_wait':
cpuidle-imx6sx.c:(.text+0x6c): undefined reference to `cpu_suspend'

This adds an explicit select statement here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/arm/mach-imx/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index f53ec31c9f5a..e47fa13f4b0c 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -469,7 +469,7 @@ config	SOC_IMX53
 
 config SOC_IMX6
 	bool
-	select ARM_CPU_SUSPEND if PM
+	select ARM_CPU_SUSPEND if (PM || CPU_IDLE)
 	select ARM_ERRATA_754322
 	select ARM_ERRATA_775420
 	select ARM_GIC
-- 
2.9.0

[PATCH 2/2] ARM: imx: select ARM_CPU_SUSPEND for CPU_IDLE as well

[Shawn Guo]

On Thu, Mar 15, 2018 at 04:13:19PM +0100, Arnd Bergmann wrote:
> The cpuidle support calls cpu_suspend(), which is compiled conditionally,
> and fails to link unless something selects CONFIG_ARM_CPU_SUSPEND.
> 
> arch/arm/mach-imx/cpuidle-imx6sx.o: In function `imx6sx_enter_wait':
> cpuidle-imx6sx.c:(.text+0x6c): undefined reference to `cpu_suspend'
> 
> This adds an explicit select statement here.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Acked-by: Shawn Guo <shawnguo@kernel.org>

[PATCH 1/2] ARM: imx: fix imx6sll-only build

[Shawn Guo]

On Thu, Mar 15, 2018 at 04:13:18PM +0100, Arnd Bergmann wrote:
> When selecting SOC_IMX6SLL but not SOC_IMX6SL, we get a link error:
> 
> arch/arm/mach-imx/mach-imx6sl.o: In function `imx6sl_init_late':
> mach-imx6sl.c:(.init.text+0x14): undefined reference to `imx6sl_cpuidle_init'
> 
> This adds the missing line to the Makefile to also build the cpuidle
> support that we need here.
> 
> Fixes: dee5dee2a5b2 ("ARM: imx: Add basic msl support for imx6sll")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Acked-by: Shawn Guo <shawnguo@kernel.org>

[PATCH 1/2] ARM: imx: fix imx6sll-only build

[Arnd Bergmann]

On Fri, Mar 16, 2018 at 1:48 AM, Shawn Guo <shawnguo@kernel.org> wrote:
> On Thu, Mar 15, 2018 at 04:13:18PM +0100, Arnd Bergmann wrote:
>> When selecting SOC_IMX6SLL but not SOC_IMX6SL, we get a link error:
>>
>> arch/arm/mach-imx/mach-imx6sl.o: In function `imx6sl_init_late':
>> mach-imx6sl.c:(.init.text+0x14): undefined reference to `imx6sl_cpuidle_init'
>>
>> This adds the missing line to the Makefile to also build the cpuidle
>> support that we need here.
>>
>> Fixes: dee5dee2a5b2 ("ARM: imx: Add basic msl support for imx6sll")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> Acked-by: Shawn Guo <shawnguo@kernel.org>

Thanks. Applied both now.

      Arnd