Commit 43389254 authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents 7b2a428a ba364fc7

arch/arm/Kconfig

+0 −17
Original line number Diff line number Diff line
@@ -528,21 +528,6 @@ config ARCH_DOVE 
	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
@@ -951,8 +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"

arch/arm/Kconfig.debug

+2 −3
Original line number Diff line number Diff line
@@ -1041,7 +1041,7 @@ config DEBUG_UART_8250 
	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
@@ -1098,7 +1098,7 @@ config DEBUG_UART_PHYS 
	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
@@ -1164,7 +1164,6 @@ config DEBUG_UART_VIRT 
	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

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ machine-$(CONFIG_ARCH_IOP32X) += iop32x 
machine-$(CONFIG_ARCH_IOP33X)		+= iop33x

machine-$(CONFIG_ARCH_IXP4XX)		+= ixp4xx

machine-$(CONFIG_ARCH_KEYSTONE)		+= keystone

machine-$(CONFIG_ARCH_KIRKWOOD)		+= kirkwood

machine-$(CONFIG_ARCH_KS8695)		+= ks8695

machine-$(CONFIG_ARCH_LPC32XX)		+= lpc32xx

machine-$(CONFIG_ARCH_MMP)		+= mmp

arch/arm/boot/dts/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -90,8 +90,7 @@ dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ 
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 @@ kirkwood := \ 
	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

arch/arm/mach-kirkwood/Kconfig

deleted100644 → 0
+0 −111
Original line number Diff line number Diff line 
if ARCH_KIRKWOOD



menu "Marvell Kirkwood Implementations"



config KIRKWOOD_LEGACY

	bool



config MACH_D2NET_V2

	bool "LaCie d2 Network v2 NAS Board"

	select KIRKWOOD_LEGACY

	help

	  Say 'Y' here if you want your kernel to support the

	  LaCie d2 Network v2 NAS.



config MACH_NET2BIG_V2

	bool "LaCie 2Big Network v2 NAS Board"

	select KIRKWOOD_LEGACY

	help

	  Say 'Y' here if you want your kernel to support the

	  LaCie 2Big Network v2 NAS.



config MACH_NET5BIG_V2

	bool "LaCie 5Big Network v2 NAS Board"

	select KIRKWOOD_LEGACY

	help

	  Say 'Y' here if you want your kernel to support the

	  LaCie 5Big Network v2 NAS.



config MACH_OPENRD

	select KIRKWOOD_LEGACY

        bool



config MACH_OPENRD_BASE

	bool "Marvell OpenRD Base Board"

	select MACH_OPENRD

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell OpenRD Base Board.



config MACH_OPENRD_CLIENT

	bool "Marvell OpenRD Client Board"

	select MACH_OPENRD

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell OpenRD Client Board.



config MACH_OPENRD_ULTIMATE

	bool "Marvell OpenRD Ultimate Board"

	select MACH_OPENRD

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell OpenRD Ultimate Board.



config MACH_RD88F6192_NAS

	bool "Marvell RD-88F6192-NAS Reference Board"

	select KIRKWOOD_LEGACY

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell RD-88F6192-NAS Reference Board.



config MACH_RD88F6281

	bool "Marvell RD-88F6281 Reference Board"

	select KIRKWOOD_LEGACY

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell RD-88F6281 Reference Board.



config MACH_T5325

	bool "HP t5325 Thin Client"

	select KIRKWOOD_LEGACY

	help

	  Say 'Y' here if you want your kernel to support the

	  HP t5325 Thin Client.



config MACH_TS219

	bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS"

	select KIRKWOOD_LEGACY

	help

	  Say 'Y' here if you want your kernel to support the

	  QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and

	  TS-219P+ Turbo NAS devices.



config MACH_TS41X

	bool "QNAP TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U Turbo NAS"

	select KIRKWOOD_LEGACY

	help

	  Say 'Y' here if you want your kernel to support the

	  QNAP TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U Turbo

	  NAS devices.



comment "Device tree entries"



config ARCH_KIRKWOOD_DT

	bool "Marvell Kirkwood Flattened Device Tree"

	select KIRKWOOD_CLK

	select OF_IRQ

	select ORION_IRQCHIP

	select ORION_TIMER

	select POWER_SUPPLY

	select POWER_RESET

	select POWER_RESET_GPIO

	select REGULATOR

	select REGULATOR_FIXED_VOLTAGE

	select USE_OF

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell Kirkwood using flattened device tree.



endmenu



endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE