Commit ce3de78a authored by Greg Ungerer's avatar Greg Ungerer

m68knommu: remove ColdFire CLOCK_DIV config option

The reality is that you do not need the abiltity to configure the
clock divider for ColdFire CPUs. It is a fixed ratio on any given
ColdFire family member. It is not the same for all ColdFire parts,
but it is always the same in a model range. So hard define the divider
for each supported ColdFire CPU type and remove the Kconfig option.
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent 442ca465
...@@ -14,14 +14,13 @@ ...@@ -14,14 +14,13 @@
/* /*
* Define master clock frequency. This is essentially done at config * Define master clock frequency. This is done at config time now.
* time now. No point enumerating dozens of possible clock options * No point enumerating dozens of possible clock options here. And
* here. Also the peripheral clock (bus clock) divide ratio is set * in any case new boards come along from time to time that have yet
* at config time too. * another different clocking frequency.
*/ */
#ifdef CONFIG_CLOCK_SET #ifdef CONFIG_CLOCK_SET
#define MCF_CLK CONFIG_CLOCK_FREQ #define MCF_CLK CONFIG_CLOCK_FREQ
#define MCF_BUSCLK (CONFIG_CLOCK_FREQ / CONFIG_CLOCK_DIV)
#else #else
#error "Don't know what your ColdFire CPU clock frequency is??" #error "Don't know what your ColdFire CPU clock frequency is??"
#endif #endif
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#define CPU_NAME "COLDFIRE(m5206)" #define CPU_NAME "COLDFIRE(m5206)"
#define CPU_INSTR_PER_JIFFY 3 #define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK MCF_CLK
#include <asm/m52xxacr.h> #include <asm/m52xxacr.h>
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#define CPU_NAME "COLDFIRE(m520x)" #define CPU_NAME "COLDFIRE(m520x)"
#define CPU_INSTR_PER_JIFFY 3 #define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK (MCF_CLK / 2)
#include <asm/m52xxacr.h> #include <asm/m52xxacr.h>
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#define CPU_NAME "COLDFIRE(m523x)" #define CPU_NAME "COLDFIRE(m523x)"
#define CPU_INSTR_PER_JIFFY 3 #define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK (MCF_CLK / 2)
#include <asm/m52xxacr.h> #include <asm/m52xxacr.h>
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#define CPU_NAME "COLDFIRE(m5249)" #define CPU_NAME "COLDFIRE(m5249)"
#define CPU_INSTR_PER_JIFFY 3 #define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK (MCF_CLK / 2)
#include <asm/m52xxacr.h> #include <asm/m52xxacr.h>
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#define CPU_NAME "COLDFIRE(m5272)" #define CPU_NAME "COLDFIRE(m5272)"
#define CPU_INSTR_PER_JIFFY 3 #define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK MCF_CLK
#include <asm/m52xxacr.h> #include <asm/m52xxacr.h>
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#define CPU_NAME "COLDFIRE(m527x)" #define CPU_NAME "COLDFIRE(m527x)"
#define CPU_INSTR_PER_JIFFY 3 #define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK (MCF_CLK / 2)
#include <asm/m52xxacr.h> #include <asm/m52xxacr.h>
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#define CPU_NAME "COLDFIRE(m528x)" #define CPU_NAME "COLDFIRE(m528x)"
#define CPU_INSTR_PER_JIFFY 3 #define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK MCF_CLK
#include <asm/m52xxacr.h> #include <asm/m52xxacr.h>
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#define CPU_NAME "COLDFIRE(m5307)" #define CPU_NAME "COLDFIRE(m5307)"
#define CPU_INSTR_PER_JIFFY 3 #define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK (MCF_CLK / 2)
#include <asm/m53xxacr.h> #include <asm/m53xxacr.h>
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#define CPU_NAME "COLDFIRE(m532x)" #define CPU_NAME "COLDFIRE(m532x)"
#define CPU_INSTR_PER_JIFFY 3 #define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK (MCF_CLK / 3)
#include <asm/m53xxacr.h> #include <asm/m53xxacr.h>
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#define CPU_NAME "COLDFIRE(m5407)" #define CPU_NAME "COLDFIRE(m5407)"
#define CPU_INSTR_PER_JIFFY 3 #define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK (MCF_CLK / 2)
#include <asm/m54xxacr.h> #include <asm/m54xxacr.h>
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#define CPU_NAME "COLDFIRE(m54xx)" #define CPU_NAME "COLDFIRE(m54xx)"
#define CPU_INSTR_PER_JIFFY 2 #define CPU_INSTR_PER_JIFFY 2
#define MCF_BUSCLK (MCF_CLK / 2)
#include <asm/m54xxacr.h> #include <asm/m54xxacr.h>
......
...@@ -260,17 +260,6 @@ config CLOCK_FREQ ...@@ -260,17 +260,6 @@ config CLOCK_FREQ
if it is fitted (there are some exceptions). This value will be if it is fitted (there are some exceptions). This value will be
specific to the exact CPU that you are using. specific to the exact CPU that you are using.
config CLOCK_DIV
int "Set the core/bus clock divide ratio"
default "1"
depends on CLOCK_SET
help
On many SoC style CPUs the master CPU clock is also used to drive
on-chip peripherals. The clock that is distributed to these
peripherals is sometimes a fixed ratio of the master clock
frequency. If so then set this to the divider ratio of the
master clock to the peripheral clock. If not sure then select 1.
config OLDMASK config OLDMASK
bool "Old mask 5307 (1H55J) silicon" bool "Old mask 5307 (1H55J) silicon"
depends on M5307 depends on M5307
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment