ARM: sti: removal of stih415/stih416 related entries

ST's STiH415 and STiH416 platforms have already been removed since
a while.  Remove some remaining bits within the mach-sti.

Signed-off-by: Alain Volmat <avolmat@me.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>

diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig
index b3842c971d31b80edaf88ab907f4377bea0a2af5..e58699e13e1a55ce46e68908c7ef51e18b040dc9 100644 (file)
--- a/arch/arm/mach-sti/Kconfig
+++ b/arch/arm/mach-sti/Kconfig
@@ -19,31 +19,13 @@ menuconfig ARCH_STI
        select PL310_ERRATA_769419 if CACHE_L2X0
        select RESET_CONTROLLER
        help
-         Include support for STMicroelectronics' STiH415/416, STiH407/10 and
+         Include support for STMicroelectronics' STiH407/10 and
          STiH418 family SoCs using the Device Tree for discovery.  More
          information can be found in Documentation/arch/arm/sti/ and
          Documentation/devicetree.
 
 if ARCH_STI
 
-config SOC_STIH415
-       bool "STiH415 STMicroelectronics Consumer Electronics family"
-       default y
-       help
-         This enables support for STMicroelectronics Digital Consumer
-         Electronics family StiH415 parts, primarily targeted at set-top-box
-         and other digital audio/video applications using Flattned Device
-         Trees.
-
-config SOC_STIH416
-       bool "STiH416 STMicroelectronics Consumer Electronics family"
-       default y
-       help
-         This enables support for STMicroelectronics Digital Consumer
-         Electronics family StiH416 parts, primarily targeted at set-top-box
-         and other digital audio/video applications using Flattened Device
-         Trees.
-
 config SOC_STIH407
        bool "STiH407 STMicroelectronics Consumer Electronics family"
        default y

diff --git a/arch/arm/mach-sti/board-dt.c b/arch/arm/mach-sti/board-dt.c
index 488084b61b4acafb569ee9c51f5769393d55a9ce..1aaf61184685d754de57b487aef9a6b45a759b23 100644 (file)
--- a/arch/arm/mach-sti/board-dt.c
+++ b/arch/arm/mach-sti/board-dt.c
@@ -10,8 +10,6 @@
 #include "smp.h"
 
 static const char *const stih41x_dt_match[] __initconst = {
-       "st,stih415",
-       "st,stih416",
        "st,stih407",
        "st,stih410",
        "st,stih418",