| Message ID | 1405028192-9623-4-git-send-email-andrew@lunn.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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.
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
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/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