Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

ARM: shmobile: Remove CMT, TMU and STI Kconfig entries

Now when drivers/clocksource/Kconfig has been
updated with entires for CMT, TMU, MTU2, and STI
it is safe to remove these from mach-shmobile.

Also select timers per SoC via SYS_SUPPORTS_xxx.

Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Magnus Damm 11 years ago
parent
c8af34b4db
commit
aeb8fb7910
1 changed files with 18 additions and 18 deletions
Split View Show Diff Stats
  1. 18 18
      arch/arm/mach-shmobile/Kconfig

+ 18 - 18
arch/arm/mach-shmobile/Kconfig
View File 

@@ -24,17 +24,21 @@ comment "Renesas ARM SoCs System Type"
 
 
 config ARCH_EMEV2
 
 	bool "Emma Mobile EV2"
 
+	select SYS_SUPPORTS_EM_STI
 
 
 config ARCH_R7S72100
 
 	bool "RZ/A1H (R7S72100)"
 
+	select SYS_SUPPORTS_SH_MTU2
 
 
 config ARCH_R8A7790
 
 	bool "R-Car H2 (R8A77900)"
 
 	select RENESAS_IRQC
 
+	select SYS_SUPPORTS_SH_CMT
 
 
 config ARCH_R8A7791
 
 	bool "R-Car M2 (R8A77910)"
 
 	select RENESAS_IRQC
 
+	select SYS_SUPPORTS_SH_CMT
 
 
 comment "Renesas ARM SoCs Board Type"
 
 
@@ -68,6 +72,8 @@ config ARCH_SH7372
 
 	select ARM_CPU_SUSPEND if PM || CPU_IDLE
 
 	select CPU_V7
 
 	select SH_CLK_CPG
 
+	select SYS_SUPPORTS_SH_CMT
 
+	select SYS_SUPPORTS_SH_TMU
 
 
 config ARCH_SH73A0
 
 	bool "SH-Mobile AG5 (R8A73A00)"
 
@@ -77,6 +83,8 @@ config ARCH_SH73A0
 
 	select I2C
 
 	select SH_CLK_CPG
 
 	select RENESAS_INTC_IRQPIN
 
+	select SYS_SUPPORTS_SH_CMT
 
+	select SYS_SUPPORTS_SH_TMU
 
 
 config ARCH_R8A73A4
 
 	bool "R-Mobile APE6 (R8A73A40)"
 
@@ -87,6 +95,8 @@ config ARCH_R8A73A4
 
 	select RENESAS_IRQC
 
 	select ARCH_HAS_CPUFREQ
 
 	select ARCH_HAS_OPP
 
+	select SYS_SUPPORTS_SH_CMT
 
+	select SYS_SUPPORTS_SH_TMU
 
 
 config ARCH_R8A7740
 
 	bool "R-Mobile A1 (R8A77400)"
 
@@ -95,6 +105,8 @@ config ARCH_R8A7740
 
 	select CPU_V7
 
 	select SH_CLK_CPG
 
 	select RENESAS_INTC_IRQPIN
 
+	select SYS_SUPPORTS_SH_CMT
 
+	select SYS_SUPPORTS_SH_TMU
 
 
 config ARCH_R8A7778
 
 	bool "R-Car M1A (R8A77781)"
 
@@ -104,6 +116,7 @@ config ARCH_R8A7778
 
 	select ARM_GIC
 
 	select USB_ARCH_HAS_EHCI
 
 	select USB_ARCH_HAS_OHCI
 
+	select SYS_SUPPORTS_SH_TMU
 
 
 config ARCH_R8A7779
 
 	bool "R-Car H1 (R8A77790)"
 
@@ -114,6 +127,7 @@ config ARCH_R8A7779
 
 	select USB_ARCH_HAS_EHCI
 
 	select USB_ARCH_HAS_OHCI
 
 	select RENESAS_INTC_IRQPIN
 
+	select SYS_SUPPORTS_SH_TMU
 
 
 config ARCH_R8A7790
 
 	bool "R-Car H2 (R8A77900)"
 
@@ -123,6 +137,7 @@ config ARCH_R8A7790
 
 	select MIGHT_HAVE_PCI
 
 	select SH_CLK_CPG
 
 	select RENESAS_IRQC
 
+	select SYS_SUPPORTS_SH_CMT
 
 
 config ARCH_R8A7791
 
 	bool "R-Car M2 (R8A77910)"
 
@@ -132,6 +147,7 @@ config ARCH_R8A7791
 
 	select MIGHT_HAVE_PCI
 
 	select SH_CLK_CPG
 
 	select RENESAS_IRQC
 
+	select SYS_SUPPORTS_SH_CMT
 
 
 config ARCH_EMEV2
 
 	bool "Emma Mobile EV2"
 
@@ -141,6 +157,7 @@ config ARCH_EMEV2
 
 	select MIGHT_HAVE_PCI
 
 	select USE_OF
 
 	select AUTO_ZRELADDR
 
+	select SYS_SUPPORTS_EM_STI
 
 
 config ARCH_R7S72100
 
 	bool "RZ/A1H (R7S72100)"
 
@@ -148,6 +165,7 @@ config ARCH_R7S72100
 
 	select ARM_GIC
 
 	select CPU_V7
 
 	select SH_CLK_CPG
 
+	select SYS_SUPPORTS_SH_MTU2
 
 
 comment "Renesas ARM SoCs Board Type"
 
 
@@ -321,24 +339,6 @@ config SHMOBILE_TIMER_HZ
 
 	  want to select a HZ value such as 128 that can evenly divide RCLK.
 
 	  A HZ value that does not divide evenly may cause timer drift.
 
 
-config SH_TIMER_CMT
 
-	bool "CMT timer driver"
 
-	default y
 
-	help
 
-	  This enables build of the CMT timer driver.
 
-
 
-config SH_TIMER_TMU
 
-	bool "TMU timer driver"
 
-	default y
 
-	help
 
-	  This enables build of the TMU timer driver.
 
-
 
-config EM_TIMER_STI
 
-	bool "STI timer driver"
 
-	default y
 
-	help
 
-	  This enables build of the STI timer driver.
 
-
 
 endmenu
 
 
 endif