Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Merge upstream tree in order to reinstate crct10dif.

1 files changed, 78 insertions, 75 deletions

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index c7b32a966f67..627fa7e41fba 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -1,63 +1,10 @@
 config ARCH_OMAP
         bool
 
-config ARCH_OMAP2PLUS
-        bool "TI OMAP2/3/4/5 SoCs with device tree support" if (ARCH_MULTI_V6 || ARCH_MULTI_V7)
-        select ARCH_HAS_CPUFREQ
-        select ARCH_HAS_BANDGAP
-        select ARCH_HAS_HOLES_MEMORYMODEL
-        select ARCH_OMAP
-        select ARCH_REQUIRE_GPIOLIB
-        select CLKDEV_LOOKUP
-        select CLKSRC_MMIO
-        select GENERIC_CLOCKEVENTS
-        select GENERIC_IRQ_CHIP
-        select HAVE_CLK
-        select OMAP_DM_TIMER
-        select PINCTRL
-        select PROC_DEVICETREE if PROC_FS
-        select SOC_BUS
-        select SPARSE_IRQ
-        select TI_PRIV_EDMA
-        select USE_OF
-        help
-          Systems based on OMAP2, OMAP3, OMAP4 or OMAP5
-
-
-if ARCH_OMAP2PLUS
-
-menu "TI OMAP2/3/4 Specific Features"
-
-config ARCH_OMAP2PLUS_TYPICAL
-        bool "Typical OMAP configuration"
-        default y
-        select AEABI
-        select HIGHMEM
-        select I2C
-        select I2C_OMAP
-        select MENELAUS if ARCH_OMAP2
-        select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5
-        select PM_RUNTIME
-        select REGULATOR
-        select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
-        select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
-        select VFP
-        help
-          Compile a kernel suitable for booting most boards
-
-config SOC_HAS_OMAP2_SDRC
-        bool "OMAP2 SDRAM Controller support"
-
-config SOC_HAS_REALTIME_COUNTER
-        bool "Real time free running counter"
-        depends on SOC_OMAP5
-        default y
-
 config ARCH_OMAP2
         bool "TI OMAP2"
-        depends on ARCH_OMAP2PLUS
         depends on ARCH_MULTI_V6
-        default y
+        select ARCH_OMAP2PLUS
         select CPU_V6
         select MULTI_IRQ_HANDLER
         select SOC_HAS_OMAP2_SDRC
@@ -65,9 +12,8 @@ config ARCH_OMAP2
 
 config ARCH_OMAP3
         bool "TI OMAP3"
-        depends on ARCH_OMAP2PLUS
         depends on ARCH_MULTI_V7
-        default y
+        select ARCH_OMAP2PLUS
         select ARCH_HAS_OPP
         select ARM_CPU_SUSPEND if PM
         select CPU_V7
@@ -81,9 +27,8 @@ config ARCH_OMAP3
 
 config ARCH_OMAP4
         bool "TI OMAP4"
-        default y
-        depends on ARCH_OMAP2PLUS
         depends on ARCH_MULTI_V7
+        select ARCH_OMAP2PLUS
         select ARCH_HAS_OPP
         select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
         select ARM_CPU_SUSPEND if PM
@@ -108,12 +53,87 @@ config ARCH_OMAP4
 config SOC_OMAP5
         bool "TI OMAP5"
         depends on ARCH_MULTI_V7
+        select ARCH_OMAP2PLUS
         select ARM_CPU_SUSPEND if PM
         select ARM_GIC
         select CPU_V7
+        select HAVE_ARM_SCU if SMP
+        select HAVE_ARM_TWD if LOCAL_TIMERS
         select HAVE_SMP
         select COMMON_CLK
         select HAVE_ARM_ARCH_TIMER
+        select ARM_ERRATA_798181
+
+config SOC_AM33XX
+        bool "AM33XX support"
+        depends on ARCH_MULTI_V7
+        select ARCH_OMAP2PLUS
+        select ARM_CPU_SUSPEND if PM
+        select CPU_V7
+        select MULTI_IRQ_HANDLER
+        select COMMON_CLK
+
+config SOC_AM43XX
+        bool "TI AM43x"
+        depends on ARCH_MULTI_V7
+        select CPU_V7
+        select ARCH_OMAP2PLUS
+        select MULTI_IRQ_HANDLER
+        select ARM_GIC
+        select COMMON_CLK
+        select MACH_OMAP_GENERIC
+
+config ARCH_OMAP2PLUS
+        bool
+        select ARCH_HAS_BANDGAP
+        select ARCH_HAS_CPUFREQ
+        select ARCH_HAS_HOLES_MEMORYMODEL
+        select ARCH_OMAP
+        select ARCH_REQUIRE_GPIOLIB
+        select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
+        select GENERIC_CLOCKEVENTS
+        select GENERIC_IRQ_CHIP
+        select HAVE_CLK
+        select OMAP_DM_TIMER
+        select PINCTRL
+        select PROC_DEVICETREE if PROC_FS
+        select SOC_BUS
+        select SPARSE_IRQ
+        select TI_PRIV_EDMA
+        select USE_OF
+        help
+          Systems based on OMAP2, OMAP3, OMAP4 or OMAP5
+
+
+if ARCH_OMAP2PLUS
+
+menu "TI OMAP2/3/4 Specific Features"
+
+config ARCH_OMAP2PLUS_TYPICAL
+        bool "Typical OMAP configuration"
+        default y
+        select AEABI
+        select HIGHMEM
+        select I2C
+        select I2C_OMAP
+        select MENELAUS if ARCH_OMAP2
+        select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5
+        select PM_RUNTIME
+        select REGULATOR
+        select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
+        select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
+        select VFP
+        help
+          Compile a kernel suitable for booting most boards
+
+config SOC_HAS_OMAP2_SDRC
+        bool "OMAP2 SDRAM Controller support"
+
+config SOC_HAS_REALTIME_COUNTER
+        bool "Real time free running counter"
+        depends on SOC_OMAP5
+        default y
 
 comment "OMAP Core Type"
         depends on ARCH_OMAP2
@@ -142,23 +162,6 @@ config SOC_TI81XX
         depends on ARCH_OMAP3
         default y
 
-config SOC_AM33XX
-        bool "AM33XX support"
-        depends on ARCH_MULTI_V7
-        default y
-        select ARM_CPU_SUSPEND if PM
-        select CPU_V7
-        select MULTI_IRQ_HANDLER
-        select COMMON_CLK
-
-config SOC_AM43XX
-        bool "TI AM43x"
-        select CPU_V7
-        select MULTI_IRQ_HANDLER
-        select ARM_GIC
-        select COMMON_CLK
-        select MACH_OMAP_GENERIC
-
 config OMAP_PACKAGE_ZAF
        bool