[alsa-devel] [PATCH v2 00/12] 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
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@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
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.
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
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.
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@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
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.
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.
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.
participants (4)
-
Andrew Lunn -
Jason Cooper -
Mark Brown -
Tejun Heo