| From fc208b7c7b43a0ba3a698ee5eb2bf6260ebbf498 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Thu, 20 Feb 2014 12:54:46 +0100 |
| Subject: 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> |
| (cherry picked from commit aeb8fb7910fc7344d0ee0c9306eb45f11327c600) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| arch/arm/mach-shmobile/Kconfig |
| --- |
| arch/arm/mach-shmobile/Kconfig | 36 ++++++++++++++++++------------------ |
| 1 file changed, 18 insertions(+), 18 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index 08ec4ffc17ee..e265630dfff1 100644 |
| --- a/arch/arm/mach-shmobile/Kconfig |
| +++ b/arch/arm/mach-shmobile/Kconfig |
| @@ -20,17 +20,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" |
| |
| @@ -61,6 +65,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)" |
| @@ -70,6 +76,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)" |
| @@ -80,6 +88,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)" |
| @@ -88,6 +98,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)" |
| @@ -95,6 +107,7 @@ config ARCH_R8A7778 |
| select CPU_V7 |
| select SH_CLK_CPG |
| select ARM_GIC |
| + select SYS_SUPPORTS_SH_TMU |
| |
| config ARCH_R8A7779 |
| bool "R-Car H1 (R8A77790)" |
| @@ -103,6 +116,7 @@ config ARCH_R8A7779 |
| select CPU_V7 |
| select SH_CLK_CPG |
| select RENESAS_INTC_IRQPIN |
| + select SYS_SUPPORTS_SH_TMU |
| |
| config ARCH_R8A7790 |
| bool "R-Car H2 (R8A77900)" |
| @@ -113,6 +127,7 @@ config ARCH_R8A7790 |
| select SH_CLK_CPG |
| select RENESAS_IRQC |
| select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE |
| + select SYS_SUPPORTS_SH_CMT |
| |
| config ARCH_R8A7791 |
| bool "R-Car M2 (R8A77910)" |
| @@ -123,6 +138,7 @@ config ARCH_R8A7791 |
| select SH_CLK_CPG |
| select RENESAS_IRQC |
| select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE |
| + select SYS_SUPPORTS_SH_CMT |
| |
| config ARCH_EMEV2 |
| bool "Emma Mobile EV2" |
| @@ -132,6 +148,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)" |
| @@ -139,6 +156,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" |
| |
| @@ -319,24 +337,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 |
| -- |
| 2.1.2 |
| |
