Patch "ARM: sa1100: register clocks early" has been added to the 4.7-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
ARM: sa1100: register clocks early
to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-sa1100-register-clocks-early.patch
and it can be found in the queue-4.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
198b51e8a6a31d3a6f8e9dd9cade3635d0291f26Mon Sep 17 00:00:00 2001
From: Russell King <[email protected]>
Date: Fri, 19 Aug 2016 12:47:54 +0100
Subject: ARM: sa1100: register clocks early
From: Russell King <[email protected]>
commit 198b51e8a6a31d3a6f8e9dd9cade3635d0291f26 upstream.
Since we switched to use pxa_timer, we need to provide the OSTIMER0 clock. However, as the clock is initialised early, we need to provide the clock early as well, so that pxa_timer can find it. Adding the clock to the clkdev table at core_initcall() time is way too late.
Move the initialisation earlier.
--- arch/arm/mach-sa1100/clock.c | 3 +-- arch/arm/mach-sa1100/generic.c | 1 + arch/arm/mach-sa1100/generic.h | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-sa1100/clock.c +1 -2
@@ -140,9 +140,8 @@ static struct clk_lookup sa11xx_clkregs[ CLKDEV_INIT(NULL, "OSTIMER0", &clk_36864), }; -static int __init sa11xx_clk_init (void ) +int __init sa11xx_clk_init (void ) {clkdev_add_table (sa11xx_clkregs,ARRAY_SIZE (sa11xx_clkregs));return 0 ; } -core_initcall (sa11xx_clk_init);
arch/arm/mach-sa1100/generic.c +1 -0
@@ -388,6 +388,7 @@ void __init sa1100_init_irq(void)sa11x0_init_irq_nodt (IRQ_GPIO0_SC , irq_resource.start);sa1100_init_gpio (); +sa11xx_clk_init (); }/*
arch/arm/mach-sa1100/generic.h +2 -0
@@ -44,3 +44,5 @@ int sa11x0_pm_init(void);#else static inline int sa11x0_pm_init (void ) {return 0 ; }#endif + +int sa11xx_clk_init (void );
Patches currently in stable-queue which might be from [email protected] are
queue-4.7/arm-sa1100-fix-3.6864mhz-clock.patch queue-4.7/pcmcia-ds-fix-suspend-resume.patch queue-4.7/arm-sa1100-register-clocks-early.patch queue-4.7/gpio-sa1100-fix-irq-probing-for-ucb1x00.patch queue-4.7/arm-sa1100-clear-reset-status-prior-to-reboot.patch queue-4.7/arm-sa1111-fix-pcmcia-suspend-resume.patch