From: Neil Armstrong <narmstrong@baylibre.com>
Date: Wed, 6 Jul 2016 05:10:11 +0000 (-0700)
Subject: ARM: oxnas: Change OX810SE default driver config
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=fa06f54a1837428e1b67ca3947fa939b7227c668;p=deliverable%2Flinux.git

ARM: oxnas: Change OX810SE default driver config

Since the SP804 timer changes will not been merged upstream, switch the
default OX810SE config to the OXNAS RPS Timer driver configuration.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
---

diff --git a/arch/arm/mach-oxnas/Kconfig b/arch/arm/mach-oxnas/Kconfig
index 4fff3c7666df..19164d729d2a 100644
--- a/arch/arm/mach-oxnas/Kconfig
+++ b/arch/arm/mach-oxnas/Kconfig
@@ -11,10 +11,10 @@ if ARCH_OXNAS
 
 config MACH_OX810SE
 	bool "Support OX810SE Based Products"
-	select ARM_TIMER_SP804
 	select COMMON_CLK_OXNAS
 	select CPU_ARM926T
 	select MFD_SYSCON
+	select OXNAS_RPS_TIMER
 	select PINCTRL_OXNAS
 	select RESET_OXNAS
 	select VERSATILE_FPGA_IRQ