diff --git a/arch/arm/src/tiva/Kconfig b/arch/arm/src/tiva/Kconfig
index 1c1fa7ec483..2b61ae5dc6b 100644
--- a/arch/arm/src/tiva/Kconfig
+++ b/arch/arm/src/tiva/Kconfig
@@ -746,10 +746,6 @@ if TIVA_TIMER
 
 menu "Tiva Timer Configuration"
 
-config TIVA_TIMER_DRIVER
-	bool
-	default n
-
 config TIVA_TIMER_32BIT
 	bool "32-bit timer support"
 	default n
@@ -759,7 +755,6 @@ if TIVA_TIMER_32BIT
 config TIVA_TIMER32_PERIODIC
 	bool "32-bit one-shot/periodic timer support"
 	default n
-	select TIVA_TIMER_DRIVER if TIMER
 
 config TIVA_TIMER32_RTC
 	bool "32-bit RTC (needs 32.768-KHz input)"
diff --git a/arch/arm/src/tiva/Make.defs b/arch/arm/src/tiva/Make.defs
index d244c3a2fbd..3c49a676939 100644
--- a/arch/arm/src/tiva/Make.defs
+++ b/arch/arm/src/tiva/Make.defs
@@ -98,8 +98,8 @@ endif
 
 ifeq ($(CONFIG_TIVA_TIMER),y)
 CHIP_CSRCS += tiva_timerlib.c
-ifeq ($(CONFIG_TIVA_TIMER_DRIVER),y)
-CHIP_CSRCS += tiva_timerlow.c
+ifeq ($(CONFIG_TIVA_TIMER32_PERIODIC),y)
+CHIP_CSRCS += tiva_timerlow32.c
 endif
 endif
 
diff --git a/arch/arm/src/tiva/tiva_timerlow.c b/arch/arm/src/tiva/tiva_timerlow32.c
similarity index 99%
rename from arch/arm/src/tiva/tiva_timerlow.c
rename to arch/arm/src/tiva/tiva_timerlow32.c
index 261421af470..d7711ad6436 100644
--- a/arch/arm/src/tiva/tiva_timerlow.c
+++ b/arch/arm/src/tiva/tiva_timerlow32.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/tiva/tiva_timerlow.c
+ * arch/arm/src/tiva/tiva_timerlow32.c
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>