Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC-specific updates from Arnd Bergmann:
 "This is a larger set of new functionality for the existing SoC
  families, including:

   - vt8500 gains support for new CPU cores, notably the Cortex-A9 based
     wm8850

   - prima2 gains support for the "marco" SoC family, its SMP based
     cousin

   - tegra gains support for the new Tegra4 (Tegra114) family

   - socfpga now supports a newer version of the hardware including SMP

   - i.mx31 and bcm2835 are now using DT probing for their clocks

   - lots of updates for sh-mobile

   - OMAP updates for clocks, power management and USB

   - i.mx6q and tegra now support cpuidle

   - kirkwood now supports PCIe hot plugging

   - tegra clock support is updated

   - tegra USB PHY probing gets implemented diffently"

* tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (148 commits)
  ARM: prima2: remove duplicate v7_invalidate_l1
  ARM: shmobile: r8a7779: Correct TMU clock support again
  ARM: prima2: fix __init section for cpu hotplug
  ARM: OMAP: Consolidate OMAP USB-HS platform data (part 3/3)
  ARM: OMAP: Consolidate OMAP USB-HS platform data (part 1/3)
  arm: socfpga: Add SMP support for actual socfpga harware
  arm: Add v7_invalidate_l1 to cache-v7.S
  arm: socfpga: Add entries to enable make dtbs socfpga
  arm: socfpga: Add new device tree source for actual socfpga HW
  ARM: tegra: sort Kconfig selects for Tegra114
  ARM: tegra: enable ARCH_REQUIRE_GPIOLIB for Tegra114
  ARM: tegra: Fix build error w/ ARCH_TEGRA_114_SOC w/o ARCH_TEGRA_3x_SOC
  ARM: tegra: Fix build error for gic update
  ARM: tegra: remove empty tegra_smp_init_cpus()
  ARM: shmobile: Register ARM architected timer
  ARM: MARCO: fix the build issue due to gic-vic-to-irqchip move
  ARM: shmobile: r8a7779: Correct TMU clock support
  ARM: mxs_defconfig: Select CONFIG_DEVTMPFS_MOUNT
  ARM: mxs: decrease mxs_clockevent_device.min_delta_ns to 2 clock cycles
  ARM: mxs: use apbx bus clock to drive the timers on timrotv2
  ...

1 files changed, 36 insertions, 9 deletions

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 5f0cdf28c227..acddddac7ee4 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -205,12 +205,19 @@ choice
                   Say Y here if you want kernel low-level debugging support
                   on i.MX28.
 
-        config DEBUG_IMX31_IMX35_UART
-                bool "i.MX31 and i.MX35 Debug UART"
-                depends on SOC_IMX31 || SOC_IMX35
+        config DEBUG_IMX31_UART
+                bool "i.MX31 Debug UART"
+                depends on SOC_IMX31
                 help
                   Say Y here if you want kernel low-level debugging support
-                  on i.MX31 or i.MX35.
+                  on i.MX31.
+
+        config DEBUG_IMX35_UART
+                bool "i.MX35 Debug UART"
+                depends on SOC_IMX35
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on i.MX35.
 
         config DEBUG_IMX51_UART
                 bool "i.MX51 Debug UART"
@@ -393,6 +400,20 @@ choice
                   Say Y here if you want kernel low-level debugging support
                   on Tegra based platforms.
 
+        config DEBUG_SIRFPRIMA2_UART1
+                bool "Kernel low-level debugging messages via SiRFprimaII UART1"
+                depends on ARCH_PRIMA2
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to the uart1 port on SiRFprimaII devices.
+
+        config DEBUG_SIRFMARCO_UART1
+                bool "Kernel low-level debugging messages via SiRFmarco UART1"
+                depends on ARCH_MARCO
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to the uart1 port on SiRFmarco devices.
+
         config DEBUG_VEXPRESS_UART0_DETECT
                 bool "Autodetect UART0 on Versatile Express Cortex-A core tiles"
                 depends on ARCH_VEXPRESS && CPU_CP15_MMU
@@ -464,11 +485,16 @@ choice
 
 endchoice
 
-config DEBUG_IMX6Q_UART_PORT
-        int "i.MX6Q Debug UART Port (1-5)" if DEBUG_IMX6Q_UART
-        range 1 5
+config DEBUG_IMX_UART_PORT
+        int "i.MX Debug UART Port Selection" if DEBUG_IMX1_UART || \
+                                                DEBUG_IMX25_UART || \
+                                                DEBUG_IMX21_IMX27_UART || \
+                                                DEBUG_IMX31_UART || \
+                                                DEBUG_IMX35_UART || \
+                                                DEBUG_IMX51_UART || \
+                                                DEBUG_IMX50_IMX53_UART || \
+                                                DEBUG_IMX6Q_UART
         default 1
-        depends on SOC_IMX6Q
         help
           Choose UART port on which kernel low-level debug messages
           should be output.
@@ -557,7 +583,8 @@ config DEBUG_LL_INCLUDE
         default "debug/imx.S" if DEBUG_IMX1_UART || \
                                  DEBUG_IMX25_UART || \
                                  DEBUG_IMX21_IMX27_UART || \
-                                 DEBUG_IMX31_IMX35_UART || \
+                                 DEBUG_IMX31_UART || \
+                                 DEBUG_IMX35_UART || \
                                  DEBUG_IMX51_UART || \
                                  DEBUG_IMX53_UART ||\
                                  DEBUG_IMX6Q_UART