Patchwork ARM: mach-mxs: readd just removed select CLKSRC_OF

login
register
mail settings
Submitter Lauri Hintsala
Date April 15, 2014, 7:20 a.m.
Message ID <1397546439-25153-1-git-send-email-lauri.hintsala@bluegiga.com>
Download mbox | patch
Permalink /patch/339177/
State New
Headers show

Comments

Lauri Hintsala - April 15, 2014, 7:20 a.m.
MXS based apx4devkit doesn't boot with latest Linux v3.15-rc1
because commit ddb902cc34593ecb88c368f6e15db3cf829c56fe removed
"select CLKSRC_OF" from the machine config.

CC: linux-arm-kernel@lists.infradead.org
CC: Rob Herring <robh@kernel.org>
CC: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Lauri Hintsala <lauri.hintsala@bluegiga.com>
---
I think commit ddb902cc34593ecb88c368f6e15db3cf829c56fe might break
also other armv4/5 based boards which are using CLKSRC_OF. There is
already patch for MOXA ART SoCs: https://lkml.org/lkml/2014/4/11/308

 arch/arm/mach-mxs/Kconfig | 1 +
 1 file changed, 1 insertion(+)
Shawn Guo - April 16, 2014, 8:34 a.m.
On Tue, Apr 15, 2014 at 10:20:39AM +0300, Lauri Hintsala wrote:
> MXS based apx4devkit doesn't boot with latest Linux v3.15-rc1
> because commit ddb902cc34593ecb88c368f6e15db3cf829c56fe removed
> "select CLKSRC_OF" from the machine config.
> 
> CC: linux-arm-kernel@lists.infradead.org
> CC: Rob Herring <robh@kernel.org>
> CC: Shawn Guo <shawn.guo@linaro.org>

Acked-by: Shawn Guo <shawn.guo@linaro.org>

Hi, arm-soc folks,

I just sent a batch of fixes for 3.15 off my hand to you guys.  Can you
please apply this fix directly on arm-soc for 3.15?  Thanks.

Shawn

> Signed-off-by: Lauri Hintsala <lauri.hintsala@bluegiga.com>
> ---
> I think commit ddb902cc34593ecb88c368f6e15db3cf829c56fe might break
> also other armv4/5 based boards which are using CLKSRC_OF. There is
> already patch for MOXA ART SoCs: https://lkml.org/lkml/2014/4/11/308
> 
>  arch/arm/mach-mxs/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
> index 8479413..b3eb28c 100644
> --- a/arch/arm/mach-mxs/Kconfig
> +++ b/arch/arm/mach-mxs/Kconfig
> @@ -17,6 +17,7 @@ config ARCH_MXS
>  	depends on ARCH_MULTI_V5
>  	select ARCH_REQUIRE_GPIOLIB
>  	select CLKSRC_MMIO
> +	select CLKSRC_OF
>  	select PINCTRL
>  	select SOC_BUS
>  	select SOC_IMX23
> -- 
> 1.8.3.2
>
Rob Herring - April 16, 2014, 1:44 p.m.
On Wed, Apr 16, 2014 at 3:34 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> On Tue, Apr 15, 2014 at 10:20:39AM +0300, Lauri Hintsala wrote:
>> MXS based apx4devkit doesn't boot with latest Linux v3.15-rc1
>> because commit ddb902cc34593ecb88c368f6e15db3cf829c56fe removed
>> "select CLKSRC_OF" from the machine config.
>>
>> CC: linux-arm-kernel@lists.infradead.org
>> CC: Rob Herring <robh@kernel.org>
>> CC: Shawn Guo <shawn.guo@linaro.org>
>
> Acked-by: Shawn Guo <shawn.guo@linaro.org>
>
> Hi, arm-soc folks,
>
> I just sent a batch of fixes for 3.15 off my hand to you guys.  Can you
> please apply this fix directly on arm-soc for 3.15?  Thanks.

NAK. This needs to be fixed on for all multi-platform and I just sent
a patch doing that.

Rob

Patch

diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
index 8479413..b3eb28c 100644
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -17,6 +17,7 @@  config ARCH_MXS
 	depends on ARCH_MULTI_V5
 	select ARCH_REQUIRE_GPIOLIB
 	select CLKSRC_MMIO
+	select CLKSRC_OF
 	select PINCTRL
 	select SOC_BUS
 	select SOC_IMX23