Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Greg Ungerer <gerg@uclinux.org>

+15 -16
+4 -5
arch/m68k/include/asm/coldfire.h
··· 14 14 15 15 16 16 /* 17 - * Define master clock frequency. This is essentially done at config 18 - * time now. No point enumerating dozens of possible clock options 19 - * here. Also the peripheral clock (bus clock) divide ratio is set 20 - * at config time too. 17 + * Define master clock frequency. This is done at config time now. 18 + * No point enumerating dozens of possible clock options here. And 19 + * in any case new boards come along from time to time that have yet 20 + * another different clocking frequency. 21 21 */ 22 22 #ifdef CONFIG_CLOCK_SET 23 23 #define MCF_CLK CONFIG_CLOCK_FREQ 24 - #define MCF_BUSCLK (CONFIG_CLOCK_FREQ / CONFIG_CLOCK_DIV) 25 24 #else 26 25 #error "Don't know what your ColdFire CPU clock frequency is??" 27 26 #endif
+1
arch/m68k/include/asm/m5206sim.h
··· 14 14 15 15 #define CPU_NAME "COLDFIRE(m5206)" 16 16 #define CPU_INSTR_PER_JIFFY 3 17 + #define MCF_BUSCLK MCF_CLK 17 18 18 19 #include <asm/m52xxacr.h> 19 20
+1
arch/m68k/include/asm/m520xsim.h
··· 13 13 14 14 #define CPU_NAME "COLDFIRE(m520x)" 15 15 #define CPU_INSTR_PER_JIFFY 3 16 + #define MCF_BUSCLK (MCF_CLK / 2) 16 17 17 18 #include <asm/m52xxacr.h> 18 19
+1
arch/m68k/include/asm/m523xsim.h
··· 13 13 14 14 #define CPU_NAME "COLDFIRE(m523x)" 15 15 #define CPU_INSTR_PER_JIFFY 3 16 + #define MCF_BUSCLK (MCF_CLK / 2) 16 17 17 18 #include <asm/m52xxacr.h> 18 19
+1
arch/m68k/include/asm/m5249sim.h
··· 13 13 14 14 #define CPU_NAME "COLDFIRE(m5249)" 15 15 #define CPU_INSTR_PER_JIFFY 3 16 + #define MCF_BUSCLK (MCF_CLK / 2) 16 17 17 18 #include <asm/m52xxacr.h> 18 19
+1
arch/m68k/include/asm/m5272sim.h
··· 14 14 15 15 #define CPU_NAME "COLDFIRE(m5272)" 16 16 #define CPU_INSTR_PER_JIFFY 3 17 + #define MCF_BUSCLK MCF_CLK 17 18 18 19 #include <asm/m52xxacr.h> 19 20
+1
arch/m68k/include/asm/m527xsim.h
··· 13 13 14 14 #define CPU_NAME "COLDFIRE(m527x)" 15 15 #define CPU_INSTR_PER_JIFFY 3 16 + #define MCF_BUSCLK (MCF_CLK / 2) 16 17 17 18 #include <asm/m52xxacr.h> 18 19
+1
arch/m68k/include/asm/m528xsim.h
··· 13 13 14 14 #define CPU_NAME "COLDFIRE(m528x)" 15 15 #define CPU_INSTR_PER_JIFFY 3 16 + #define MCF_BUSCLK MCF_CLK 16 17 17 18 #include <asm/m52xxacr.h> 18 19
+1
arch/m68k/include/asm/m5307sim.h
··· 16 16 17 17 #define CPU_NAME "COLDFIRE(m5307)" 18 18 #define CPU_INSTR_PER_JIFFY 3 19 + #define MCF_BUSCLK (MCF_CLK / 2) 19 20 20 21 #include <asm/m53xxacr.h> 21 22
+1
arch/m68k/include/asm/m532xsim.h
··· 11 11 12 12 #define CPU_NAME "COLDFIRE(m532x)" 13 13 #define CPU_INSTR_PER_JIFFY 3 14 + #define MCF_BUSCLK (MCF_CLK / 3) 14 15 15 16 #include <asm/m53xxacr.h> 16 17
+1
arch/m68k/include/asm/m5407sim.h
··· 16 16 17 17 #define CPU_NAME "COLDFIRE(m5407)" 18 18 #define CPU_INSTR_PER_JIFFY 3 19 + #define MCF_BUSCLK (MCF_CLK / 2) 19 20 20 21 #include <asm/m54xxacr.h> 21 22
+1
arch/m68k/include/asm/m54xxsim.h
··· 7 7 8 8 #define CPU_NAME "COLDFIRE(m54xx)" 9 9 #define CPU_INSTR_PER_JIFFY 2 10 + #define MCF_BUSCLK (MCF_CLK / 2) 10 11 11 12 #include <asm/m54xxacr.h> 12 13
-11
arch/m68knommu/Kconfig
··· 260 260 if it is fitted (there are some exceptions). This value will be 261 261 specific to the exact CPU that you are using. 262 262 263 - config CLOCK_DIV 264 - int "Set the core/bus clock divide ratio" 265 - default "1" 266 - depends on CLOCK_SET 267 - help 268 - On many SoC style CPUs the master CPU clock is also used to drive 269 - on-chip peripherals. The clock that is distributed to these 270 - peripherals is sometimes a fixed ratio of the master clock 271 - frequency. If so then set this to the divider ratio of the 272 - master clock to the peripheral clock. If not sure then select 1. 273 - 274 263 config OLDMASK 275 264 bool "Old mask 5307 (1H55J) silicon" 276 265 depends on M5307