* [PATCH v2 00/12] Remove mach-kirkwood
@ 2014-07-10 21:36 Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 05/12] cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency Andrew Lunn
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Andrew Lunn @ 2014-07-10 21:36 UTC (permalink / raw)
To: Jason Cooper
Cc: Andrew Lunn, alsa-devel, linux-pci, linux-ide, Wim Van Sebroeck,
linux-leds, Daniel Lezcano, Kishon Vijay Abraham I, Zhang Rui,
linux-watchdog, rtc-linux, linux-pm, Bryan Wu,
Sebastian Hesselbarth, Mark Brown, Gregory Clement, linux ARM,
Alessandro Zummo, Rafael J. Wysocki, Richard Purdie, Tejun Heo,
Bjorn Helgaas
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@alsa-project.org
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: linux-pm@vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>
Cc: linux-ide@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@vger.kernel.org
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: rtc-linux@googlegroups.com
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: linux-watchdog@vger.kernel.org
^ permalink raw reply [flat|nested] 5+ 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
@ 2014-07-10 21:36 ` Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 07/12] thermal: " Andrew Lunn
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Andrew Lunn @ 2014-07-10 21:36 UTC (permalink / raw)
To: Jason Cooper
Cc: linux ARM, Gregory Clement, Sebastian Hesselbarth, Andrew Lunn,
Daniel Lezcano, Rafael J. Wysocki, linux-pm
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@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] 5+ 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
2014-07-10 21:36 ` [PATCH v2 05/12] cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency 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
3 siblings, 0 replies; 5+ messages in thread
From: Andrew Lunn @ 2014-07-10 21:36 UTC (permalink / raw)
To: Jason Cooper
Cc: linux ARM, Gregory Clement, Sebastian Hesselbarth, Andrew Lunn,
Zhang Rui, linux-pm
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@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] 5+ messages in thread
* Re: [PATCH v2 00/12] Remove mach-kirkwood
2014-07-10 21:36 [PATCH v2 00/12] Remove mach-kirkwood Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 05/12] cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 07/12] thermal: " Andrew Lunn
@ 2014-07-11 14:52 ` Tejun Heo
2014-07-13 21:59 ` Jason Cooper
3 siblings, 0 replies; 5+ messages in thread
From: Tejun Heo @ 2014-07-11 14:52 UTC (permalink / raw)
To: Andrew Lunn
Cc: Jason Cooper, linux ARM, Gregory Clement, Sebastian Hesselbarth,
Mark Brown, alsa-devel, Daniel Lezcano, Rafael J. Wysocki,
linux-pm, linux-ide, Zhang Rui, Bryan Wu, Richard Purdie,
linux-leds, Bjorn Helgaas, linux-pci, Kishon Vijay Abraham I,
Alessandro Zummo, rtc-linux, Wim Van Sebroeck, linux-watchdog
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] 5+ messages in thread
* Re: [PATCH v2 00/12] Remove mach-kirkwood
2014-07-10 21:36 [PATCH v2 00/12] Remove mach-kirkwood Andrew Lunn
` (2 preceding siblings ...)
2014-07-11 14:52 ` [PATCH v2 00/12] Remove mach-kirkwood Tejun Heo
@ 2014-07-13 21:59 ` Jason Cooper
3 siblings, 0 replies; 5+ messages in thread
From: Jason Cooper @ 2014-07-13 21:59 UTC (permalink / raw)
To: Andrew Lunn
Cc: linux-ide, Alessandro Zummo, alsa-devel, Bryan Wu, linux-watchdog,
rtc-linux, linux-pm, Rafael J. Wysocki, Daniel Lezcano,
Sebastian Hesselbarth, Kishon Vijay Abraham I, Tejun Heo,
Wim Van Sebroeck, Mark Brown, Richard Purdie, linux-leds,
linux-pci, Gregory Clement, Zhang Rui, Bjorn Helgaas, linux ARM
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] 5+ messages in thread
end of thread, other threads:[~2014-07-13 21:59 UTC | newest]
Thread overview: 5+ 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 05/12] cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency Andrew Lunn
2014-07-10 21:36 ` [PATCH v2 07/12] thermal: " 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).