* [PATCH v2 00/12] Remove mach-kirkwood
@ 2014-07-10 21:36 Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 01/12] ARM: Kirkwood: " Andrew Lunn
` (13 more replies)
0 siblings, 14 replies; 20+ messages in thread
From: Andrew Lunn @ 2014-07-10 21:36 UTC (permalink / raw)
To: linux-arm-kernel
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
--
2.0.1
Cc: Mark Brown <broonie@kernel.org>
Cc: alsa-devel at alsa-project.org
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: linux-pm at vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>
Cc: linux-ide at vger.kernel.org
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Bryan Wu <cooloney@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: linux-leds at vger.kernel.org
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci at vger.kernel.org
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: rtc-linux at googlegroups.com
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: linux-watchdog at vger.kernel.org
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v2 01/12] ARM: Kirkwood: Remove mach-kirkwood
2014-07-10 21:36 [PATCH v2 00/12] Remove mach-kirkwood Andrew Lunn
@ 2014-07-10 21:36 ` Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 02/12] ARM: Kirkwood: Remove kirkwood_defconfig Andrew Lunn
` (12 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: Andrew Lunn @ 2014-07-10 21:36 UTC (permalink / raw)
To: linux-arm-kernel
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 <andrew@lunn.ch>
---
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 87b63fde06d7..b20251ad7aa5 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 8f90595069a1..2dfaf8f20c21 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -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
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 6721fab13734..433a6f1b218f 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -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
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 5986ff63b901..025350ca96aa 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
deleted file mode 100644
index df4b26340ae4..000000000000
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
deleted file mode 100644
index 3a72c5c6e747..000000000000
diff --git a/arch/arm/mach-kirkwood/Makefile.boot b/arch/arm/mach-kirkwood/Makefile.boot
deleted file mode 100644
index 760a0efe7580..000000000000
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
deleted file mode 100644
index ff18ff20f71f..000000000000
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
deleted file mode 100644
index 255f33a3903c..000000000000
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
deleted file mode 100644
index 832a4e2ab8d7..000000000000
diff --git a/arch/arm/mach-kirkwood/d2net_v2-setup.c b/arch/arm/mach-kirkwood/d2net_v2-setup.c
deleted file mode 100644
index 453418063c1e..000000000000
diff --git a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h
deleted file mode 100644
index 1c37082c8b39..000000000000
diff --git a/arch/arm/mach-kirkwood/include/mach/entry-macro.S b/arch/arm/mach-kirkwood/include/mach/entry-macro.S
deleted file mode 100644
index 82db29f7af8f..000000000000
diff --git a/arch/arm/mach-kirkwood/include/mach/hardware.h b/arch/arm/mach-kirkwood/include/mach/hardware.h
deleted file mode 100644
index 742b74f43e41..000000000000
diff --git a/arch/arm/mach-kirkwood/include/mach/irqs.h b/arch/arm/mach-kirkwood/include/mach/irqs.h
deleted file mode 100644
index 2bf8161e3b51..000000000000
diff --git a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h
deleted file mode 100644
index 92976cef3910..000000000000
diff --git a/arch/arm/mach-kirkwood/include/mach/uncompress.h b/arch/arm/mach-kirkwood/include/mach/uncompress.h
deleted file mode 100644
index 5bca5534021f..000000000000
diff --git a/arch/arm/mach-kirkwood/irq.c b/arch/arm/mach-kirkwood/irq.c
deleted file mode 100644
index 2c47a8ad0e27..000000000000
diff --git a/arch/arm/mach-kirkwood/lacie_v2-common.c b/arch/arm/mach-kirkwood/lacie_v2-common.c
deleted file mode 100644
index 8e3e4331c380..000000000000
diff --git a/arch/arm/mach-kirkwood/lacie_v2-common.h b/arch/arm/mach-kirkwood/lacie_v2-common.h
deleted file mode 100644
index fc64f578536e..000000000000
diff --git a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c
deleted file mode 100644
index e96fd71abd76..000000000000
diff --git a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
deleted file mode 100644
index d5a0d1da2e0e..000000000000
diff --git a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/netxbig_v2-setup.c
deleted file mode 100644
index 913d032cdb19..000000000000
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c
deleted file mode 100644
index e5cf84103583..000000000000
diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c
deleted file mode 100644
index 12d86f39f380..000000000000
diff --git a/arch/arm/mach-kirkwood/pm.c b/arch/arm/mach-kirkwood/pm.c
deleted file mode 100644
index 8e5e0329d04c..000000000000
diff --git a/arch/arm/mach-kirkwood/pm.h b/arch/arm/mach-kirkwood/pm.h
deleted file mode 100644
index 21e7530f368b..000000000000
diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
deleted file mode 100644
index e4fd3129d36f..000000000000
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
deleted file mode 100644
index 5154bd2a3ad3..000000000000
diff --git a/arch/arm/mach-kirkwood/t5325-setup.c b/arch/arm/mach-kirkwood/t5325-setup.c
deleted file mode 100644
index 8736f8c97518..000000000000
diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c
deleted file mode 100644
index e1267d6b468f..000000000000
diff --git a/arch/arm/mach-kirkwood/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-setup.c
deleted file mode 100644
index 81d585806b2f..000000000000
diff --git a/arch/arm/mach-kirkwood/tsx1x-common.c b/arch/arm/mach-kirkwood/tsx1x-common.c
deleted file mode 100644
index cec87cef76ca..000000000000
diff --git a/arch/arm/mach-kirkwood/tsx1x-common.h b/arch/arm/mach-kirkwood/tsx1x-common.h
deleted file mode 100644
index 7fa037361b55..000000000000
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index eda0dd0ab97b..f06c6aad75e8 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -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
--
2.0.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v2 02/12] ARM: Kirkwood: Remove kirkwood_defconfig
2014-07-10 21:36 [PATCH v2 00/12] Remove mach-kirkwood Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 01/12] ARM: Kirkwood: " Andrew Lunn
@ 2014-07-10 21:36 ` Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 03/12] ASoC: kirkwood: Remove unused drivers Andrew Lunn
` (11 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: Andrew Lunn @ 2014-07-10 21:36 UTC (permalink / raw)
To: linux-arm-kernel
This is no longer needed now that kirkwood lives inside mach-mvebu.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/configs/kirkwood_defconfig | 181 ------------------------------------
1 file changed, 181 deletions(-)
delete mode 100644 arch/arm/configs/kirkwood_defconfig
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
deleted file mode 100644
index b9e480c10b10..000000000000
--
2.0.1
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v2 03/12] ASoC: kirkwood: Remove unused drivers
2014-07-10 21:36 [PATCH v2 00/12] Remove mach-kirkwood Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 01/12] ARM: Kirkwood: " Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 02/12] ARM: Kirkwood: Remove kirkwood_defconfig Andrew Lunn
@ 2014-07-10 21:36 ` Andrew Lunn
2014-07-29 19:35 ` Mark Brown
2014-07-10 21:36 ` [PATCH v2 04/12] ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency Andrew Lunn
` (10 subsequent siblings)
13 siblings, 1 reply; 20+ messages in thread
From: Andrew Lunn @ 2014-07-10 21:36 UTC (permalink / raw)
To: linux-arm-kernel
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 <andrew@lunn.ch>
Cc: Mark Brown <broonie@kernel.org>
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
diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig
index 06f4e8aa93ae..1f7c7ee3527a 100644
--- a/sound/soc/kirkwood/Kconfig
+++ b/sound/soc/kirkwood/Kconfig
@@ -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.
-
diff --git a/sound/soc/kirkwood/Makefile b/sound/soc/kirkwood/Makefile
index 7c1d8fe09e6b..c36b03d8006c 100644
--- a/sound/soc/kirkwood/Makefile
+++ b/sound/soc/kirkwood/Makefile
@@ -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
diff --git a/sound/soc/kirkwood/kirkwood-openrd.c b/sound/soc/kirkwood/kirkwood-openrd.c
deleted file mode 100644
index 65f2a5b9ec3b..000000000000
diff --git a/sound/soc/kirkwood/kirkwood-t5325.c b/sound/soc/kirkwood/kirkwood-t5325.c
deleted file mode 100644
index 844b8415a011..000000000000
--
2.0.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v2 04/12] ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency
2014-07-10 21:36 [PATCH v2 00/12] Remove mach-kirkwood Andrew Lunn
` (2 preceding siblings ...)
2014-07-10 21:36 ` [PATCH v2 03/12] ASoC: kirkwood: Remove unused drivers Andrew Lunn
@ 2014-07-10 21:36 ` Andrew Lunn
2014-07-29 19:35 ` Mark Brown
2014-07-10 21:36 ` [PATCH v2 05/12] cpuidle: " Andrew Lunn
` (9 subsequent siblings)
13 siblings, 1 reply; 20+ messages in thread
From: Andrew Lunn @ 2014-07-10 21:36 UTC (permalink / raw)
To: linux-arm-kernel
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 <andrew@lunn.ch>
Cc: Mark Brown <broonie@kernel.org>
Cc: alsa-devel at alsa-project.org
---
sound/soc/kirkwood/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig
index 1f7c7ee3527a..132bb83f8e99 100644
--- a/sound/soc/kirkwood/Kconfig
+++ b/sound/soc/kirkwood/Kconfig
@@ -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
--
2.0.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v2 05/12] cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency
2014-07-10 21:36 [PATCH v2 00/12] Remove mach-kirkwood Andrew Lunn
` (3 preceding siblings ...)
2014-07-10 21:36 ` [PATCH v2 04/12] ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency Andrew Lunn
@ 2014-07-10 21:36 ` Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 06/12] ata: " Andrew Lunn
` (8 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: Andrew Lunn @ 2014-07-10 21:36 UTC (permalink / raw)
To: linux-arm-kernel
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 <andrew@lunn.ch>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: linux-pm at vger.kernel.org
---
drivers/cpuidle/Kconfig.arm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm
index b6d69e899f5d..dd9afb405766 100644
--- a/drivers/cpuidle/Kconfig.arm
+++ b/drivers/cpuidle/Kconfig.arm
@@ -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.
--
2.0.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v2 06/12] ata: Remove ARCH_KIRKWOOD dependency
2014-07-10 21:36 [PATCH v2 00/12] Remove mach-kirkwood Andrew Lunn
` (4 preceding siblings ...)
2014-07-10 21:36 ` [PATCH v2 05/12] cpuidle: " Andrew Lunn
@ 2014-07-10 21:36 ` Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 07/12] thermal: " Andrew Lunn
` (7 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: Andrew Lunn @ 2014-07-10 21:36 UTC (permalink / raw)
To: linux-arm-kernel
mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
ARCH_MVEBU is sufficient.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: Tejun Heo <tj@kernel.org>
Cc: linux-ide at vger.kernel.org
---
drivers/ata/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 7671dbac6015..4749aeb54bc1 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -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
--
2.0.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v2 07/12] thermal: Remove ARCH_KIRKWOOD dependency
2014-07-10 21:36 [PATCH v2 00/12] Remove mach-kirkwood Andrew Lunn
` (5 preceding siblings ...)
2014-07-10 21:36 ` [PATCH v2 06/12] ata: " Andrew Lunn
@ 2014-07-10 21:36 ` Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 08/12] leds: " Andrew Lunn
` (6 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: Andrew Lunn @ 2014-07-10 21:36 UTC (permalink / raw)
To: linux-arm-kernel
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 <andrew@lunn.ch>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm at vger.kernel.org
---
drivers/thermal/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index f9a13867cb70..f2488607ee35 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -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
--
2.0.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v2 08/12] leds: Remove ARCH_KIRKWOOD dependency
2014-07-10 21:36 [PATCH v2 00/12] Remove mach-kirkwood Andrew Lunn
` (6 preceding siblings ...)
2014-07-10 21:36 ` [PATCH v2 07/12] thermal: " Andrew Lunn
@ 2014-07-10 21:36 ` Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 09/12] PCI: " Andrew Lunn
` (5 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: Andrew Lunn @ 2014-07-10 21:36 UTC (permalink / raw)
To: linux-arm-kernel
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 <andrew@lunn.ch>
Acked-by: Bryan Wu <cooloney@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: linux-leds at vger.kernel.org
---
drivers/leds/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index a1b044e7eaad..2d7c380f79ce 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -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
--
2.0.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v2 09/12] PCI: Remove ARCH_KIRKWOOD dependency
2014-07-10 21:36 [PATCH v2 00/12] Remove mach-kirkwood Andrew Lunn
` (7 preceding siblings ...)
2014-07-10 21:36 ` [PATCH v2 08/12] leds: " Andrew Lunn
@ 2014-07-10 21:36 ` Andrew Lunn
2014-07-22 18:27 ` Bjorn Helgaas
2014-07-10 21:36 ` [PATCH v2 10/12] phy: " Andrew Lunn
` (4 subsequent siblings)
13 siblings, 1 reply; 20+ messages in thread
From: Andrew Lunn @ 2014-07-10 21:36 UTC (permalink / raw)
To: linux-arm-kernel
mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
ARCH_MVEBU is sufficient.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci at vger.kernel.org
---
drivers/pci/host/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index 21df477be0c8..88f4862fa452 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -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
--
2.0.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v2 10/12] phy: Remove ARCH_KIRKWOOD dependency
2014-07-10 21:36 [PATCH v2 00/12] Remove mach-kirkwood Andrew Lunn
` (8 preceding siblings ...)
2014-07-10 21:36 ` [PATCH v2 09/12] PCI: " Andrew Lunn
@ 2014-07-10 21:36 ` Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 11/12] rtc: " Andrew Lunn
` (3 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: Andrew Lunn @ 2014-07-10 21:36 UTC (permalink / raw)
To: linux-arm-kernel
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 <andrew@lunn.ch>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
---
drivers/phy/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 16a2f067c242..d602b35e1779 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -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
--
2.0.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v2 11/12] rtc: Remove ARCH_KIRKWOOD dependency
2014-07-10 21:36 [PATCH v2 00/12] Remove mach-kirkwood Andrew Lunn
` (9 preceding siblings ...)
2014-07-10 21:36 ` [PATCH v2 10/12] phy: " Andrew Lunn
@ 2014-07-10 21:36 ` Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 12/12] watchdog: " Andrew Lunn
` (2 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: Andrew Lunn @ 2014-07-10 21:36 UTC (permalink / raw)
To: linux-arm-kernel
mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
ARCH_MVEBU is sufficient.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: rtc-linux at googlegroups.com
---
drivers/rtc/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 0754f5c7cb3b..318cae5eab60 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -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
--
2.0.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v2 12/12] watchdog: Remove ARCH_KIRKWOOD dependency
2014-07-10 21:36 [PATCH v2 00/12] Remove mach-kirkwood Andrew Lunn
` (10 preceding siblings ...)
2014-07-10 21:36 ` [PATCH v2 11/12] rtc: " Andrew Lunn
@ 2014-07-10 21:36 ` Andrew Lunn
2014-07-11 14:52 ` [PATCH v2 00/12] Remove mach-kirkwood Tejun Heo
2014-07-13 21:59 ` Jason Cooper
13 siblings, 0 replies; 20+ messages in thread
From: Andrew Lunn @ 2014-07-10 21:36 UTC (permalink / raw)
To: linux-arm-kernel
mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
ARCH_MVEBU is sufficient.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: linux-watchdog at vger.kernel.org
---
drivers/watchdog/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index c845527b503a..a0bfb48a6747 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -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
--
2.0.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v2 00/12] Remove mach-kirkwood
2014-07-10 21:36 [PATCH v2 00/12] Remove mach-kirkwood Andrew Lunn
` (11 preceding siblings ...)
2014-07-10 21:36 ` [PATCH v2 12/12] watchdog: " Andrew Lunn
@ 2014-07-11 14:52 ` Tejun Heo
2014-07-13 21:59 ` Jason Cooper
13 siblings, 0 replies; 20+ messages in thread
From: Tejun Heo @ 2014-07-11 14:52 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 10, 2014 at 11:36:20PM +0200, Andrew Lunn wrote:
> 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.
Please let me know when I can take the libata part.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v2 00/12] Remove mach-kirkwood
2014-07-10 21:36 [PATCH v2 00/12] Remove mach-kirkwood Andrew Lunn
` (12 preceding siblings ...)
2014-07-11 14:52 ` [PATCH v2 00/12] Remove mach-kirkwood Tejun Heo
@ 2014-07-13 21:59 ` Jason Cooper
13 siblings, 0 replies; 20+ messages in thread
From: Jason Cooper @ 2014-07-13 21:59 UTC (permalink / raw)
To: linux-arm-kernel
All driver/sub-system maintainers:
On Thu, Jul 10, 2014 at 11:36:20PM +0200, Andrew Lunn wrote:
> 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
For all the driver changes:
Acked-by: Jason Cooper <jason@lakedaemon.net>
thx,
Jason.
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v2 09/12] PCI: Remove ARCH_KIRKWOOD dependency
2014-07-10 21:36 ` [PATCH v2 09/12] PCI: " Andrew Lunn
@ 2014-07-22 18:27 ` Bjorn Helgaas
0 siblings, 0 replies; 20+ messages in thread
From: Bjorn Helgaas @ 2014-07-22 18:27 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 10, 2014 at 11:36:29PM +0200, Andrew Lunn wrote:
> mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
> ARCH_MVEBU is sufficient.
>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Applied with Jason's ack to pci/host-mvebu for v3.17, thanks!
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: linux-pci at vger.kernel.org
> ---
> drivers/pci/host/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
> index 21df477be0c8..88f4862fa452 100644
> --- a/drivers/pci/host/Kconfig
> +++ b/drivers/pci/host/Kconfig
> @@ -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
> --
> 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
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v2 03/12] ASoC: kirkwood: Remove unused drivers
2014-07-10 21:36 ` [PATCH v2 03/12] ASoC: kirkwood: Remove unused drivers Andrew Lunn
@ 2014-07-29 19:35 ` Mark Brown
2014-07-29 20:48 ` Andrew Lunn
0 siblings, 1 reply; 20+ messages in thread
From: Mark Brown @ 2014-07-29 19:35 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 10, 2014 at 11:36:23PM +0200, Andrew Lunn wrote:
> 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>
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v2 04/12] ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency
2014-07-10 21:36 ` [PATCH v2 04/12] ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency Andrew Lunn
@ 2014-07-29 19:35 ` Mark Brown
0 siblings, 0 replies; 20+ messages in thread
From: Mark Brown @ 2014-07-29 19:35 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 10, 2014 at 11:36:24PM +0200, Andrew Lunn wrote:
> 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>
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v2 03/12] ASoC: kirkwood: Remove unused drivers
2014-07-29 19:35 ` Mark Brown
@ 2014-07-29 20:48 ` Andrew Lunn
2014-07-30 12:11 ` Mark Brown
0 siblings, 1 reply; 20+ messages in thread
From: Andrew Lunn @ 2014-07-29 20:48 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 29, 2014 at 08:35:09PM +0100, Mark Brown wrote:
> On Thu, Jul 10, 2014 at 11:36:23PM +0200, Andrew Lunn wrote:
> > 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
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v2 03/12] ASoC: kirkwood: Remove unused drivers
2014-07-29 20:48 ` Andrew Lunn
@ 2014-07-30 12:11 ` Mark Brown
0 siblings, 0 replies; 20+ messages in thread
From: Mark Brown @ 2014-07-30 12:11 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 29, 2014 at 10:48:53PM +0200, Andrew Lunn wrote:
> On Tue, Jul 29, 2014 at 08:35:09PM +0100, Mark Brown wrote:
> > 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>
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2014-07-30 12:11 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-10 21:36 [PATCH v2 00/12] Remove mach-kirkwood Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 01/12] ARM: Kirkwood: " Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 02/12] ARM: Kirkwood: Remove kirkwood_defconfig Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 03/12] ASoC: kirkwood: Remove unused drivers Andrew Lunn
2014-07-29 19:35 ` Mark Brown
2014-07-29 20:48 ` Andrew Lunn
2014-07-30 12:11 ` Mark Brown
2014-07-10 21:36 ` [PATCH v2 04/12] ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency Andrew Lunn
2014-07-29 19:35 ` Mark Brown
2014-07-10 21:36 ` [PATCH v2 05/12] cpuidle: " Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 06/12] ata: " Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 07/12] thermal: " Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 08/12] leds: " Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 09/12] PCI: " Andrew Lunn
2014-07-22 18:27 ` Bjorn Helgaas
2014-07-10 21:36 ` [PATCH v2 10/12] phy: " Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 11/12] rtc: " Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 12/12] watchdog: " Andrew Lunn
2014-07-11 14:52 ` [PATCH v2 00/12] Remove mach-kirkwood Tejun Heo
2014-07-13 21:59 ` Jason Cooper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).