Remove mach-kirkwood

PATCH Superseded Andrew Lunn 5 participants 20 messages Jul 10, 2014 – Jul 30, 2014

Subsystems (14)

Device tree bindings Arm (32-bit) Sound Arm sub-architectures +10 more subsystems

lore

Share & tools

lore

Andrew Lunn

author

2014-07-10 21:36 UTC #0 lore raw

v2 cover Remove mach-kirkwood

This patchset removes arch/arm/mach-kirkwood. This SoCs is now supported in arch/arm/mach-mvebu using device tree.

V1 of this patchset also removed mach-dove. However it has been decided to leave it alone for a while to aid some developers get out of tree patches merged.

Change the dependencies for a number of drivers, either to use ARCH_MVEBU where the drivers are generic, or MACH_KIRKWOOD and where the drivers are specific to the SoC.

Once Jason Cooper has Acked these patches, we would prefer that individual subsystem maintainers take these patches through their own trees.

Thanks
Andrew

Andrew Lunn (12):
ARM: Kirkwood: Remove mach-kirkwood
ARM: Kirkwood: Remove kirkwood_defconfig
ASoC: kirkwood: Remove unused drivers
ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency
cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency
ata: Remove ARCH_KIRKWOOD dependency
thermal: Remove ARCH_KIRKWOOD dependency
leds: Remove ARCH_KIRKWOOD dependency
PCI: Remove ARCH_KIRKWOOD dependency
phy: Remove ARCH_KIRKWOOD dependency
rtc: Remove ARCH_KIRKWOOD dependency
watchdog: Remove ARCH_KIRKWOOD dependency

 arch/arm/Kconfig                                  |  18 -
 arch/arm/Kconfig.debug                            |   6 +-
 arch/arm/Makefile                                 |   1 -
 arch/arm/boot/dts/Makefile                        |   5 +-
 arch/arm/configs/kirkwood_defconfig               | 181 ------
 arch/arm/mach-kirkwood/Kconfig                    | 111 ----
 arch/arm/mach-kirkwood/Makefile                   |  14 -
 arch/arm/mach-kirkwood/Makefile.boot              |   3 -
 arch/arm/mach-kirkwood/board-dt.c                 | 223 -------
 arch/arm/mach-kirkwood/common.c                   | 746 ----------------------
 arch/arm/mach-kirkwood/common.h                   |  74 ---
 arch/arm/mach-kirkwood/d2net_v2-setup.c           | 231 -------
 arch/arm/mach-kirkwood/include/mach/bridge-regs.h |  86 ---
 arch/arm/mach-kirkwood/include/mach/entry-macro.S |  34 -
 arch/arm/mach-kirkwood/include/mach/hardware.h    |  14 -
 arch/arm/mach-kirkwood/include/mach/irqs.h        |  65 --
 arch/arm/mach-kirkwood/include/mach/kirkwood.h    | 142 ----
 arch/arm/mach-kirkwood/include/mach/uncompress.h  |  46 --
 arch/arm/mach-kirkwood/irq.c                      |  82 ---
 arch/arm/mach-kirkwood/lacie_v2-common.c          | 114 ----
 arch/arm/mach-kirkwood/lacie_v2-common.h          |  16 -
 arch/arm/mach-kirkwood/mpp.c                      |  43 --
 arch/arm/mach-kirkwood/mpp.h                      | 348 ----------
 arch/arm/mach-kirkwood/netxbig_v2-setup.c         | 422 ------------
 arch/arm/mach-kirkwood/openrd-setup.c             | 255 --------
 arch/arm/mach-kirkwood/pcie.c                     | 296 ---------
 arch/arm/mach-kirkwood/pm.c                       |  76 ---
 arch/arm/mach-kirkwood/pm.h                       |  26 -
 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c      |  89 ---
 arch/arm/mach-kirkwood/rd88f6281-setup.c          | 128 ----
 arch/arm/mach-kirkwood/t5325-setup.c              | 216 -------
 arch/arm/mach-kirkwood/ts219-setup.c              | 142 ----
 arch/arm/mach-kirkwood/ts41x-setup.c              | 186 ------
 arch/arm/mach-kirkwood/tsx1x-common.c             | 113 ----
 arch/arm/mach-kirkwood/tsx1x-common.h             |   7 -
 arch/arm/mm/Kconfig                               |   2 +-
 drivers/ata/Kconfig                               |   2 +-
 drivers/cpuidle/Kconfig.arm                       |   2 +-
 drivers/leds/Kconfig                              |   4 +-
 drivers/pci/host/Kconfig                          |   2 +-
 drivers/phy/Kconfig                               |   2 +-
 drivers/rtc/Kconfig                               |   2 +-
 drivers/thermal/Kconfig                           |   2 +-
 drivers/watchdog/Kconfig                          |   2 +-
 sound/soc/kirkwood/Kconfig                        |  19 +-
 sound/soc/kirkwood/Makefile                       |   4 -
 sound/soc/kirkwood/kirkwood-openrd.c              | 109 ----
 sound/soc/kirkwood/kirkwood-t5325.c               | 116 ----
 48 files changed, 14 insertions(+), 4813 deletions(-)
 delete mode 100644 arch/arm/configs/kirkwood_defconfig
 delete mode 100644 arch/arm/mach-kirkwood/Kconfig
 delete mode 100644 arch/arm/mach-kirkwood/Makefile
 delete mode 100644 arch/arm/mach-kirkwood/Makefile.boot
 delete mode 100644 arch/arm/mach-kirkwood/board-dt.c
 delete mode 100644 arch/arm/mach-kirkwood/common.c
 delete mode 100644 arch/arm/mach-kirkwood/common.h
 delete mode 100644 arch/arm/mach-kirkwood/d2net_v2-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/bridge-regs.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/hardware.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/kirkwood.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-kirkwood/irq.c
 delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.c
 delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.h
 delete mode 100644 arch/arm/mach-kirkwood/mpp.c
 delete mode 100644 arch/arm/mach-kirkwood/mpp.h
 delete mode 100644 arch/arm/mach-kirkwood/netxbig_v2-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/openrd-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/pcie.c
 delete mode 100644 arch/arm/mach-kirkwood/pm.c
 delete mode 100644 arch/arm/mach-kirkwood/pm.h
 delete mode 100644 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/rd88f6281-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/t5325-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/ts219-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/ts41x-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.c
 delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.h
 delete mode 100644 sound/soc/kirkwood/kirkwood-openrd.c
 delete mode 100644 sound/soc/kirkwood/kirkwood-t5325.c

Signature · 20 lines

2.0.1

Cc: Mark Brown <[email protected]>
Cc: alsa-devel at alsa-project.org
Cc: Daniel Lezcano <[email protected]>
Cc: Rafael J. Wysocki <[email protected]>
Cc: linux-pm at vger.kernel.org
Cc: Tejun Heo <[email protected]>
Cc: linux-ide at vger.kernel.org
Cc: Zhang Rui <[email protected]>
Cc: Bryan Wu <[email protected]>
Cc: Richard Purdie <[email protected]>
Cc: linux-leds at vger.kernel.org
Cc: Bjorn Helgaas <[email protected]>
Cc: linux-pci at vger.kernel.org
Cc: Kishon Vijay Abraham I <[email protected]>
Cc: Alessandro Zummo <[email protected]>
Cc: rtc-linux at googlegroups.com
Cc: Wim Van Sebroeck <[email protected]>
Cc: linux-watchdog at vger.kernel.org

Andrew Lunn

author

2014-07-10 21:36 UTC #1 lore raw

PATCH v2 1/12 ARM: Kirkwood: Remove mach-kirkwood

Now that all boards have been converted to DT and all the support code lives in mach-mvebu, we can remove mach-kirkwood.

Signed-off-by Andrew Lunn <[email protected]>

---
 arch/arm/Kconfig                                  |  18 -
 arch/arm/Kconfig.debug                            |   6 +-
 arch/arm/Makefile                                 |   1 -
 arch/arm/boot/dts/Makefile                        |   5 +-
 arch/arm/mach-kirkwood/Kconfig                    | 111 ----
 arch/arm/mach-kirkwood/Makefile                   |  14 -
 arch/arm/mach-kirkwood/Makefile.boot              |   3 -
 arch/arm/mach-kirkwood/board-dt.c                 | 223 -------
 arch/arm/mach-kirkwood/common.c                   | 746 ----------------------
 arch/arm/mach-kirkwood/common.h                   |  74 ---
 arch/arm/mach-kirkwood/d2net_v2-setup.c           | 231 -------
 arch/arm/mach-kirkwood/include/mach/bridge-regs.h |  86 ---
 arch/arm/mach-kirkwood/include/mach/entry-macro.S |  34 -
 arch/arm/mach-kirkwood/include/mach/hardware.h    |  14 -
 arch/arm/mach-kirkwood/include/mach/irqs.h        |  65 --
 arch/arm/mach-kirkwood/include/mach/kirkwood.h    | 142 ----
 arch/arm/mach-kirkwood/include/mach/uncompress.h  |  46 --
 arch/arm/mach-kirkwood/irq.c                      |  82 ---
 arch/arm/mach-kirkwood/lacie_v2-common.c          | 114 ----
 arch/arm/mach-kirkwood/lacie_v2-common.h          |  16 -
 arch/arm/mach-kirkwood/mpp.c                      |  43 --
 arch/arm/mach-kirkwood/mpp.h                      | 348 ----------
 arch/arm/mach-kirkwood/netxbig_v2-setup.c         | 422 ------------
 arch/arm/mach-kirkwood/openrd-setup.c             | 255 --------
 arch/arm/mach-kirkwood/pcie.c                     | 296 ---------
 arch/arm/mach-kirkwood/pm.c                       |  76 ---
 arch/arm/mach-kirkwood/pm.h                       |  26 -
 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c      |  89 ---
 arch/arm/mach-kirkwood/rd88f6281-setup.c          | 128 ----
 arch/arm/mach-kirkwood/t5325-setup.c              | 216 -------
 arch/arm/mach-kirkwood/ts219-setup.c              | 142 ----
 arch/arm/mach-kirkwood/ts41x-setup.c              | 186 ------
 arch/arm/mach-kirkwood/tsx1x-common.c             | 113 ----
 arch/arm/mach-kirkwood/tsx1x-common.h             |   7 -
 arch/arm/mm/Kconfig                               |   2 +-
 35 files changed, 4 insertions(+), 4376 deletions(-)
 delete mode 100644 arch/arm/mach-kirkwood/Kconfig
 delete mode 100644 arch/arm/mach-kirkwood/Makefile
 delete mode 100644 arch/arm/mach-kirkwood/Makefile.boot
 delete mode 100644 arch/arm/mach-kirkwood/board-dt.c
 delete mode 100644 arch/arm/mach-kirkwood/common.c
 delete mode 100644 arch/arm/mach-kirkwood/common.h
 delete mode 100644 arch/arm/mach-kirkwood/d2net_v2-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/bridge-regs.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/hardware.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/kirkwood.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-kirkwood/irq.c
 delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.c
 delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.h
 delete mode 100644 arch/arm/mach-kirkwood/mpp.c
 delete mode 100644 arch/arm/mach-kirkwood/mpp.h
 delete mode 100644 arch/arm/mach-kirkwood/netxbig_v2-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/openrd-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/pcie.c
 delete mode 100644 arch/arm/mach-kirkwood/pm.c
 delete mode 100644 arch/arm/mach-kirkwood/pm.h
 delete mode 100644 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/rd88f6281-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/t5325-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/ts219-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/ts41x-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.c
 delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.h

arch/arm/Kconfig +0 ~~-18~~

index 87b63fde06d7..b20251ad7aa5 100644
@@ -536,22 +536,6 @@ config ARCH_DOVE
 	help
 	  Support for the Marvell Dove SoC 88AP510
 
-config ARCH_KIRKWOOD
-	bool "Marvell Kirkwood"
-	select ARCH_HAS_CPUFREQ
-	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

@@ -966,8 +950,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 -4

index 8f90595069a1..2dfaf8f20c21 100644
@@ -1033,7 +1033,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

@@ -1089,8 +1089,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 || \
-				ARCH_ORION5X
+	default 0xf1012000 if ARCH_DOVE || ARCH_MV78XX0 || ARCH_ORION5X
 	default 0xf7fc9000 if DEBUG_BERLIN_UART
 	default 0xf8b00000 if DEBUG_HI3716_UART
 	default 0xf991e000 if DEBUG_QCOM_UARTDM

@@ -1154,7 +1153,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

index 6721fab13734..433a6f1b218f 100644
@@ -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

index 5986ff63b901..025350ca96aa 100644
@@ -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 deleted +0 -0

deleted file mode 100644
index df4b26340ae4..000000000000

arch/arm/mach-kirkwood/Makefile deleted +0 -0

deleted file mode 100644
index 3a72c5c6e747..000000000000

arch/arm/mach-kirkwood/Makefile.boot deleted +0 -0

deleted file mode 100644
index 760a0efe7580..000000000000

arch/arm/mach-kirkwood/board-dt.c deleted +0 -0

deleted file mode 100644
index ff18ff20f71f..000000000000

arch/arm/mach-kirkwood/common.c deleted +0 -0

deleted file mode 100644
index 255f33a3903c..000000000000

arch/arm/mach-kirkwood/common.h deleted +0 -0

deleted file mode 100644
index 832a4e2ab8d7..000000000000

arch/arm/mach-kirkwood/d2net_v2-setup.c deleted +0 -0

deleted file mode 100644
index 453418063c1e..000000000000

arch/arm/mach-kirkwood/include/mach/bridge-regs.h deleted +0 -0

deleted file mode 100644
index 1c37082c8b39..000000000000

arch/arm/mach-kirkwood/include/mach/entry-macro.S deleted +0 -0

deleted file mode 100644
index 82db29f7af8f..000000000000

arch/arm/mach-kirkwood/include/mach/hardware.h deleted +0 -0

deleted file mode 100644
index 742b74f43e41..000000000000

arch/arm/mach-kirkwood/include/mach/irqs.h deleted +0 -0

deleted file mode 100644
index 2bf8161e3b51..000000000000

arch/arm/mach-kirkwood/include/mach/kirkwood.h deleted +0 -0

deleted file mode 100644
index 92976cef3910..000000000000

arch/arm/mach-kirkwood/include/mach/uncompress.h deleted +0 -0

deleted file mode 100644
index 5bca5534021f..000000000000

arch/arm/mach-kirkwood/irq.c deleted +0 -0

deleted file mode 100644
index 2c47a8ad0e27..000000000000

arch/arm/mach-kirkwood/lacie_v2-common.c deleted +0 -0

deleted file mode 100644
index 8e3e4331c380..000000000000

arch/arm/mach-kirkwood/lacie_v2-common.h deleted +0 -0

deleted file mode 100644
index fc64f578536e..000000000000

arch/arm/mach-kirkwood/mpp.c deleted +0 -0

deleted file mode 100644
index e96fd71abd76..000000000000

arch/arm/mach-kirkwood/mpp.h deleted +0 -0

deleted file mode 100644
index d5a0d1da2e0e..000000000000

arch/arm/mach-kirkwood/netxbig_v2-setup.c deleted +0 -0

deleted file mode 100644
index 913d032cdb19..000000000000

arch/arm/mach-kirkwood/openrd-setup.c deleted +0 -0

deleted file mode 100644
index e5cf84103583..000000000000

arch/arm/mach-kirkwood/pcie.c deleted +0 -0

deleted file mode 100644
index 12d86f39f380..000000000000

arch/arm/mach-kirkwood/pm.c deleted +0 -0

deleted file mode 100644
index 8e5e0329d04c..000000000000

arch/arm/mach-kirkwood/pm.h deleted +0 -0

deleted file mode 100644
index 21e7530f368b..000000000000

arch/arm/mach-kirkwood/rd88f6192-nas-setup.c deleted +0 -0

deleted file mode 100644
index e4fd3129d36f..000000000000

arch/arm/mach-kirkwood/rd88f6281-setup.c deleted +0 -0

deleted file mode 100644
index 5154bd2a3ad3..000000000000

arch/arm/mach-kirkwood/t5325-setup.c deleted +0 -0

deleted file mode 100644
index 8736f8c97518..000000000000

arch/arm/mach-kirkwood/ts219-setup.c deleted +0 -0

deleted file mode 100644
index e1267d6b468f..000000000000

arch/arm/mach-kirkwood/ts41x-setup.c deleted +0 -0

deleted file mode 100644
index 81d585806b2f..000000000000

arch/arm/mach-kirkwood/tsx1x-common.c deleted +0 -0

deleted file mode 100644
index cec87cef76ca..000000000000

arch/arm/mach-kirkwood/tsx1x-common.h deleted +0 -0

deleted file mode 100644
index 7fa037361b55..000000000000

arch/arm/mm/Kconfig +1 -1

index eda0dd0ab97b..f06c6aad75e8 100644
@@ -854,7 +854,7 @@ config OUTER_CACHE_SYNC
 
 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

Signature · 1 line

2.0.1

Andrew Lunn

author

2014-07-10 21:36 UTC #2 lore raw

PATCH v2 2/12 ARM: Kirkwood: Remove kirkwood_defconfig

In reply to Andrew Lunn

This is no longer needed now that kirkwood lives inside mach-mvebu.

Signed-off-by Andrew Lunn <[email protected]>

---
 arch/arm/configs/kirkwood_defconfig | 181 ------------------------------------
 1 file changed, 181 deletions(-)
 delete mode 100644 arch/arm/configs/kirkwood_defconfig

arch/arm/configs/kirkwood_defconfig deleted +0 -0

deleted file mode 100644
index b9e480c10b10..000000000000

Signature · 1 line

2.0.1

Andrew Lunn

author

2014-07-10 21:36 UTC #3 lore raw

PATCH v2 3/12 ASoC: kirkwood: Remove unused drivers

In reply to Andrew Lunn

Both kirkwood-openrd and kirkwood-t5325 drivers have been replaced with DT based simple-card equivelents. So remove these drivers.

Signed-off-by Andrew Lunn <[email protected]>

Cc Mark Brown <[email protected]>

Cc alsa-devel at alsa-project.org

---
 sound/soc/kirkwood/Kconfig           |  17 -----
 sound/soc/kirkwood/Makefile          |   4 --
 sound/soc/kirkwood/kirkwood-openrd.c | 109 --------------------------------
 sound/soc/kirkwood/kirkwood-t5325.c  | 116 -----------------------------------
 4 files changed, 246 deletions(-)
 delete mode 100644 sound/soc/kirkwood/kirkwood-openrd.c
 delete mode 100644 sound/soc/kirkwood/kirkwood-t5325.c

sound/soc/kirkwood/Kconfig +0 ~~-17~~

index 06f4e8aa93ae..1f7c7ee3527a 100644
@@ -15,20 +15,3 @@ config SND_KIRKWOOD_SOC_ARMADA370_DB
 	  Say Y if you want to add support for SoC audio on
 	  the Armada 370 Development Board.
 
-config SND_KIRKWOOD_SOC_OPENRD
-	tristate "SoC Audio support for Kirkwood Openrd Client"
-	depends on SND_KIRKWOOD_SOC && (MACH_OPENRD_CLIENT || MACH_OPENRD_ULTIMATE || COMPILE_TEST)
-	depends on I2C
-	select SND_SOC_CS42L51
-	help
-	  Say Y if you want to add support for SoC audio on
-	  Openrd Client.
-
-config SND_KIRKWOOD_SOC_T5325
-	tristate "SoC Audio support for HP t5325"
-	depends on SND_KIRKWOOD_SOC && (MACH_T5325 || COMPILE_TEST) && I2C
-	select SND_SOC_ALC5623
-	help
-	  Say Y if you want to add support for SoC audio on
-	  the HP t5325 thin client.
-

sound/soc/kirkwood/Makefile +0 -4

index 7c1d8fe09e6b..c36b03d8006c 100644
@@ -2,10 +2,6 @@ snd-soc-kirkwood-objs := kirkwood-dma.o kirkwood-i2s.o
 
 obj-$(CONFIG_SND_KIRKWOOD_SOC) += snd-soc-kirkwood.o
 
-snd-soc-openrd-objs := kirkwood-openrd.o
-snd-soc-t5325-objs := kirkwood-t5325.o
 snd-soc-armada-370-db-objs := armada-370-db.o
 
 obj-$(CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB) += snd-soc-armada-370-db.o
-obj-$(CONFIG_SND_KIRKWOOD_SOC_OPENRD) += snd-soc-openrd.o
-obj-$(CONFIG_SND_KIRKWOOD_SOC_T5325) += snd-soc-t5325.o

sound/soc/kirkwood/kirkwood-openrd.c deleted +0 -0

deleted file mode 100644
index 65f2a5b9ec3b..000000000000

sound/soc/kirkwood/kirkwood-t5325.c deleted +0 -0

deleted file mode 100644
index 844b8415a011..000000000000

Signature · 1 line

2.0.1

Mark Brown

maintainer

2014-07-29 19:35 UTC #4 lore raw

Re: [PATCH v2 03/12] ASoC: kirkwood: Remove unused drivers

Quoted 2 lines · Andrew Lunn

Both kirkwood-openrd and kirkwood-t5325 drivers have been replaced with DT based simple-card equivelents. So remove these drivers.

Applied. Please send patches against current code, I needed to hand
apply this.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140729/926fc82c/attachment-0001.sig>

Andrew Lunn

author

2014-07-29 20:48 UTC #5 lore raw

Re: [PATCH v2 03/12] ASoC: kirkwood: Remove unused drivers

Quoted 6 lines · Mark Brown

Quoted 2 lines · Andrew Lunn
Both kirkwood-openrd and kirkwood-t5325 drivers have been replaced with DT based simple-card equivelents. So remove these drivers.
Applied. Please send patches against current code, I needed to hand apply this.

Hi Mark

By current do you mean asoc-next? That would not be very easy, since i'm patching a large number of subsystems here. I don't think the gpio, or the libata, or the led maintainer would be too happy if i based the patches on asoc-next! So i picked a plain -rcX kernel, something neutral to everybody.

Andrew

Mark Brown

maintainer

2014-07-30 12:11 UTC #6 lore raw

Re: [PATCH v2 03/12] ASoC: kirkwood: Remove unused drivers

Quoted 10 lines · Andrew Lunn

Quoted 2 lines · Mark Brown
Applied. Please send patches against current code, I needed to hand apply this.
By current do you mean asoc-next? That would not be very easy, since i'm patching a large number of subsystems here. I don't think the gpio, or the libata, or the led maintainer would be too happy if i based the patches on asoc-next! So i picked a plain -rcX kernel, something neutral to everybody.

Right, for something like this where the changes are supposed to be
applied in the individual trees rather than merged in -next can be a
reasonable basis. It's not ideal (and it's pretty unusual for it to
make any sense) but it'll mostly ensure that the patches can be picked
up with relative ease.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140730/af982549/attachment.sig>

Andrew Lunn

author

2014-07-10 21:36 UTC #7 lore raw

PATCH v2 4/12 ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency

In reply to Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. Remove ARCH_KIRKWOOD since ARCH_MVEBU is sufficient.

Signed-off-by Andrew Lunn <[email protected]>

Cc Mark Brown <[email protected]>

Cc alsa-devel at alsa-project.org

---
 sound/soc/kirkwood/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

sound/soc/kirkwood/Kconfig +1 -1

index 1f7c7ee3527a..132bb83f8e99 100644
@@ -1,6 +1,6 @@
 config SND_KIRKWOOD_SOC
 	tristate "SoC Audio for the Marvell Kirkwood and Dove chips"
-	depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU || MACH_KIRKWOOD || COMPILE_TEST
+	depends on ARCH_DOVE || ARCH_MVEBU || COMPILE_TEST
 	help
 	  Say Y or M if you want to add support for codecs attached to
 	  the Kirkwood I2S interface. You will also need to select the

Signature · 1 line

2.0.1

Mark Brown

maintainer

2014-07-29 19:35 UTC #8 lore raw

Re: [PATCH v2 04/12] ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency

Quoted 2 lines · Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. Remove ARCH_KIRKWOOD since ARCH_MVEBU is sufficient.

Applied, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140729/6d7e497c/attachment.sig>

Andrew Lunn

author

2014-07-10 21:36 UTC #9 lore raw

PATCH v2 5/12 cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency

In reply to Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. Use MACH_KIRKWOOD, which is set when kirkwood is built as part of mach-mvebu.

Signed-off-by Andrew Lunn <[email protected]>

Cc Daniel Lezcano <[email protected]>

Cc Rafael J. Wysocki <[email protected]>

Cc linux-pm at vger.kernel.org

---
 drivers/cpuidle/Kconfig.arm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/cpuidle/Kconfig.arm +1 -1

index b6d69e899f5d..dd9afb405766 100644
@@ -33,7 +33,7 @@ config ARM_HIGHBANK_CPUIDLE
 
 config ARM_KIRKWOOD_CPUIDLE
 	bool "CPU Idle Driver for Marvell Kirkwood SoCs"
-	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+	depends on MACH_KIRKWOOD
 	help
 	  This adds the CPU Idle driver for Marvell Kirkwood SoCs.

Signature · 1 line

2.0.1

Andrew Lunn

author

2014-07-10 21:36 UTC #10 lore raw

PATCH v2 6/12 ata: Remove ARCH_KIRKWOOD dependency

In reply to Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. ARCH_MVEBU is sufficient.

Signed-off-by Andrew Lunn <[email protected]>

Cc Tejun Heo <[email protected]>

Cc linux-ide at vger.kernel.org

---
 drivers/ata/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/ata/Kconfig +1 -1

index 7671dbac6015..4749aeb54bc1 100644
@@ -289,7 +289,7 @@ config SATA_HIGHBANK
 
 config SATA_MV
 	tristate "Marvell SATA support"
-	depends on PCI || ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \
+	depends on PCI || ARCH_DOVE || ARCH_MV78XX0 || \
 		   ARCH_MVEBU || ARCH_ORION5X || COMPILE_TEST
 	select GENERIC_PHY
 	help

Signature · 1 line

2.0.1

Andrew Lunn

author

2014-07-10 21:36 UTC #11 lore raw

PATCH v2 7/12 thermal: Remove ARCH_KIRKWOOD dependency

In reply to Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. Depend on MACH_KIRKWOOD, which will be set when kirkwood is built as part of ARCH_MVEBU.

Signed-off-by Andrew Lunn <[email protected]>

Cc Zhang Rui <[email protected]>

Cc linux-pm at vger.kernel.org

---
 drivers/thermal/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/thermal/Kconfig +1 -1

index f9a13867cb70..f2488607ee35 100644
@@ -143,7 +143,7 @@ config RCAR_THERMAL
 
 config KIRKWOOD_THERMAL
 	tristate "Temperature sensor on Marvell Kirkwood SoCs"
-	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+	depends on MACH_KIRKWOOD
 	depends on OF
 	help
 	  Support for the Kirkwood thermal sensor driver into the Linux thermal

Signature · 1 line

2.0.1

Andrew Lunn

author

2014-07-10 21:36 UTC #12 lore raw

PATCH v2 8/12 leds: Remove ARCH_KIRKWOOD dependency

In reply to Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. Use MACH_KIRKWOOD which will be set when kirkwood is built as part of mach-mvebu.

Signed-off-by Andrew Lunn <[email protected]>

Acked-by Bryan Wu <[email protected]>

Cc Richard Purdie <[email protected]>

Cc linux-leds at vger.kernel.org

---
 drivers/leds/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/leds/Kconfig +2 -2

index a1b044e7eaad..2d7c380f79ce 100644
@@ -411,7 +411,7 @@ config LEDS_MC13783
 config LEDS_NS2
 	tristate "LED support for Network Space v2 GPIO LEDs"
 	depends on LEDS_CLASS
-	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+	depends on MACH_KIRKWOOD
 	default y
 	help
 	  This option enable support for the dual-GPIO LED found on the

@@ -421,7 +421,7 @@ config LEDS_NS2
 config LEDS_NETXBIG
 	tristate "LED support for Big Network series LEDs"
 	depends on LEDS_CLASS
-	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+	depends on MACH_KIRKWOOD
 	default y
 	help
 	  This option enable support for LEDs found on the LaCie 2Big

Signature · 1 line

2.0.1

Andrew Lunn

author

2014-07-10 21:36 UTC #13 lore raw

PATCH v2 9/12 PCI: Remove ARCH_KIRKWOOD dependency

In reply to Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. ARCH_MVEBU is sufficient.

Signed-off-by Andrew Lunn <[email protected]>

Cc Bjorn Helgaas <[email protected]>

Cc linux-pci at vger.kernel.org

---
 drivers/pci/host/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/pci/host/Kconfig +1 -1

index 21df477be0c8..88f4862fa452 100644
@@ -3,7 +3,7 @@ menu "PCI host controller drivers"
 
 config PCI_MVEBU
 	bool "Marvell EBU PCIe controller"
-	depends on ARCH_MVEBU || ARCH_DOVE || ARCH_KIRKWOOD
+	depends on ARCH_MVEBU || ARCH_DOVE
 	depends on OF
 
 config PCIE_DW

Signature · 1 line

2.0.1

Bjorn Helgaas

maintainer

2014-07-22 18:27 UTC #14 lore raw

PATCH v2 9/12 PCI: Remove ARCH_KIRKWOOD dependency

Quoted 4 lines · Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. ARCH_MVEBU is sufficient.
Signed-off-by Andrew Lunn <[email protected]>

Applied with Jason's ack to pci/host-mvebu for v3.17, thanks!

Quoted 26 lines

Cc Bjorn Helgaas <[email protected]>

Cc linux-pci at vger.kernel.org

---
 drivers/pci/host/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/pci/host/Kconfig +1 -1

index 21df477be0c8..88f4862fa452 100644
@@ -3,7 +3,7 @@ menu "PCI host controller drivers"
 
 config PCI_MVEBU
 	bool "Marvell EBU PCIe controller"
-	depends on ARCH_MVEBU || ARCH_DOVE || ARCH_KIRKWOOD
+	depends on ARCH_MVEBU || ARCH_DOVE
 	depends on OF
 
 config PCIE_DW

Signature · 6 lines

2.0.1

--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Andrew Lunn

author

2014-07-10 21:36 UTC #15 lore raw

PATCH v2 10/12 phy: Remove ARCH_KIRKWOOD dependency

In reply to Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. Depend on MACH_KIRKWOOD, which will be set when these SoCs are built as part of mach-mvebv.

Signed-off-by Andrew Lunn <[email protected]>

Cc Kishon Vijay Abraham I <[email protected]>

---
 drivers/phy/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/phy/Kconfig +1 -1

index 16a2f067c242..d602b35e1779 100644
@@ -27,7 +27,7 @@ config PHY_EXYNOS_MIPI_VIDEO
 
 config PHY_MVEBU_SATA
 	def_bool y
-	depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE || MACH_KIRKWOOD
+	depends on ARCH_DOVE || MACH_DOVE || MACH_KIRKWOOD
 	depends on OF
 	select GENERIC_PHY

Signature · 1 line

2.0.1

Andrew Lunn

author

2014-07-10 21:36 UTC #16 lore raw

PATCH v2 11/12 rtc: Remove ARCH_KIRKWOOD dependency

In reply to Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. ARCH_MVEBU is sufficient.

Signed-off-by Andrew Lunn <[email protected]>

Cc Alessandro Zummo <[email protected]>

Cc rtc-linux at googlegroups.com

---
 drivers/rtc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/rtc/Kconfig +1 -1

index 0754f5c7cb3b..318cae5eab60 100644
@@ -1190,7 +1190,7 @@ config RTC_DRV_TX4939
 
 config RTC_DRV_MV
 	tristate "Marvell SoC RTC"
-	depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU
+	depends on ARCH_DOVE || ARCH_MVEBU
 	help
 	  If you say yes here you will get support for the in-chip RTC
 	  that can be found in some of Marvell's SoC devices, such as

Signature · 1 line

2.0.1

Andrew Lunn

author

2014-07-10 21:36 UTC #17 lore raw

PATCH v2 12/12 watchdog: Remove ARCH_KIRKWOOD dependency

In reply to Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. ARCH_MVEBU is sufficient.

Signed-off-by Andrew Lunn <[email protected]>

Cc Wim Van Sebroeck <[email protected]>

Cc linux-watchdog at vger.kernel.org

---
 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/watchdog/Kconfig +1 -1

index c845527b503a..a0bfb48a6747 100644
@@ -301,7 +301,7 @@ config DAVINCI_WATCHDOG
 
 config ORION_WATCHDOG
 	tristate "Orion watchdog"
-	depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU
+	depends on ARCH_ORION5X || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU
 	select WATCHDOG_CORE
 	help
 	  Say Y here if to include support for the watchdog timer

Signature · 1 line

2.0.1

Tejun Heo

2014-07-11 14:52 UTC #18 lore raw

In reply to Andrew Lunn

Quoted 7 lines · Andrew Lunn

This patchset removes arch/arm/mach-kirkwood. This SoCs is now supported in arch/arm/mach-mvebu using device tree.
V1 of this patchset also removed mach-dove. However it has been decided to leave it alone for a while to aid some developers get out of tree patches merged.

Quoted 7 lines

Change the dependencies for a number of drivers, either to use ARCH_MVEBU where the drivers are generic, or MACH_KIRKWOOD and where the drivers are specific to the SoC.
Once Jason Cooper has Acked these patches, we would prefer that individual subsystem maintainers take these patches through their own trees.

Please let me know when I can take the libata part.

Thanks.

Signature · 1 line

tejun

Jason Cooper

Acked-by on the v2 series

2014-07-13 21:59 UTC #19 lore raw

In reply to Andrew Lunn

All driver/sub-system maintainers:

Quoted 106 lines · Andrew Lunn

This patchset removes arch/arm/mach-kirkwood. This SoCs is now supported in arch/arm/mach-mvebu using device tree.

V1 of this patchset also removed mach-dove. However it has been decided to leave it alone for a while to aid some developers get out of tree patches merged.

Change the dependencies for a number of drivers, either to use ARCH_MVEBU where the drivers are generic, or MACH_KIRKWOOD and where the drivers are specific to the SoC.

Once Jason Cooper has Acked these patches, we would prefer that individual subsystem maintainers take these patches through their own trees.

Thanks
Andrew

 arch/arm/Kconfig                                  |  18 -
 arch/arm/Kconfig.debug                            |   6 +-
 arch/arm/Makefile                                 |   1 -
 arch/arm/boot/dts/Makefile                        |   5 +-
 arch/arm/configs/kirkwood_defconfig               | 181 ------
 arch/arm/mach-kirkwood/Kconfig                    | 111 ----
 arch/arm/mach-kirkwood/Makefile                   |  14 -
 arch/arm/mach-kirkwood/Makefile.boot              |   3 -
 arch/arm/mach-kirkwood/board-dt.c                 | 223 -------
 arch/arm/mach-kirkwood/common.c                   | 746 ----------------------
 arch/arm/mach-kirkwood/common.h                   |  74 ---
 arch/arm/mach-kirkwood/d2net_v2-setup.c           | 231 -------
 arch/arm/mach-kirkwood/include/mach/bridge-regs.h |  86 ---
 arch/arm/mach-kirkwood/include/mach/entry-macro.S |  34 -
 arch/arm/mach-kirkwood/include/mach/hardware.h    |  14 -
 arch/arm/mach-kirkwood/include/mach/irqs.h        |  65 --
 arch/arm/mach-kirkwood/include/mach/kirkwood.h    | 142 ----
 arch/arm/mach-kirkwood/include/mach/uncompress.h  |  46 --
 arch/arm/mach-kirkwood/irq.c                      |  82 ---
 arch/arm/mach-kirkwood/lacie_v2-common.c          | 114 ----
 arch/arm/mach-kirkwood/lacie_v2-common.h          |  16 -
 arch/arm/mach-kirkwood/mpp.c                      |  43 --
 arch/arm/mach-kirkwood/mpp.h                      | 348 ----------
 arch/arm/mach-kirkwood/netxbig_v2-setup.c         | 422 ------------
 arch/arm/mach-kirkwood/openrd-setup.c             | 255 --------
 arch/arm/mach-kirkwood/pcie.c                     | 296 ---------
 arch/arm/mach-kirkwood/pm.c                       |  76 ---
 arch/arm/mach-kirkwood/pm.h                       |  26 -
 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c      |  89 ---
 arch/arm/mach-kirkwood/rd88f6281-setup.c          | 128 ----
 arch/arm/mach-kirkwood/t5325-setup.c              | 216 -------
 arch/arm/mach-kirkwood/ts219-setup.c              | 142 ----
 arch/arm/mach-kirkwood/ts41x-setup.c              | 186 ------
 arch/arm/mach-kirkwood/tsx1x-common.c             | 113 ----
 arch/arm/mach-kirkwood/tsx1x-common.h             |   7 -
 arch/arm/mm/Kconfig                               |   2 +-
 drivers/ata/Kconfig                               |   2 +-
 drivers/cpuidle/Kconfig.arm                       |   2 +-
 drivers/leds/Kconfig                              |   4 +-
 drivers/pci/host/Kconfig                          |   2 +-
 drivers/phy/Kconfig                               |   2 +-
 drivers/rtc/Kconfig                               |   2 +-
 drivers/thermal/Kconfig                           |   2 +-
 drivers/watchdog/Kconfig                          |   2 +-
 sound/soc/kirkwood/Kconfig                        |  19 +-
 sound/soc/kirkwood/Makefile                       |   4 -
 sound/soc/kirkwood/kirkwood-openrd.c              | 109 ----
 sound/soc/kirkwood/kirkwood-t5325.c               | 116 ----
 48 files changed, 14 insertions(+), 4813 deletions(-)
 delete mode 100644 arch/arm/configs/kirkwood_defconfig
 delete mode 100644 arch/arm/mach-kirkwood/Kconfig
 delete mode 100644 arch/arm/mach-kirkwood/Makefile
 delete mode 100644 arch/arm/mach-kirkwood/Makefile.boot
 delete mode 100644 arch/arm/mach-kirkwood/board-dt.c
 delete mode 100644 arch/arm/mach-kirkwood/common.c
 delete mode 100644 arch/arm/mach-kirkwood/common.h
 delete mode 100644 arch/arm/mach-kirkwood/d2net_v2-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/bridge-regs.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/hardware.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/kirkwood.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-kirkwood/irq.c
 delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.c
 delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.h
 delete mode 100644 arch/arm/mach-kirkwood/mpp.c
 delete mode 100644 arch/arm/mach-kirkwood/mpp.h
 delete mode 100644 arch/arm/mach-kirkwood/netxbig_v2-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/openrd-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/pcie.c
 delete mode 100644 arch/arm/mach-kirkwood/pm.c
 delete mode 100644 arch/arm/mach-kirkwood/pm.h
 delete mode 100644 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c

Quoted 8 lines

 delete mode 100644 arch/arm/mach-kirkwood/rd88f6281-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/t5325-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/ts219-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/ts41x-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.c
 delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.h
 delete mode 100644 sound/soc/kirkwood/kirkwood-openrd.c
 delete mode 100644 sound/soc/kirkwood/kirkwood-t5325.c

For all the driver changes:

Acked-by Jason Cooper <[email protected]>

thx,

Jason.