Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50dcfa02 authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

ARM: 5637/1: [KS8695] Don't reference CLOCK_TICK_RATE in drivers 



Stop referencing CLOCK_TICK_RATE in the KS8695 drivers, rather refer
to a KS8695_CLOCK_RATE.
Issue pointed out by Russell King on arm-linux-kernel mailing list.

Signed-off-by: default avatarAndrew Victor <linux@maxim.org.za>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 28d0325c

arch/arm/mach-ks8695/include/mach/hardware.h

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ 


#include <asm/sizes.h>



/*

 * Clocks are derived from MCLK, which is 25Mhz

 */

#define KS8695_CLOCK_RATE	25000000



/*

 * Physical RAM address.

 */

arch/arm/mach-ks8695/include/mach/timex.h

+3 −2
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
#ifndef __ASM_ARCH_TIMEX_H

#define __ASM_ARCH_TIMEX_H



/* timers are derived from MCLK, which is 25MHz */

#define CLOCK_TICK_RATE 25000000

#include <mach/hardware.h>



#define CLOCK_TICK_RATE 	KS8695_CLOCK_RATE



#endif

drivers/serial/serial_ks8695.c

+1 −1
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ static struct uart_port ks8695uart_ports[SERIAL_KS8695_NR] = { 
		.mapbase	= KS8695_UART_VA,

		.iotype		= SERIAL_IO_MEM,

		.irq		= KS8695_IRQ_UART_TX,

		.uartclk	= CLOCK_TICK_RATE * 16,

		.uartclk	= KS8695_CLOCK_RATE * 16,

		.fifosize	= 16,

		.ops		= &ks8695uart_pops,

		.flags		= ASYNC_BOOT_AUTOCONF,

drivers/watchdog/ks8695_wdt.c

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static inline void ks8695_wdt_stop(void) 
static inline void ks8695_wdt_start(void)

{

	unsigned long tmcon;

	unsigned long tval = wdt_time * CLOCK_TICK_RATE;

	unsigned long tval = wdt_time * KS8695_CLOCK_RATE;



	spin_lock(&ks8695_lock);

	/* disable timer0 */
@@ -103,7 +103,7 @@ static inline void ks8695_wdt_reload(void) 
static int ks8695_wdt_settimeout(int new_time)

{

	/*

	 * All counting occurs at SLOW_CLOCK / 128 = 0.256 Hz

	 * All counting occurs at KS8695_CLOCK_RATE / 128 = 0.256 Hz

	 *

	 * Since WDV is a 16-bit counter, the maximum period is

	 * 65536 / 0.256 = 256 seconds.