Patch "m68knommu: force setting of CONFIG_CLOCK_FREQ for ColdFire" has been added to the 4.1-stable tree

This is a note to let you know that I've just added the patch titled

m68knommu: force setting of CONFIG_CLOCK_FREQ for ColdFire

to the 4.1-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:
m68knommu-force-setting-of-config_clock_freq-for-coldfire.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Greg Ungerer <[email protected]>
Date: Tue, 7 Jul 2015 14:21:21 +1000
Subject: m68knommu: force setting of CONFIG_CLOCK_FREQ for ColdFire

From: Greg Ungerer <[email protected]>

commit d9ee489619744ee5ac246b8fb3dd65bb078d2f0a upstream.

It is possible to disable the clock selection at configuration time, but for ColdFire targets we always expect a clock frequency to be selected. This results in the following compile time error:

CC arch/m68k/kernel/asm-offsets.s
In file included from ./arch/m68k/include/asm/timex.h:14:0,

                 from include/linux/timex.h:65,
                 from include/linux/sched.h:19,
                 from arch/m68k/kernel/asm-offsets.c:14:

./arch/m68k/include/asm/coldfire.h:25:2: error: #error "Don't know what your ColdFire CPU clock frequency is??"

Remove CONFIG_CLOCK_SELECT completely and always enable CONFIG_CLOCK_FREQ for ColdFire.

---
 arch/m68k/Kconfig.cpu            |   14 +-------------
 arch/m68k/include/asm/coldfire.h |    2 +-
 2 files changed, 2 insertions(+), 14 deletions(-)

@@ -425,22 +425,10 @@ config HAVE_MBAR
 config HAVE_IPSBAR
 	bool
 
-config CLOCK_SET
-	bool "Enable setting the CPU clock frequency"
-	depends on COLDFIRE
-	default n
-	help
-	  On some CPU's you do not need to know what the core CPU clock
-	  frequency is. On these you can disable clock setting. On some
-	  traditional 68K parts, and on all ColdFire parts you need to set
-	  the appropriate CPU clock frequency. On these devices many of the
-	  onboard peripherals derive their timing from the master CPU clock
-	  frequency.
-
 config CLOCK_FREQ
 	int "Set the core clock frequency"
 	default "66666666"
-	depends on CLOCK_SET
+	depends on COLDFIRE
 	help
 	  Define the CPU clock frequency in use. This is the core clock
 	  frequency, it may or may not be the same as the external clock

@@ -19,7 +19,7 @@
  *	in any case new boards come along from time to time that have yet
  *	another different clocking frequency.
  */
-#ifdef CONFIG_CLOCK_SET
+#ifdef CONFIG_CLOCK_FREQ
 #define	MCF_CLK		CONFIG_CLOCK_FREQ
 #else
 #error "Don't know what your ColdFire CPU clock frequency is??"

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/m68knommu-force-setting-of-config_clock_freq-for-coldfire.patch queue-4.1/m68knommu-make-coldfire-soc-selection-a-choice.patch