Merge tag 'mvebu-soc-3.17-2' of git://git.infradead.org/linux-mvebu into next/soc

Merge "ARM: mvebu SoC changes for v3.17 (round 2)" from Jason Cooper:

"Yeah, it's just one patch, but it's a beautiful one!  Thanks to the
efforts of many people over the last couple years, and in particular,
Andrew Lunn, Kirkwood has been completely converted to DT."

 - kirkwood
   * Remove mach-kirkwood/, It's fully supported in mach-mvebu/

* tag 'mvebu-soc-3.17-2' of git://git.infradead.org/linux-mvebu:
  ARM: Kirkwood: Remove mach-kirkwood

Signed-off-by: Olof Johansson <[email protected]>

diff --combined arch/arm/Kconfig
index 245058b3b0ef7d5d27b7c113d6199127d8cd5a8c,b20251ad7aa51dd2adfc708214392aaaa769662c..ba536bcb91b3ae3c067089a057315578c2c37e96
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -175,6 -175,13 +175,6 @@@ config ARCH_HAS_ILOG2_U3
  config ARCH_HAS_ILOG2_U64
        bool
  
 -config ARCH_HAS_CPUFREQ
 -      bool
 -      help
 -        Internal node to signify that the ARCH has CPUFREQ support
 -        and that the relevant menu configurations are displayed for
 -        it.
 -
  config ARCH_HAS_BANDGAP
        bool
  
@@@ -311,6 -318,7 +311,6 @@@ config ARCH_MULTIPLATFOR
  
  config ARCH_INTEGRATOR
        bool "ARM Ltd. Integrator family"
 -      select ARCH_HAS_CPUFREQ
        select ARM_AMBA
        select ARM_PATCH_PHYS_VIRT
        select AUTO_ZRELADDR
@@@ -528,21 -536,6 +528,6 @@@ config ARCH_DOV
        help
          Support for the Marvell Dove SoC 88AP510
  
- config ARCH_KIRKWOOD
-       bool "Marvell Kirkwood"
-       select ARCH_REQUIRE_GPIOLIB
-       select CPU_FEROCEON
-       select GENERIC_CLOCKEVENTS
-       select MVEBU_MBUS
-       select PCI
-       select PCI_QUIRKS
-       select PINCTRL
-       select PINCTRL_KIRKWOOD
-       select PLAT_ORION_LEGACY
-       help
-         Support for the following Marvell Kirkwood series SoCs:
-         88F6180, 88F6192 and 88F6281.
- 
  config ARCH_MV78XX0
        bool "Marvell MV78xx0"
        select ARCH_REQUIRE_GPIOLIB
@@@ -628,6 -621,7 +613,6 @@@ config ARCH_LPC32X
  config ARCH_PXA
        bool "PXA2xx/PXA3xx-based"
        depends on MMU
 -      select ARCH_HAS_CPUFREQ
        select ARCH_MTD_XIP
        select ARCH_REQUIRE_GPIOLIB
        select ARM_CPU_SUSPEND if PM
@@@ -697,6 -691,7 +682,6 @@@ config ARCH_RP
  
  config ARCH_SA1100
        bool "SA1100-based"
 -      select ARCH_HAS_CPUFREQ
        select ARCH_MTD_XIP
        select ARCH_REQUIRE_GPIOLIB
        select ARCH_SPARSEMEM_ENABLE
@@@ -714,6 -709,7 +699,6 @@@
  
  config ARCH_S3C24XX
        bool "Samsung S3C24XX SoCs"
 -      select ARCH_HAS_CPUFREQ
        select ARCH_REQUIRE_GPIOLIB
        select ATAGS
        select CLKDEV_LOOKUP
@@@ -734,6 -730,7 +719,6 @@@
  
  config ARCH_S3C64XX
        bool "Samsung S3C64XX"
 -      select ARCH_HAS_CPUFREQ
        select ARCH_REQUIRE_GPIOLIB
        select ARM_AMBA
        select ARM_VIC
@@@ -796,6 -793,7 +781,6 @@@ config ARCH_S5PC10
  
  config ARCH_S5PV210
        bool "Samsung S5PV210/S5PC110"
 -      select ARCH_HAS_CPUFREQ
        select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_SPARSEMEM_ENABLE
        select ATAGS
@@@ -831,6 -829,7 +816,6 @@@ config ARCH_DAVINC
  config ARCH_OMAP1
        bool "TI OMAP1"
        depends on MMU
 -      select ARCH_HAS_CPUFREQ
        select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_OMAP
        select ARCH_REQUIRE_GPIOLIB
@@@ -951,8 -950,6 +936,6 @@@ source "arch/arm/mach-ixp4xx/Kconfig
  
  source "arch/arm/mach-keystone/Kconfig"
  
- source "arch/arm/mach-kirkwood/Kconfig"
- 
  source "arch/arm/mach-ks8695/Kconfig"
  
  source "arch/arm/mach-msm/Kconfig"
@@@ -994,6 -991,8 +977,6 @@@ source "arch/arm/mach-rockchip/Kconfig
  
  source "arch/arm/mach-sa1100/Kconfig"
  
 -source "arch/arm/plat-samsung/Kconfig"
 -
  source "arch/arm/mach-socfpga/Kconfig"
  
  source "arch/arm/mach-spear/Kconfig"
@@@ -1011,7 -1010,6 +994,7 @@@ source "arch/arm/mach-s5pc100/Kconfig
  source "arch/arm/mach-s5pv210/Kconfig"
  
  source "arch/arm/mach-exynos/Kconfig"
 +source "arch/arm/plat-samsung/Kconfig"
  
  source "arch/arm/mach-shmobile/Kconfig"
  
@@@ -2093,7 -2091,9 +2076,7 @@@ endmen
  
  menu "CPU Power Management"
  
 -if ARCH_HAS_CPUFREQ
  source "drivers/cpufreq/Kconfig"
 -endif
  
  source "drivers/cpuidle/Kconfig"
  

diff --combined arch/arm/Kconfig.debug
index 3548612b0bfe30e268bc98c65960f3157a93178b,20f49e9ad26e565c28a18c8ca13faa66faab2a0b..35ba55bce82781c48412c2a135629868dea0f382
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -715,14 -715,6 +715,14 @@@ choic
                  Say Y here if you want kernel low-level debugging support
                  on Allwinner A1X based platforms on the UART1.
  
 +      config DEBUG_SUNXI_R_UART
 +              bool "Kernel low-level debugging messages via sunXi R_UART"
 +              depends on MACH_SUN6I || MACH_SUN8I
 +              select DEBUG_UART_8250
 +              help
 +                Say Y here if you want kernel low-level debugging support
 +                on Allwinner A31/A23 based platforms on the R_UART.
 +
        config TEGRA_DEBUG_UART_AUTO_ODMDATA
                bool "Kernel low-level debugging messages via Tegra UART via ODMDATA"
                depends on ARCH_TEGRA
@@@ -1041,7 -1033,7 +1041,7 @@@ config DEBUG_UART_825
        def_bool ARCH_DOVE || ARCH_EBSA110 || \
                (FOOTBRIDGE && !DEBUG_DC21285_PORT) || \
                ARCH_GEMINI || ARCH_IOP13XX || ARCH_IOP32X || \
-               ARCH_IOP33X || ARCH_IXP4XX || ARCH_KIRKWOOD || \
+               ARCH_IOP33X || ARCH_IXP4XX || \
                ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC
  
  config DEBUG_UART_PHYS
@@@ -1051,7 -1043,6 +1051,7 @@@
        default 0x01c28400 if DEBUG_SUNXI_UART1
        default 0x01d0c000 if DEBUG_DAVINCI_DA8XX_UART1
        default 0x01d0d000 if DEBUG_DAVINCI_DA8XX_UART2
 +      default 0x01f02800 if DEBUG_SUNXI_R_UART
        default 0x02530c00 if DEBUG_KEYSTONE_UART0
        default 0x02531000 if DEBUG_KEYSTONE_UART1
        default 0x03010fe0 if ARCH_RPC
@@@ -1098,7 -1089,7 +1098,7 @@@
        default 0xe0000000 if ARCH_SPEAR13XX
        default 0xf0000be0 if ARCH_EBSA110
        default 0xf1012000 if DEBUG_MVEBU_UART_ALTERNATE
-       default 0xf1012000 if ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \
+       default 0xf1012000 if ARCH_DOVE || ARCH_MV78XX0 || \
                                ARCH_ORION5X
        default 0xf7fc9000 if DEBUG_BERLIN_UART
        default 0xf8b00000 if DEBUG_HI3716_UART
@@@ -1127,7 -1118,6 +1127,7 @@@ config DEBUG_UART_VIR
        default 0xf1600000 if ARCH_INTEGRATOR
        default 0xf1c28000 if DEBUG_SUNXI_UART0
        default 0xf1c28400 if DEBUG_SUNXI_UART1
 +      default 0xf1f02800 if DEBUG_SUNXI_R_UART
        default 0xf2100000 if DEBUG_PXA_UART1
        default 0xf4090000 if ARCH_LPC32XX
        default 0xf4200000 if ARCH_GEMINI
@@@ -1164,7 -1154,6 +1164,6 @@@
        default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0
        default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
        default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2
-       default 0xfed12000 if ARCH_KIRKWOOD
        default 0xfed60000 if DEBUG_RK29_UART0
        default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
        default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3

diff --combined arch/arm/boot/dts/Makefile
index eb280d3483eb3111cd369df4fbd121462f27b0b7,025350ca96aa94db78bbae5ec0d3e17f12e1247b..67c59dc2d23adf46af3f7b8a07d6f4a63833ef93
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -90,8 -90,7 +90,7 @@@ dtb-$(CONFIG_ARCH_INTEGRATOR) += integr
  dtb-$(CONFIG_ARCH_KEYSTONE) += k2hk-evm.dtb \
        k2l-evm.dtb \
        k2e-evm.dtb
- kirkwood := \
-       kirkwood-b3.dtb \
+ dtb-$(CONFIG_MACH_KIRKWOOD) += kirkwood-b3.dtb \
        kirkwood-cloudbox.dtb \
        kirkwood-db-88f6281.dtb \
        kirkwood-db-88f6282.dtb \
@@@ -150,8 -149,6 +149,6 @@@
        kirkwood-ts219-6282.dtb \
        kirkwood-ts419-6281.dtb \
        kirkwood-ts419-6282.dtb
- dtb-$(CONFIG_ARCH_KIRKWOOD) += $(kirkwood)
- dtb-$(CONFIG_MACH_KIRKWOOD) += $(kirkwood)
  dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
  dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
@@@ -327,6 -324,7 +324,6 @@@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r
        r8a7778-bockw-reference.dtb \
        r8a7740-armadillo800eva-reference.dtb \
        r8a7779-marzen.dtb \
 -      r8a7779-marzen-reference.dtb \
        r8a7791-koelsch.dtb \
        r8a7790-lager.dtb \
        sh73a0-kzm9g.dtb \
@@@ -338,8 -336,7 +335,8 @@@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += em
        r7s72100-genmai.dtb \
        r8a7791-henninger.dtb \
        r8a7791-koelsch.dtb \
 -      r8a7790-lager.dtb
 +      r8a7790-lager.dtb \
 +      r8a7779-marzen.dtb
  dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
        socfpga_cyclone5_socdk.dtb \
        socfpga_cyclone5_sockit.dtb \
@@@ -357,7 -354,7 +354,7 @@@ dtb-$(CONFIG_ARCH_STI)+= stih407-b2120.
        stih415-b2020.dtb \
        stih416-b2000.dtb \
        stih416-b2020.dtb \
 -      stih416-b2020-revE.dtb
 +      stih416-b2020e.dtb
  dtb-$(CONFIG_MACH_SUN4I) += \
        sun4i-a10-a1000.dtb \
        sun4i-a10-cubieboard.dtb \

diff --combined arch/arm/mm/Kconfig
index c348eaee7ee29df402ce9103a94174cbb1883213,f06c6aad75e80d256d8985c21471c36ff479c4a9..c35f0ec9c9291806fab6a322ecccf6e5452b31e8
--- 1/arch/arm/mm/Kconfig
--- 2/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@@ -854,7 -854,7 +854,7 @@@ config OUTER_CACHE_SYN
  
  config CACHE_FEROCEON_L2
        bool "Enable the Feroceon L2 cache controller"
-       depends on ARCH_KIRKWOOD || ARCH_MV78XX0 || ARCH_MVEBU
+       depends on ARCH_MV78XX0 || ARCH_MVEBU
        default y
        select OUTER_CACHE
        help
@@@ -889,10 -889,9 +889,10 @@@ config CACHE_L2X
        help
          This option enables the L2x0 PrimeCell.
  
 +if CACHE_L2X0
 +
  config CACHE_PL310
        bool
 -      depends on CACHE_L2X0
        default y if CPU_V7 && !(CPU_V6 || CPU_V6K)
        help
          This option enables optimisations for the PL310 cache
@@@ -900,6 -899,7 +900,6 @@@
  
  config PL310_ERRATA_588369
        bool "PL310 errata: Clean & Invalidate maintenance operations do not invalidate clean lines"
 -      depends on CACHE_L2X0
        help
           The PL310 L2 cache controller implements three types of Clean &
           Invalidate maintenance operations: by Physical Address
@@@ -912,6 -912,7 +912,6 @@@
  
  config PL310_ERRATA_727915
        bool "PL310 errata: Background Clean & Invalidate by Way operation can cause data corruption"
 -      depends on CACHE_L2X0
        help
          PL310 implements the Clean & Invalidate by Way L2 cache maintenance
          operation (offset 0x7FC). This operation runs in background so that
@@@ -922,6 -923,7 +922,6 @@@
  
  config PL310_ERRATA_753970
        bool "PL310 errata: cache sync operation may be faulty"
 -      depends on CACHE_PL310
        help
          This option enables the workaround for the 753970 PL310 (r3p0) erratum.
  
@@@ -936,6 -938,7 +936,6 @@@
  
  config PL310_ERRATA_769419
        bool "PL310 errata: no automatic Store Buffer drain"
 -      depends on CACHE_L2X0
        help
          On revisions of the PL310 prior to r3p2, the Store Buffer does
          not automatically drain. This can cause normal, non-cacheable
@@@ -945,8 -948,6 +945,8 @@@
          on systems with an outer cache, the store buffer is drained
          explicitly.
  
 +endif
 +
  config CACHE_TAUROS2
        bool "Enable the Tauros2 L2 cache controller"
        depends on (ARCH_DOVE || ARCH_MMP || CPU_PJ4)