From 49e8a7edb0482ee1ecd13e31a952ee99a0d5c4f2 Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
Date: Thu, 31 Jan 2013 21:02:00 +0530
Subject: [PATCH] --- yaml --- r: 359816 b: refs/heads/master c:
 8f0de0d62f29e47f5142737dad7561f108f69e92 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/arm/Kconfig                        | 1 -
 trunk/arch/arm/plat-omap/Kconfig              | 9 ---------
 trunk/arch/arm/plat-omap/include/plat/timex.h | 8 --------
 4 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index e82870823b5f..1b8e00bc01b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14e067c1a5280fe6fe5d3348a0bae87bc4da16db
+refs/heads/master: 8f0de0d62f29e47f5142737dad7561f108f69e92
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 67874b82a4ed..c407edb43fe4 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -1650,7 +1650,6 @@ config HZ
 	int
 	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \
 		ARCH_S5PV210 || ARCH_EXYNOS4
-	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
 	default AT91_TIMER_HZ if ARCH_AT91
 	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
 	default 100
diff --git a/trunk/arch/arm/plat-omap/Kconfig b/trunk/arch/arm/plat-omap/Kconfig
index 665870dce3c8..1fbac364bd4c 100644
--- a/trunk/arch/arm/plat-omap/Kconfig
+++ b/trunk/arch/arm/plat-omap/Kconfig
@@ -177,15 +177,6 @@ config OMAP3_L2_AUX_SECURE_SERVICE_SET_ID
 	help
 	  PPA routine service ID for setting L2 auxiliary control register.
 
-config OMAP_32K_TIMER_HZ
-	int "Kernel internal timer frequency for 32KHz timer"
-	range 32 1024
-	depends on OMAP_32K_TIMER
-	default "128"
-	help
-	  Kernel internal timer frequency should be a divisor of 32768,
-	  such as 64 or 128.
-
 config OMAP_DM_TIMER
 	bool "Use dual-mode timer"
 	depends on ARCH_OMAP16XX || ARCH_OMAP2PLUS
diff --git a/trunk/arch/arm/plat-omap/include/plat/timex.h b/trunk/arch/arm/plat-omap/include/plat/timex.h
index 6d35767bc48f..e27d2daa7790 100644
--- a/trunk/arch/arm/plat-omap/include/plat/timex.h
+++ b/trunk/arch/arm/plat-omap/include/plat/timex.h
@@ -28,14 +28,6 @@
 #if !defined(__ASM_ARCH_OMAP_TIMEX_H)
 #define __ASM_ARCH_OMAP_TIMEX_H
 
-/*
- * OMAP 32KHz timer updates time one jiffie at a time from a secondary timer,
- * and that's why the CLOCK_TICK_RATE is not 32768.
- */
-#ifdef CONFIG_OMAP_32K_TIMER
-#define CLOCK_TICK_RATE		(CONFIG_OMAP_32K_TIMER_HZ)
-#else
 #define CLOCK_TICK_RATE		(HZ * 100000UL)
-#endif
 
 #endif /* __ASM_ARCH_OMAP_TIMEX_H */