* [PATCH 00/17] ARM: remove old board files
@ 2022-10-19 14:40 Arnd Bergmann
[not found] ` <20221019150410.3851944-1-arnd@kernel.org>
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2022-10-19 14:40 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Andrew Lunn, Ulf Hansson, linux-usb, Tony Lindgren, Linus Walleij,
linux-fbdev, dri-devel, Krzysztof Kozlowski, linux-i2c,
Helge Deller, linux-spi, Lennert Buytenhek, linux-omap,
Aaro Koskinen, Gregory Clement, Lee Jones, Janusz Krzysztofik,
Russell King, Alan Stern, Sergey Lapin, Guenter Roeck,
Sebastian Hesselbarth, linux-watchdog, Arnd Bergmann,
Dan Williams, Hubert Feurstein, linux-gpio, Mark Brown,
Krzysztof Halasa, Takashi Iwai, Wim Van Sebroeck,
Alexander Sverdlin, Bin Liu, Felipe Balbi, Paul Walmsley,
Greg Kroah-Hartman, Kevin Hilman, linux-mmc, Liam Girdwood,
linux-kernel, Hartley Sweeten, Vinod Koul, dmaengine, alsa-devel,
Pali Rohár, Bartosz Golaszewski
From: Arnd Bergmann <arnd@arndb.de>
This is the first part of the removal of old board files, addressing
all the easy cases:
cns3xxx and iop32x get removed completely, including a handful of device
driversm while ep93xx, dove, mv78xx0, orion, footbridge and omap1 all
keep basic platform support but drop support for all boards that have
no known users.
There are seven patches for other subsystems in this series. It would
be helpful to get everything merged in the same release if there are no
objections, but I don't care if I include them in the soc tree with an
Ack from the subsystem maintainers or the patches are applied directly
into the subsystem trees.
Arnd Bergmann (17):
ARM: at91: remove stale MAINTAINER file entries
ARM: cns3xxx: remove entire platform
mmc: remove cns3xxx driver
ARM: ep93xx: remove old board files
ASoC: remove unused ep93xx files
ARM: mv78xx0: un-deprecate Terastation WXL
ARM: orion: remove unused board files
ARM: orion5x: remove dsa_chip_data references
ARM: iop32x: remove the platform
dmaengine: remove iop-adma driver
gpio: remove iop driver
ARM: footbridge: remove CATS
ARM: omap1: remove unused board files
ARM: omap1: remove dead code
fbdev: omapfb: remove unused board support
spi: remove omap 100K driver
mfd: remove htc-i2cpld driver
CC: Russell King <linux@armlinux.org.uk>
CC: Aaro Koskinen <aaro.koskinen@iki.fi>
CC: Janusz Krzysztofik <jmkrzyszt@gmail.com>
CC: Tony Lindgren <tony@atomide.com>
CC: Andrew Lunn <andrew@lunn.ch>
CC: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
CC: Gregory Clement <gregory.clement@bootlin.com>
CC: Hartley Sweeten <hsweeten@visionengravers.com>
CC: Alexander Sverdlin <alexander.sverdlin@gmail.com>
CC: Paul Walmsley <paul@pwsan.com>
CC: Kevin Hilman <khilman@kernel.org>
CC: Vinod Koul <vkoul@kernel.org>
CC: Linus Walleij <linus.walleij@linaro.org>
CC: Bartosz Golaszewski <brgl@bgdev.pl>
CC: Lee Jones <lee@kernel.org>
CC: Ulf Hansson <ulf.hansson@linaro.org>
CC: Mark Brown <broonie@kernel.org>
CC: Felipe Balbi <balbi@kernel.org>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Alan Stern <stern@rowland.harvard.edu>
CC: Bin Liu <b-liu@ti.com>
CC: Helge Deller <deller@gmx.de>
CC: Wim Van Sebroeck <wim@linux-watchdog.org>
CC: Guenter Roeck <linux@roeck-us.net>
CC: Liam Girdwood <lgirdwood@gmail.com>
CC: Jaroslav Kysela <perex@perex.cz>
CC: Takashi Iwai <tiwai@suse.com>
Cc: Hubert Feurstein <hubert.feurstein@contec.at>
Cc: Krzysztof Halasa <khalasa@piap.pl>
Cc: Lennert Buytenhek <kernel@wantstofly.org>
Cc: Sergey Lapin <slapin@ossfans.org>
CC: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
CC: Dan Williams <dan.j.williams@intel.com>
CC: "Pali Rohár" <pali@kernel.org>
CC: linux-kernel@vger.kernel.org
CC: linux-arm-kernel@lists.infradead.org
CC: linux-omap@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: dmaengine@vger.kernel.org
CC: linux-gpio@vger.kernel.org
CC: linux-i2c@vger.kernel.org
CC: linux-mmc@vger.kernel.org
CC: linux-spi@vger.kernel.org
CC: linux-fbdev@vger.kernel.org
CC: dri-devel@lists.freedesktop.org
CC: linux-watchdog@vger.kernel.org
CC: alsa-devel@alsa-project.org
MAINTAINERS | 57 -
arch/arm/Kconfig | 6 +-
arch/arm/Kconfig.debug | 52 +-
arch/arm/Makefile | 2 -
arch/arm/boot/compressed/misc-ep93xx.h | 13 +-
arch/arm/configs/cns3420vb_defconfig | 63 -
arch/arm/configs/iop32x_defconfig | 126 --
arch/arm/configs/mv78xx0_defconfig | 3 -
arch/arm/configs/omap1_defconfig | 2 -
arch/arm/kernel/entry-common.S | 15 -
arch/arm/kernel/head.S | 2 +-
arch/arm/mach-cns3xxx/Kconfig | 21 -
arch/arm/mach-cns3xxx/Makefile | 6 -
arch/arm/mach-cns3xxx/cns3420vb.c | 252 ---
arch/arm/mach-cns3xxx/cns3xxx.h | 593 -------
arch/arm/mach-cns3xxx/core.c | 410 -----
arch/arm/mach-cns3xxx/core.h | 32 -
arch/arm/mach-cns3xxx/devices.c | 108 --
arch/arm/mach-cns3xxx/devices.h | 17 -
arch/arm/mach-cns3xxx/pcie.c | 290 ----
arch/arm/mach-cns3xxx/pm.c | 120 --
arch/arm/mach-cns3xxx/pm.h | 20 -
arch/arm/mach-dove/Kconfig | 8 -
arch/arm/mach-dove/Makefile | 1 -
arch/arm/mach-dove/dove-db-setup.c | 101 --
arch/arm/mach-ep93xx/Kconfig | 63 -
arch/arm/mach-ep93xx/Makefile | 5 -
arch/arm/mach-ep93xx/adssphere.c | 41 -
arch/arm/mach-ep93xx/gesbc9312.c | 41 -
arch/arm/mach-ep93xx/micro9.c | 125 --
arch/arm/mach-ep93xx/simone.c | 128 --
arch/arm/mach-ep93xx/snappercl15.c | 162 --
arch/arm/mach-footbridge/Kconfig | 12 -
arch/arm/mach-footbridge/Makefile | 2 -
arch/arm/mach-footbridge/cats-hw.c | 98 --
arch/arm/mach-footbridge/cats-pci.c | 64 -
arch/arm/mach-footbridge/common.c | 3 -
arch/arm/mach-iop32x/Kconfig | 54 -
arch/arm/mach-iop32x/Makefile | 20 -
arch/arm/mach-iop32x/adma.c | 163 --
arch/arm/mach-iop32x/cp6.c | 48 -
arch/arm/mach-iop32x/em7210.c | 232 ---
arch/arm/mach-iop32x/glantank.c | 214 ---
arch/arm/mach-iop32x/glantank.h | 12 -
arch/arm/mach-iop32x/gpio-iop32x.h | 11 -
arch/arm/mach-iop32x/hardware.h | 38 -
arch/arm/mach-iop32x/i2c.c | 92 --
arch/arm/mach-iop32x/iop3xx.h | 326 ----
arch/arm/mach-iop32x/iq31244.c | 333 ----
arch/arm/mach-iop32x/iq31244.h | 16 -
arch/arm/mach-iop32x/iq80321.c | 192 ---
arch/arm/mach-iop32x/iq80321.h | 16 -
arch/arm/mach-iop32x/irq.c | 95 --
arch/arm/mach-iop32x/irqs.h | 48 -
arch/arm/mach-iop32x/n2100.c | 367 -----
arch/arm/mach-iop32x/n2100.h | 18 -
arch/arm/mach-iop32x/pci.c | 404 -----
arch/arm/mach-iop32x/pmu.c | 29 -
arch/arm/mach-iop32x/restart.c | 17 -
arch/arm/mach-iop32x/setup.c | 31 -
arch/arm/mach-iop32x/time.c | 179 --
arch/arm/mach-mv78xx0/Kconfig | 14 +-
arch/arm/mach-mv78xx0/Makefile | 2 -
arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 101 --
arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 86 -
arch/arm/mach-omap1/Kconfig | 93 +-
arch/arm/mach-omap1/Makefile | 18 -
arch/arm/mach-omap1/board-fsample.c | 366 -----
arch/arm/mach-omap1/board-generic.c | 85 -
arch/arm/mach-omap1/board-h2-mmc.c | 74 -
arch/arm/mach-omap1/board-h2.c | 448 -----
arch/arm/mach-omap1/board-h2.h | 38 -
arch/arm/mach-omap1/board-h3-mmc.c | 64 -
arch/arm/mach-omap1/board-h3.c | 455 -----
arch/arm/mach-omap1/board-h3.h | 35 -
arch/arm/mach-omap1/board-htcherald.c | 585 -------
arch/arm/mach-omap1/board-innovator.c | 481 ------
arch/arm/mach-omap1/board-nand.c | 33 -
arch/arm/mach-omap1/board-palmtt.c | 285 ----
arch/arm/mach-omap1/board-palmz71.c | 300 ----
arch/arm/mach-omap1/board-perseus2.c | 333 ----
arch/arm/mach-omap1/clock_data.c | 17 +-
arch/arm/mach-omap1/common.h | 8 -
arch/arm/mach-omap1/devices.c | 58 +-
arch/arm/mach-omap1/dma.c | 25 +-
arch/arm/mach-omap1/fpga.c | 186 ---
arch/arm/mach-omap1/fpga.h | 49 -
arch/arm/mach-omap1/gpio7xx.c | 272 ---
arch/arm/mach-omap1/i2c.c | 14 +-
arch/arm/mach-omap1/io.c | 24 -
arch/arm/mach-omap1/irq.c | 20 +-
arch/arm/mach-omap1/irqs.h | 9 -
arch/arm/mach-omap1/mcbsp.c | 83 -
arch/arm/mach-omap1/mtd-xip.h | 4 -
arch/arm/mach-omap1/mux.c | 52 -
arch/arm/mach-omap1/pm.c | 76 +-
arch/arm/mach-omap1/pm.h | 39 +-
arch/arm/mach-omap1/serial.c | 15 -
arch/arm/mach-omap1/sleep.S | 80 -
arch/arm/mach-omap1/sram-init.c | 7 +-
arch/arm/mach-omap1/usb.c | 34 +-
arch/arm/mach-orion5x/Kconfig | 59 -
arch/arm/mach-orion5x/Makefile | 8 -
arch/arm/mach-orion5x/common.c | 10 -
arch/arm/mach-orion5x/common.h | 2 -
arch/arm/mach-orion5x/db88f5281-setup.c | 376 -----
arch/arm/mach-orion5x/ls_hgl-setup.c | 275 ----
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 172 --
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 183 ---
arch/arm/mach-orion5x/rd88f5182-setup.c | 288 ----
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 120 --
arch/arm/mach-orion5x/wnr854t-setup.c | 175 --
arch/arm/mach-orion5x/wrt350n-v2-setup.c | 263 ---
arch/arm/plat-orion/common.c | 31 -
arch/arm/plat-orion/include/plat/common.h | 3 -
drivers/dma/Kconfig | 8 -
drivers/dma/Makefile | 1 -
drivers/dma/iop-adma.c | 1554 ------------------
drivers/dma/iop-adma.h | 914 ----------
drivers/gpio/Kconfig | 10 -
drivers/gpio/Makefile | 1 -
drivers/gpio/gpio-iop.c | 59 -
drivers/i2c/busses/Kconfig | 8 +-
drivers/mfd/Kconfig | 11 +-
drivers/mfd/Makefile | 1 -
drivers/mfd/htc-i2cpld.c | 627 -------
drivers/mmc/host/Kconfig | 13 +-
drivers/mmc/host/Makefile | 1 -
drivers/mmc/host/sdhci-cns3xxx.c | 113 --
drivers/spi/Kconfig | 6 -
drivers/spi/Makefile | 1 -
drivers/spi/spi-omap-100k.c | 490 ------
drivers/spi/spi-omap-uwire.c | 16 +-
drivers/usb/gadget/udc/Kconfig | 2 +-
drivers/usb/gadget/udc/omap_udc.c | 24 +-
drivers/usb/host/Kconfig | 25 +-
drivers/usb/host/ohci-omap.c | 6 +-
drivers/usb/musb/musb_dma.h | 11 +-
drivers/usb/phy/phy-isp1301-omap.c | 91 +-
drivers/video/fbdev/omap/Kconfig | 9 -
drivers/video/fbdev/omap/Makefile | 6 -
drivers/video/fbdev/omap/lcd_h3.c | 82 -
drivers/video/fbdev/omap/lcd_htcherald.c | 59 -
drivers/video/fbdev/omap/lcd_inn1510.c | 69 -
drivers/video/fbdev/omap/lcd_inn1610.c | 99 --
drivers/video/fbdev/omap/lcd_palmtt.c | 65 -
drivers/video/fbdev/omap/lcd_palmz71.c | 59 -
drivers/video/fbdev/omap/lcdc.c | 2 -
drivers/watchdog/wdt285.c | 2 -
include/linux/htcpld.h | 23 -
include/linux/platform_data/leds-omap.h | 19 -
include/linux/soc/ti/omap1-soc.h | 35 -
sound/soc/cirrus/Kconfig | 23 -
sound/soc/cirrus/Makefile | 6 -
sound/soc/cirrus/ep93xx-ac97.c | 446 -----
sound/soc/cirrus/simone.c | 86 -
sound/soc/cirrus/snappercl15.c | 134 --
157 files changed, 60 insertions(+), 18109 deletions(-)
delete mode 100644 arch/arm/configs/cns3420vb_defconfig
delete mode 100644 arch/arm/configs/iop32x_defconfig
delete mode 100644 arch/arm/mach-cns3xxx/Kconfig
delete mode 100644 arch/arm/mach-cns3xxx/Makefile
delete mode 100644 arch/arm/mach-cns3xxx/cns3420vb.c
delete mode 100644 arch/arm/mach-cns3xxx/cns3xxx.h
delete mode 100644 arch/arm/mach-cns3xxx/core.c
delete mode 100644 arch/arm/mach-cns3xxx/core.h
delete mode 100644 arch/arm/mach-cns3xxx/devices.c
delete mode 100644 arch/arm/mach-cns3xxx/devices.h
delete mode 100644 arch/arm/mach-cns3xxx/pcie.c
delete mode 100644 arch/arm/mach-cns3xxx/pm.c
delete mode 100644 arch/arm/mach-cns3xxx/pm.h
delete mode 100644 arch/arm/mach-dove/dove-db-setup.c
delete mode 100644 arch/arm/mach-ep93xx/adssphere.c
delete mode 100644 arch/arm/mach-ep93xx/gesbc9312.c
delete mode 100644 arch/arm/mach-ep93xx/micro9.c
delete mode 100644 arch/arm/mach-ep93xx/simone.c
delete mode 100644 arch/arm/mach-ep93xx/snappercl15.c
delete mode 100644 arch/arm/mach-footbridge/cats-hw.c
delete mode 100644 arch/arm/mach-footbridge/cats-pci.c
delete mode 100644 arch/arm/mach-iop32x/Kconfig
delete mode 100644 arch/arm/mach-iop32x/Makefile
delete mode 100644 arch/arm/mach-iop32x/adma.c
delete mode 100644 arch/arm/mach-iop32x/cp6.c
delete mode 100644 arch/arm/mach-iop32x/em7210.c
delete mode 100644 arch/arm/mach-iop32x/glantank.c
delete mode 100644 arch/arm/mach-iop32x/glantank.h
delete mode 100644 arch/arm/mach-iop32x/gpio-iop32x.h
delete mode 100644 arch/arm/mach-iop32x/hardware.h
delete mode 100644 arch/arm/mach-iop32x/i2c.c
delete mode 100644 arch/arm/mach-iop32x/iop3xx.h
delete mode 100644 arch/arm/mach-iop32x/iq31244.c
delete mode 100644 arch/arm/mach-iop32x/iq31244.h
delete mode 100644 arch/arm/mach-iop32x/iq80321.c
delete mode 100644 arch/arm/mach-iop32x/iq80321.h
delete mode 100644 arch/arm/mach-iop32x/irq.c
delete mode 100644 arch/arm/mach-iop32x/irqs.h
delete mode 100644 arch/arm/mach-iop32x/n2100.c
delete mode 100644 arch/arm/mach-iop32x/n2100.h
delete mode 100644 arch/arm/mach-iop32x/pci.c
delete mode 100644 arch/arm/mach-iop32x/pmu.c
delete mode 100644 arch/arm/mach-iop32x/restart.c
delete mode 100644 arch/arm/mach-iop32x/setup.c
delete mode 100644 arch/arm/mach-iop32x/time.c
delete mode 100644 arch/arm/mach-mv78xx0/db78x00-bp-setup.c
delete mode 100644 arch/arm/mach-mv78xx0/rd78x00-masa-setup.c
delete mode 100644 arch/arm/mach-omap1/board-fsample.c
delete mode 100644 arch/arm/mach-omap1/board-generic.c
delete mode 100644 arch/arm/mach-omap1/board-h2-mmc.c
delete mode 100644 arch/arm/mach-omap1/board-h2.c
delete mode 100644 arch/arm/mach-omap1/board-h2.h
delete mode 100644 arch/arm/mach-omap1/board-h3-mmc.c
delete mode 100644 arch/arm/mach-omap1/board-h3.c
delete mode 100644 arch/arm/mach-omap1/board-h3.h
delete mode 100644 arch/arm/mach-omap1/board-htcherald.c
delete mode 100644 arch/arm/mach-omap1/board-innovator.c
delete mode 100644 arch/arm/mach-omap1/board-nand.c
delete mode 100644 arch/arm/mach-omap1/board-palmtt.c
delete mode 100644 arch/arm/mach-omap1/board-palmz71.c
delete mode 100644 arch/arm/mach-omap1/board-perseus2.c
delete mode 100644 arch/arm/mach-omap1/fpga.c
delete mode 100644 arch/arm/mach-omap1/fpga.h
delete mode 100644 arch/arm/mach-omap1/gpio7xx.c
delete mode 100644 arch/arm/mach-orion5x/db88f5281-setup.c
delete mode 100644 arch/arm/mach-orion5x/ls_hgl-setup.c
delete mode 100644 arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
delete mode 100644 arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
delete mode 100644 arch/arm/mach-orion5x/rd88f5182-setup.c
delete mode 100644 arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
delete mode 100644 arch/arm/mach-orion5x/wnr854t-setup.c
delete mode 100644 arch/arm/mach-orion5x/wrt350n-v2-setup.c
delete mode 100644 drivers/dma/iop-adma.c
delete mode 100644 drivers/dma/iop-adma.h
delete mode 100644 drivers/gpio/gpio-iop.c
delete mode 100644 drivers/mfd/htc-i2cpld.c
delete mode 100644 drivers/mmc/host/sdhci-cns3xxx.c
delete mode 100644 drivers/spi/spi-omap-100k.c
delete mode 100644 drivers/video/fbdev/omap/lcd_h3.c
delete mode 100644 drivers/video/fbdev/omap/lcd_htcherald.c
delete mode 100644 drivers/video/fbdev/omap/lcd_inn1510.c
delete mode 100644 drivers/video/fbdev/omap/lcd_inn1610.c
delete mode 100644 drivers/video/fbdev/omap/lcd_palmtt.c
delete mode 100644 drivers/video/fbdev/omap/lcd_palmz71.c
delete mode 100644 include/linux/htcpld.h
delete mode 100644 include/linux/platform_data/leds-omap.h
delete mode 100644 sound/soc/cirrus/ep93xx-ac97.c
delete mode 100644 sound/soc/cirrus/simone.c
delete mode 100644 sound/soc/cirrus/snappercl15.c
--
2.29.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 05/17] ASoC: remove unused ep93xx files
[not found] ` <20221019150410.3851944-1-arnd@kernel.org>
@ 2022-10-19 15:03 ` Arnd Bergmann
2022-10-19 15:30 ` Mark Brown
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2022-10-19 15:03 UTC (permalink / raw)
To: linux-arm-kernel, Liam Girdwood, Mark Brown, Jaroslav Kysela,
Takashi Iwai
Cc: alsa-devel, Charles Keepax, Ryan Mallon, Arnd Bergmann,
Mika Westerberg, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
A couple of ep93xx board files were unused and got removed, so
the corresponding ASoC support can also be removed.
Cc: Mika Westerberg <mika.westerberg@iki.fi>
Cc: Ryan Mallon <rmallon@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
sound/soc/cirrus/Kconfig | 23 --
sound/soc/cirrus/Makefile | 6 -
sound/soc/cirrus/ep93xx-ac97.c | 446 ---------------------------------
sound/soc/cirrus/simone.c | 86 -------
sound/soc/cirrus/snappercl15.c | 134 ----------
5 files changed, 695 deletions(-)
delete mode 100644 sound/soc/cirrus/ep93xx-ac97.c
delete mode 100644 sound/soc/cirrus/simone.c
delete mode 100644 sound/soc/cirrus/snappercl15.c
diff --git a/sound/soc/cirrus/Kconfig b/sound/soc/cirrus/Kconfig
index 8039a8febefa..34870c2d0cba 100644
--- a/sound/soc/cirrus/Kconfig
+++ b/sound/soc/cirrus/Kconfig
@@ -27,29 +27,6 @@ config SND_EP93XX_SOC_I2S_WATCHDOG
endif # if SND_EP93XX_SOC_I2S
-config SND_EP93XX_SOC_AC97
- tristate
- select AC97_BUS
- select SND_SOC_AC97_BUS
-
-config SND_EP93XX_SOC_SNAPPERCL15
- tristate "SoC Audio support for Bluewater Systems Snapper CL15 module"
- depends on SND_EP93XX_SOC && MACH_SNAPPER_CL15 && I2C
- select SND_EP93XX_SOC_I2S
- select SND_SOC_TLV320AIC23_I2C
- help
- Say Y or M here if you want to add support for I2S audio on the
- Bluewater Systems Snapper CL15 module.
-
-config SND_EP93XX_SOC_SIMONE
- tristate "SoC Audio support for Simplemachines Sim.One board"
- depends on SND_EP93XX_SOC && MACH_SIM_ONE
- select SND_EP93XX_SOC_AC97
- select SND_SOC_AC97_CODEC
- help
- Say Y or M here if you want to add support for AC97 audio on the
- Simplemachines Sim.One board.
-
config SND_EP93XX_SOC_EDB93XX
tristate "SoC Audio support for Cirrus Logic EDB93xx boards"
depends on SND_EP93XX_SOC && (MACH_EDB9301 || MACH_EDB9302 || MACH_EDB9302A || MACH_EDB9307A || MACH_EDB9315A)
diff --git a/sound/soc/cirrus/Makefile b/sound/soc/cirrus/Makefile
index bfb8dc409f53..19a86daad660 100644
--- a/sound/soc/cirrus/Makefile
+++ b/sound/soc/cirrus/Makefile
@@ -2,17 +2,11 @@
# EP93xx Platform Support
snd-soc-ep93xx-objs := ep93xx-pcm.o
snd-soc-ep93xx-i2s-objs := ep93xx-i2s.o
-snd-soc-ep93xx-ac97-objs := ep93xx-ac97.o
obj-$(CONFIG_SND_EP93XX_SOC) += snd-soc-ep93xx.o
obj-$(CONFIG_SND_EP93XX_SOC_I2S) += snd-soc-ep93xx-i2s.o
-obj-$(CONFIG_SND_EP93XX_SOC_AC97) += snd-soc-ep93xx-ac97.o
# EP93XX Machine Support
-snd-soc-snappercl15-objs := snappercl15.o
-snd-soc-simone-objs := simone.o
snd-soc-edb93xx-objs := edb93xx.o
-obj-$(CONFIG_SND_EP93XX_SOC_SNAPPERCL15) += snd-soc-snappercl15.o
-obj-$(CONFIG_SND_EP93XX_SOC_SIMONE) += snd-soc-simone.o
obj-$(CONFIG_SND_EP93XX_SOC_EDB93XX) += snd-soc-edb93xx.o
diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c
deleted file mode 100644
index 37593abe6053..000000000000
--- a/sound/soc/cirrus/ep93xx-ac97.c
+++ /dev/null
@@ -1,446 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * ASoC driver for Cirrus Logic EP93xx AC97 controller.
- *
- * Copyright (c) 2010 Mika Westerberg
- *
- * Based on s3c-ac97 ASoC driver by Jaswinder Singh.
- */
-
-#include <linux/delay.h>
-#include <linux/err.h>
-#include <linux/io.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-
-#include <sound/core.h>
-#include <sound/dmaengine_pcm.h>
-#include <sound/ac97_codec.h>
-#include <sound/soc.h>
-
-#include <linux/platform_data/dma-ep93xx.h>
-#include <linux/soc/cirrus/ep93xx.h>
-
-#include "ep93xx-pcm.h"
-
-/*
- * Per channel (1-4) registers.
- */
-#define AC97CH(n) (((n) - 1) * 0x20)
-
-#define AC97DR(n) (AC97CH(n) + 0x0000)
-
-#define AC97RXCR(n) (AC97CH(n) + 0x0004)
-#define AC97RXCR_REN BIT(0)
-#define AC97RXCR_RX3 BIT(3)
-#define AC97RXCR_RX4 BIT(4)
-#define AC97RXCR_CM BIT(15)
-
-#define AC97TXCR(n) (AC97CH(n) + 0x0008)
-#define AC97TXCR_TEN BIT(0)
-#define AC97TXCR_TX3 BIT(3)
-#define AC97TXCR_TX4 BIT(4)
-#define AC97TXCR_CM BIT(15)
-
-#define AC97SR(n) (AC97CH(n) + 0x000c)
-#define AC97SR_TXFE BIT(1)
-#define AC97SR_TXUE BIT(6)
-
-#define AC97RISR(n) (AC97CH(n) + 0x0010)
-#define AC97ISR(n) (AC97CH(n) + 0x0014)
-#define AC97IE(n) (AC97CH(n) + 0x0018)
-
-/*
- * Global AC97 controller registers.
- */
-#define AC97S1DATA 0x0080
-#define AC97S2DATA 0x0084
-#define AC97S12DATA 0x0088
-
-#define AC97RGIS 0x008c
-#define AC97GIS 0x0090
-#define AC97IM 0x0094
-/*
- * Common bits for RGIS, GIS and IM registers.
- */
-#define AC97_SLOT2RXVALID BIT(1)
-#define AC97_CODECREADY BIT(5)
-#define AC97_SLOT2TXCOMPLETE BIT(6)
-
-#define AC97EOI 0x0098
-#define AC97EOI_WINT BIT(0)
-#define AC97EOI_CODECREADY BIT(1)
-
-#define AC97GCR 0x009c
-#define AC97GCR_AC97IFE BIT(0)
-
-#define AC97RESET 0x00a0
-#define AC97RESET_TIMEDRESET BIT(0)
-
-#define AC97SYNC 0x00a4
-#define AC97SYNC_TIMEDSYNC BIT(0)
-
-#define AC97_TIMEOUT msecs_to_jiffies(5)
-
-/**
- * struct ep93xx_ac97_info - EP93xx AC97 controller info structure
- * @lock: mutex serializing access to the bus (slot 1 & 2 ops)
- * @dev: pointer to the platform device dev structure
- * @regs: mapped AC97 controller registers
- * @done: bus ops wait here for an interrupt
- */
-struct ep93xx_ac97_info {
- struct mutex lock;
- struct device *dev;
- void __iomem *regs;
- struct completion done;
- struct snd_dmaengine_dai_dma_data dma_params_rx;
- struct snd_dmaengine_dai_dma_data dma_params_tx;
-};
-
-/* currently ALSA only supports a single AC97 device */
-static struct ep93xx_ac97_info *ep93xx_ac97_info;
-
-static struct ep93xx_dma_data ep93xx_ac97_pcm_out = {
- .name = "ac97-pcm-out",
- .port = EP93XX_DMA_AAC1,
- .direction = DMA_MEM_TO_DEV,
-};
-
-static struct ep93xx_dma_data ep93xx_ac97_pcm_in = {
- .name = "ac97-pcm-in",
- .port = EP93XX_DMA_AAC1,
- .direction = DMA_DEV_TO_MEM,
-};
-
-static inline unsigned ep93xx_ac97_read_reg(struct ep93xx_ac97_info *info,
- unsigned reg)
-{
- return __raw_readl(info->regs + reg);
-}
-
-static inline void ep93xx_ac97_write_reg(struct ep93xx_ac97_info *info,
- unsigned reg, unsigned val)
-{
- __raw_writel(val, info->regs + reg);
-}
-
-static unsigned short ep93xx_ac97_read(struct snd_ac97 *ac97,
- unsigned short reg)
-{
- struct ep93xx_ac97_info *info = ep93xx_ac97_info;
- unsigned short val;
-
- mutex_lock(&info->lock);
-
- ep93xx_ac97_write_reg(info, AC97S1DATA, reg);
- ep93xx_ac97_write_reg(info, AC97IM, AC97_SLOT2RXVALID);
- if (!wait_for_completion_timeout(&info->done, AC97_TIMEOUT)) {
- dev_warn(info->dev, "timeout reading register %x\n", reg);
- mutex_unlock(&info->lock);
- return -ETIMEDOUT;
- }
- val = (unsigned short)ep93xx_ac97_read_reg(info, AC97S2DATA);
-
- mutex_unlock(&info->lock);
- return val;
-}
-
-static void ep93xx_ac97_write(struct snd_ac97 *ac97,
- unsigned short reg,
- unsigned short val)
-{
- struct ep93xx_ac97_info *info = ep93xx_ac97_info;
-
- mutex_lock(&info->lock);
-
- /*
- * Writes to the codec need to be done so that slot 2 is filled in
- * before slot 1.
- */
- ep93xx_ac97_write_reg(info, AC97S2DATA, val);
- ep93xx_ac97_write_reg(info, AC97S1DATA, reg);
-
- ep93xx_ac97_write_reg(info, AC97IM, AC97_SLOT2TXCOMPLETE);
- if (!wait_for_completion_timeout(&info->done, AC97_TIMEOUT))
- dev_warn(info->dev, "timeout writing register %x\n", reg);
-
- mutex_unlock(&info->lock);
-}
-
-static void ep93xx_ac97_warm_reset(struct snd_ac97 *ac97)
-{
- struct ep93xx_ac97_info *info = ep93xx_ac97_info;
-
- mutex_lock(&info->lock);
-
- /*
- * We are assuming that before this functions gets called, the codec
- * BIT_CLK is stopped by forcing the codec into powerdown mode. We can
- * control the SYNC signal directly via AC97SYNC register. Using
- * TIMEDSYNC the controller will keep the SYNC high > 1us.
- */
- ep93xx_ac97_write_reg(info, AC97SYNC, AC97SYNC_TIMEDSYNC);
- ep93xx_ac97_write_reg(info, AC97IM, AC97_CODECREADY);
- if (!wait_for_completion_timeout(&info->done, AC97_TIMEOUT))
- dev_warn(info->dev, "codec warm reset timeout\n");
-
- mutex_unlock(&info->lock);
-}
-
-static void ep93xx_ac97_cold_reset(struct snd_ac97 *ac97)
-{
- struct ep93xx_ac97_info *info = ep93xx_ac97_info;
-
- mutex_lock(&info->lock);
-
- /*
- * For doing cold reset, we disable the AC97 controller interface, clear
- * WINT and CODECREADY bits, and finally enable the interface again.
- */
- ep93xx_ac97_write_reg(info, AC97GCR, 0);
- ep93xx_ac97_write_reg(info, AC97EOI, AC97EOI_CODECREADY | AC97EOI_WINT);
- ep93xx_ac97_write_reg(info, AC97GCR, AC97GCR_AC97IFE);
-
- /*
- * Now, assert the reset and wait for the codec to become ready.
- */
- ep93xx_ac97_write_reg(info, AC97RESET, AC97RESET_TIMEDRESET);
- ep93xx_ac97_write_reg(info, AC97IM, AC97_CODECREADY);
- if (!wait_for_completion_timeout(&info->done, AC97_TIMEOUT))
- dev_warn(info->dev, "codec cold reset timeout\n");
-
- /*
- * Give the codec some time to come fully out from the reset. This way
- * we ensure that the subsequent reads/writes will work.
- */
- usleep_range(15000, 20000);
-
- mutex_unlock(&info->lock);
-}
-
-static irqreturn_t ep93xx_ac97_interrupt(int irq, void *dev_id)
-{
- struct ep93xx_ac97_info *info = dev_id;
- unsigned status, mask;
-
- /*
- * Just mask out the interrupt and wake up the waiting thread.
- * Interrupts are cleared via reading/writing to slot 1 & 2 registers by
- * the waiting thread.
- */
- status = ep93xx_ac97_read_reg(info, AC97GIS);
- mask = ep93xx_ac97_read_reg(info, AC97IM);
- mask &= ~status;
- ep93xx_ac97_write_reg(info, AC97IM, mask);
-
- complete(&info->done);
- return IRQ_HANDLED;
-}
-
-static struct snd_ac97_bus_ops ep93xx_ac97_ops = {
- .read = ep93xx_ac97_read,
- .write = ep93xx_ac97_write,
- .reset = ep93xx_ac97_cold_reset,
- .warm_reset = ep93xx_ac97_warm_reset,
-};
-
-static int ep93xx_ac97_trigger(struct snd_pcm_substream *substream,
- int cmd, struct snd_soc_dai *dai)
-{
- struct ep93xx_ac97_info *info = snd_soc_dai_get_drvdata(dai);
- unsigned v = 0;
-
- switch (cmd) {
- case SNDRV_PCM_TRIGGER_START:
- case SNDRV_PCM_TRIGGER_RESUME:
- case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
- if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
- /*
- * Enable compact mode, TX slots 3 & 4, and the TX FIFO
- * itself.
- */
- v |= AC97TXCR_CM;
- v |= AC97TXCR_TX3 | AC97TXCR_TX4;
- v |= AC97TXCR_TEN;
- ep93xx_ac97_write_reg(info, AC97TXCR(1), v);
- } else {
- /*
- * Enable compact mode, RX slots 3 & 4, and the RX FIFO
- * itself.
- */
- v |= AC97RXCR_CM;
- v |= AC97RXCR_RX3 | AC97RXCR_RX4;
- v |= AC97RXCR_REN;
- ep93xx_ac97_write_reg(info, AC97RXCR(1), v);
- }
- break;
-
- case SNDRV_PCM_TRIGGER_STOP:
- case SNDRV_PCM_TRIGGER_SUSPEND:
- case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
- if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
- /*
- * As per Cirrus EP93xx errata described below:
- *
- * https://www.cirrus.com/en/pubs/errata/ER667E2B.pdf
- *
- * we will wait for the TX FIFO to be empty before
- * clearing the TEN bit.
- */
- unsigned long timeout = jiffies + AC97_TIMEOUT;
-
- do {
- v = ep93xx_ac97_read_reg(info, AC97SR(1));
- if (time_after(jiffies, timeout)) {
- dev_warn(info->dev, "TX timeout\n");
- break;
- }
- } while (!(v & (AC97SR_TXFE | AC97SR_TXUE)));
-
- /* disable the TX FIFO */
- ep93xx_ac97_write_reg(info, AC97TXCR(1), 0);
- } else {
- /* disable the RX FIFO */
- ep93xx_ac97_write_reg(info, AC97RXCR(1), 0);
- }
- break;
-
- default:
- dev_warn(info->dev, "unknown command %d\n", cmd);
- return -EINVAL;
- }
-
- return 0;
-}
-
-static int ep93xx_ac97_dai_probe(struct snd_soc_dai *dai)
-{
- struct ep93xx_ac97_info *info = snd_soc_dai_get_drvdata(dai);
-
- info->dma_params_tx.filter_data = &ep93xx_ac97_pcm_out;
- info->dma_params_rx.filter_data = &ep93xx_ac97_pcm_in;
-
- dai->playback_dma_data = &info->dma_params_tx;
- dai->capture_dma_data = &info->dma_params_rx;
-
- return 0;
-}
-
-static const struct snd_soc_dai_ops ep93xx_ac97_dai_ops = {
- .trigger = ep93xx_ac97_trigger,
-};
-
-static struct snd_soc_dai_driver ep93xx_ac97_dai = {
- .name = "ep93xx-ac97",
- .id = 0,
- .probe = ep93xx_ac97_dai_probe,
- .playback = {
- .stream_name = "AC97 Playback",
- .channels_min = 2,
- .channels_max = 2,
- .rates = SNDRV_PCM_RATE_8000_48000,
- .formats = SNDRV_PCM_FMTBIT_S16_LE,
- },
- .capture = {
- .stream_name = "AC97 Capture",
- .channels_min = 2,
- .channels_max = 2,
- .rates = SNDRV_PCM_RATE_8000_48000,
- .formats = SNDRV_PCM_FMTBIT_S16_LE,
- },
- .ops = &ep93xx_ac97_dai_ops,
-};
-
-static const struct snd_soc_component_driver ep93xx_ac97_component = {
- .name = "ep93xx-ac97",
- .legacy_dai_naming = 1,
-};
-
-static int ep93xx_ac97_probe(struct platform_device *pdev)
-{
- struct ep93xx_ac97_info *info;
- int irq;
- int ret;
-
- info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
- if (!info)
- return -ENOMEM;
-
- info->regs = devm_platform_ioremap_resource(pdev, 0);
- if (IS_ERR(info->regs))
- return PTR_ERR(info->regs);
-
- irq = platform_get_irq(pdev, 0);
- if (irq <= 0)
- return irq < 0 ? irq : -ENODEV;
-
- ret = devm_request_irq(&pdev->dev, irq, ep93xx_ac97_interrupt,
- IRQF_TRIGGER_HIGH, pdev->name, info);
- if (ret)
- goto fail;
-
- dev_set_drvdata(&pdev->dev, info);
-
- mutex_init(&info->lock);
- init_completion(&info->done);
- info->dev = &pdev->dev;
-
- ep93xx_ac97_info = info;
- platform_set_drvdata(pdev, info);
-
- ret = snd_soc_set_ac97_ops(&ep93xx_ac97_ops);
- if (ret)
- goto fail;
-
- ret = snd_soc_register_component(&pdev->dev, &ep93xx_ac97_component,
- &ep93xx_ac97_dai, 1);
- if (ret)
- goto fail;
-
- ret = devm_ep93xx_pcm_platform_register(&pdev->dev);
- if (ret)
- goto fail_unregister;
-
- return 0;
-
-fail_unregister:
- snd_soc_unregister_component(&pdev->dev);
-fail:
- ep93xx_ac97_info = NULL;
- snd_soc_set_ac97_ops(NULL);
- return ret;
-}
-
-static int ep93xx_ac97_remove(struct platform_device *pdev)
-{
- struct ep93xx_ac97_info *info = platform_get_drvdata(pdev);
-
- snd_soc_unregister_component(&pdev->dev);
-
- /* disable the AC97 controller */
- ep93xx_ac97_write_reg(info, AC97GCR, 0);
-
- ep93xx_ac97_info = NULL;
-
- snd_soc_set_ac97_ops(NULL);
-
- return 0;
-}
-
-static struct platform_driver ep93xx_ac97_driver = {
- .probe = ep93xx_ac97_probe,
- .remove = ep93xx_ac97_remove,
- .driver = {
- .name = "ep93xx-ac97",
- },
-};
-
-module_platform_driver(ep93xx_ac97_driver);
-
-MODULE_DESCRIPTION("EP93xx AC97 ASoC Driver");
-MODULE_AUTHOR("Mika Westerberg <mika.westerberg@iki.fi>");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:ep93xx-ac97");
diff --git a/sound/soc/cirrus/simone.c b/sound/soc/cirrus/simone.c
deleted file mode 100644
index 801c90877d77..000000000000
--- a/sound/soc/cirrus/simone.c
+++ /dev/null
@@ -1,86 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * simone.c -- ASoC audio for Simplemachines Sim.One board
- *
- * Copyright (c) 2010 Mika Westerberg
- *
- * Based on snappercl15 machine driver by Ryan Mallon.
- */
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/soc/cirrus/ep93xx.h>
-
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/soc.h>
-
-#include <asm/mach-types.h>
-
-SND_SOC_DAILINK_DEFS(hifi,
- DAILINK_COMP_ARRAY(COMP_CPU("ep93xx-ac97")),
- DAILINK_COMP_ARRAY(COMP_CODEC("ac97-codec", "ac97-hifi")),
- DAILINK_COMP_ARRAY(COMP_PLATFORM("ep93xx-ac97")));
-
-static struct snd_soc_dai_link simone_dai = {
- .name = "AC97",
- .stream_name = "AC97 HiFi",
- SND_SOC_DAILINK_REG(hifi),
-};
-
-static struct snd_soc_card snd_soc_simone = {
- .name = "Sim.One",
- .owner = THIS_MODULE,
- .dai_link = &simone_dai,
- .num_links = 1,
-};
-
-static struct platform_device *simone_snd_ac97_device;
-
-static int simone_probe(struct platform_device *pdev)
-{
- struct snd_soc_card *card = &snd_soc_simone;
- int ret;
-
- simone_snd_ac97_device = platform_device_register_simple("ac97-codec",
- -1, NULL, 0);
- if (IS_ERR(simone_snd_ac97_device))
- return PTR_ERR(simone_snd_ac97_device);
-
- card->dev = &pdev->dev;
-
- ret = snd_soc_register_card(card);
- if (ret) {
- dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
- ret);
- platform_device_unregister(simone_snd_ac97_device);
- }
-
- return ret;
-}
-
-static int simone_remove(struct platform_device *pdev)
-{
- struct snd_soc_card *card = platform_get_drvdata(pdev);
-
- snd_soc_unregister_card(card);
- platform_device_unregister(simone_snd_ac97_device);
-
- return 0;
-}
-
-static struct platform_driver simone_driver = {
- .driver = {
- .name = "simone-audio",
- },
- .probe = simone_probe,
- .remove = simone_remove,
-};
-
-module_platform_driver(simone_driver);
-
-MODULE_DESCRIPTION("ALSA SoC Simplemachines Sim.One");
-MODULE_AUTHOR("Mika Westerberg <mika.westerberg@iki.fi>");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:simone-audio");
diff --git a/sound/soc/cirrus/snappercl15.c b/sound/soc/cirrus/snappercl15.c
deleted file mode 100644
index a286f5beeaeb..000000000000
--- a/sound/soc/cirrus/snappercl15.c
+++ /dev/null
@@ -1,134 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * snappercl15.c -- SoC audio for Bluewater Systems Snapper CL15 module
- *
- * Copyright (C) 2008 Bluewater Systems Ltd
- * Author: Ryan Mallon
- */
-
-#include <linux/platform_device.h>
-#include <linux/module.h>
-#include <linux/soc/cirrus/ep93xx.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/soc.h>
-
-#include <asm/mach-types.h>
-
-#include "../codecs/tlv320aic23.h"
-
-#define CODEC_CLOCK 5644800
-
-static int snappercl15_hw_params(struct snd_pcm_substream *substream,
- struct snd_pcm_hw_params *params)
-{
- struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
- struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
- struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
- int err;
-
- err = snd_soc_dai_set_sysclk(codec_dai, 0, CODEC_CLOCK,
- SND_SOC_CLOCK_IN);
- if (err)
- return err;
-
- err = snd_soc_dai_set_sysclk(cpu_dai, 0, CODEC_CLOCK,
- SND_SOC_CLOCK_OUT);
- if (err)
- return err;
-
- return 0;
-}
-
-static const struct snd_soc_ops snappercl15_ops = {
- .hw_params = snappercl15_hw_params,
-};
-
-static const struct snd_soc_dapm_widget tlv320aic23_dapm_widgets[] = {
- SND_SOC_DAPM_HP("Headphone Jack", NULL),
- SND_SOC_DAPM_LINE("Line In", NULL),
- SND_SOC_DAPM_MIC("Mic Jack", NULL),
-};
-
-static const struct snd_soc_dapm_route audio_map[] = {
- {"Headphone Jack", NULL, "LHPOUT"},
- {"Headphone Jack", NULL, "RHPOUT"},
-
- {"LLINEIN", NULL, "Line In"},
- {"RLINEIN", NULL, "Line In"},
-
- {"MICIN", NULL, "Mic Jack"},
-};
-
-SND_SOC_DAILINK_DEFS(aic23,
- DAILINK_COMP_ARRAY(COMP_CPU("ep93xx-i2s")),
- DAILINK_COMP_ARRAY(COMP_CODEC("tlv320aic23-codec.0-001a",
- "tlv320aic23-hifi")),
- DAILINK_COMP_ARRAY(COMP_PLATFORM("ep93xx-i2s")));
-
-static struct snd_soc_dai_link snappercl15_dai = {
- .name = "tlv320aic23",
- .stream_name = "AIC23",
- .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
- SND_SOC_DAIFMT_CBC_CFC,
- .ops = &snappercl15_ops,
- SND_SOC_DAILINK_REG(aic23),
-};
-
-static struct snd_soc_card snd_soc_snappercl15 = {
- .name = "Snapper CL15",
- .owner = THIS_MODULE,
- .dai_link = &snappercl15_dai,
- .num_links = 1,
-
- .dapm_widgets = tlv320aic23_dapm_widgets,
- .num_dapm_widgets = ARRAY_SIZE(tlv320aic23_dapm_widgets),
- .dapm_routes = audio_map,
- .num_dapm_routes = ARRAY_SIZE(audio_map),
-};
-
-static int snappercl15_probe(struct platform_device *pdev)
-{
- struct snd_soc_card *card = &snd_soc_snappercl15;
- int ret;
-
- ret = ep93xx_i2s_acquire();
- if (ret)
- return ret;
-
- card->dev = &pdev->dev;
-
- ret = snd_soc_register_card(card);
- if (ret) {
- dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
- ret);
- ep93xx_i2s_release();
- }
-
- return ret;
-}
-
-static int snappercl15_remove(struct platform_device *pdev)
-{
- struct snd_soc_card *card = platform_get_drvdata(pdev);
-
- snd_soc_unregister_card(card);
- ep93xx_i2s_release();
-
- return 0;
-}
-
-static struct platform_driver snappercl15_driver = {
- .driver = {
- .name = "snappercl15-audio",
- },
- .probe = snappercl15_probe,
- .remove = snappercl15_remove,
-};
-
-module_platform_driver(snappercl15_driver);
-
-MODULE_AUTHOR("Ryan Mallon");
-MODULE_DESCRIPTION("ALSA SoC Snapper CL15");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:snappercl15-audio");
--
2.29.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 05/17] ASoC: remove unused ep93xx files
2022-10-19 15:03 ` [PATCH 05/17] ASoC: remove unused ep93xx files Arnd Bergmann
@ 2022-10-19 15:30 ` Mark Brown
0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2022-10-19 15:30 UTC (permalink / raw)
To: Arnd Bergmann
Cc: alsa-devel, Charles Keepax, Ryan Mallon, Arnd Bergmann,
Liam Girdwood, Mika Westerberg, linux-kernel, Takashi Iwai,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 273 bytes --]
On Wed, Oct 19, 2022 at 05:03:27PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> A couple of ep93xx board files were unused and got removed, so
> the corresponding ASoC support can also be removed.
Acked-by: Mark Brown <broonie@kernel.org>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-20 10:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-19 14:40 [PATCH 00/17] ARM: remove old board files Arnd Bergmann
[not found] ` <20221019150410.3851944-1-arnd@kernel.org>
2022-10-19 15:03 ` [PATCH 05/17] ASoC: remove unused ep93xx files Arnd Bergmann
2022-10-19 15:30 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox