Commit b401d1fd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ASoC: pxa: remove unused board support 



Most PXA/MMP boards were removed, so the board specific ASoC
support is no longer needed, leaving only support for DT
based ones, as well as the "gumstix" and "spitz" machines
that may get converted to DT later.

Cc: Ian Molton <spyro@f2s.com>
Cc: Ken McGuire <kenm@desertweyr.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 7aeffbf2

include/linux/platform_data/asoc-palm27x.h

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _INCLUDE_PALMASOC_H_

#define _INCLUDE_PALMASOC_H_



struct palm27x_asoc_info {

	int	jack_gpio;

};



#endif

include/linux/platform_data/asoc-poodle.h

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __LINUX_PLATFORM_DATA_POODLE_AUDIO

#define __LINUX_PLATFORM_DATA_POODLE_AUDIO



/* locomo is not a proper gpio driver, and uses its own api */

struct poodle_audio_platform_data {

	struct device	*locomo_dev;



	int		gpio_amp_on;

	int		gpio_mute_l;

	int		gpio_mute_r;

	int		gpio_232vcc_on;

	int		gpio_jk_b;

};



#endif

include/linux/platform_data/mmp_audio.h

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 *  MMP Platform AUDIO Management

 *

 *  Copyright (c) 2011 Marvell Semiconductors Inc.

 */



#ifndef MMP_AUDIO_H

#define MMP_AUDIO_H



struct mmp_audio_platdata {

	u32 period_max_capture;

	u32 buffer_max_capture;

	u32 period_max_playback;

	u32 buffer_max_playback;

};



#endif /* MMP_AUDIO_H */

sound/soc/pxa/Kconfig

+0 −176
Original line number Diff line number Diff line
@@ -8,10 +8,6 @@ config SND_PXA2XX_SOC 
	  the PXA2xx AC97, I2S or SSP interface. You will also need

	  to select the audio interfaces to support below.



config SND_MMP_SOC

	bool

	select MMP_SRAM



config SND_PXA2XX_AC97

	tristate
@@ -41,15 +37,6 @@ config SND_MMP_SOC_SSPA 
	  Say Y if you want to add support for codecs attached to

	  the MMP SSPA interface.



config SND_PXA2XX_SOC_CORGI

	tristate "SoC Audio support for Sharp Zaurus SL-C7x0"

	depends on SND_PXA2XX_SOC && PXA_SHARP_C7xx && I2C

	select SND_PXA2XX_SOC_I2S

	select SND_SOC_WM8731_I2C

	help

	  Say Y if you want to add support for SoC audio on Sharp

	  Zaurus SL-C7x0 models (Corgi, Shepherd, Husky).



config SND_PXA2XX_SOC_SPITZ

	tristate "SoC Audio support for Sharp Zaurus SL-Cxx00"

	depends on SND_PXA2XX_SOC && PXA_SHARP_Cxx00 && I2C
@@ -59,101 +46,6 @@ config SND_PXA2XX_SOC_SPITZ 
	  Say Y if you want to add support for SoC audio on Sharp

	  Zaurus SL-Cxx00 models (Spitz, Borzoi and Akita).



config SND_PXA2XX_SOC_Z2

	tristate "SoC Audio support for Zipit Z2"

	depends on SND_PXA2XX_SOC && MACH_ZIPIT2 && I2C

	select SND_PXA2XX_SOC_I2S

	select SND_SOC_WM8750

	help

	  Say Y if you want to add support for SoC audio on Zipit Z2.



config SND_PXA2XX_SOC_POODLE

	tristate "SoC Audio support for Poodle"

	depends on SND_PXA2XX_SOC && MACH_POODLE && I2C

	select SND_PXA2XX_SOC_I2S

	select SND_SOC_WM8731_I2C

	help

	  Say Y if you want to add support for SoC audio on Sharp

	  Zaurus SL-5600 model (Poodle).



config SND_PXA2XX_SOC_TOSA

	tristate "SoC AC97 Audio support for Tosa"

	depends on SND_PXA2XX_SOC && MACH_TOSA

	depends on MFD_TC6393XB

	depends on AC97_BUS=n

	select REGMAP

	select AC97_BUS_NEW

	select AC97_BUS_COMPAT

	select SND_PXA2XX_SOC_AC97

	select SND_SOC_WM9712

	help

	  Say Y if you want to add support for SoC audio on Sharp

	  Zaurus SL-C6000x models (Tosa).



config SND_PXA2XX_SOC_E740

	tristate "SoC AC97 Audio support for e740"

	depends on SND_PXA2XX_SOC && MACH_E740

	depends on AC97_BUS=n

	select REGMAP

	select AC97_BUS_NEW

	select AC97_BUS_COMPAT

	select SND_SOC_WM9705

	select SND_PXA2XX_SOC_AC97

	help

	  Say Y if you want to add support for SoC audio on the

	  toshiba e740 PDA



config SND_PXA2XX_SOC_E750

	tristate "SoC AC97 Audio support for e750"

	depends on SND_PXA2XX_SOC && MACH_E750

	depends on AC97_BUS=n

	select REGMAP

	select SND_SOC_WM9705

	select SND_PXA2XX_SOC_AC97

	help

	  Say Y if you want to add support for SoC audio on the

	  toshiba e750 PDA



config SND_PXA2XX_SOC_E800

	tristate "SoC AC97 Audio support for e800"

	depends on SND_PXA2XX_SOC && MACH_E800

	depends on AC97_BUS=n

	select REGMAP

	select SND_SOC_WM9712

	select AC97_BUS_NEW

	select AC97_BUS_COMPAT

	select SND_PXA2XX_SOC_AC97

	help

	  Say Y if you want to add support for SoC audio on the

	  Toshiba e800 PDA



config SND_PXA2XX_SOC_EM_X270

	tristate "SoC Audio support for CompuLab CM-X300"

	depends on SND_PXA2XX_SOC && MACH_CM_X300

	depends on AC97_BUS=n

	select REGMAP

	select AC97_BUS_NEW

	select AC97_BUS_COMPAT

	select SND_PXA2XX_SOC_AC97

	select SND_SOC_WM9712

	help

	  Say Y if you want to add support for SoC audio on

	  CompuLab EM-x270, eXeda and CM-X300 machines.



config SND_PXA2XX_SOC_PALM27X

	bool "SoC Audio support for Palm T|X, T5, E2 and LifeDrive"

	depends on SND_PXA2XX_SOC && (MACH_PALMLD || MACH_PALMTX || \

			MACH_PALMT5 || MACH_PALMTE2)

	depends on AC97_BUS=n

	select REGMAP

	select AC97_BUS_NEW

	select AC97_BUS_COMPAT

	select SND_PXA2XX_SOC_AC97

	select SND_SOC_WM9712

	help

	  Say Y if you want to add support for SoC audio on

	  Palm T|X, T5, E2 or LifeDrive handheld computer.



config SND_PXA910_SOC

	tristate "SoC Audio for Marvell PXA910 chip"

	depends on ARCH_MMP && SND
@@ -161,71 +53,3 @@ config SND_PXA910_SOC 
	help

	  Say Y if you want to add support for SoC audio on the

	  Marvell PXA910 reference platform.
 


config SND_SOC_TTC_DKB

	tristate "SoC Audio support for TTC DKB"

	depends on SND_PXA910_SOC && MACH_TTC_DKB && I2C=y

	select PXA_SSP

	select SND_PXA_SOC_SSP

	select SND_MMP_SOC

	select MFD_88PM860X

	select SND_SOC_88PM860X

	help

	  Say Y if you want to add support for SoC audio on TTC DKB





config SND_SOC_ZYLONITE

	tristate "SoC Audio support for Marvell Zylonite"

	depends on SND_PXA2XX_SOC && MACH_ZYLONITE

	depends on AC97_BUS=n

	select AC97_BUS_NEW

	select AC97_BUS_COMPAT

	select SND_PXA2XX_SOC_AC97

	select REGMAP

	select SND_PXA_SOC_SSP

	select SND_SOC_WM9713

	help

	  Say Y if you want to add support for SoC audio on the

	  Marvell Zylonite reference platform.



config SND_PXA2XX_SOC_HX4700

	tristate "SoC Audio support for HP iPAQ hx4700"

	depends on SND_PXA2XX_SOC && MACH_H4700 && I2C

	select SND_PXA2XX_SOC_I2S

	select SND_SOC_AK4641

	help

	  Say Y if you want to add support for SoC audio on the

	  HP iPAQ hx4700.



config SND_PXA2XX_SOC_MAGICIAN

	tristate "SoC Audio support for HTC Magician"

	depends on SND_PXA2XX_SOC && MACH_MAGICIAN && I2C

	select SND_PXA2XX_SOC_I2S

	select SND_PXA_SOC_SSP

	select SND_SOC_UDA1380

	help

	  Say Y if you want to add support for SoC audio on the

	  HTC Magician.



config SND_PXA2XX_SOC_MIOA701

	tristate "SoC Audio support for MIO A701"

	depends on SND_PXA2XX_SOC && MACH_MIOA701

	depends on AC97_BUS=n

	select REGMAP

	select AC97_BUS_NEW

	select AC97_BUS_COMPAT

	select SND_PXA2XX_SOC_AC97

	select SND_SOC_WM9713

	help

	  Say Y if you want to add support for SoC audio on the

	  MIO A701.



config SND_MMP_SOC_BROWNSTONE

	tristate "SoC Audio support for Marvell Brownstone"

	depends on SND_MMP_SOC_SSPA && MACH_BROWNSTONE && I2C

	select SND_MMP_SOC

	select MFD_WM8994

	select SND_SOC_WM8994

	help

	  Say Y if you want to add support for SoC audio on the

	  Marvell Brownstone reference platform.

sound/soc/pxa/Makefile

+0 −33
Original line number Diff line number Diff line
@@ -4,47 +4,14 @@ snd-soc-pxa2xx-objs := pxa2xx-pcm.o 
snd-soc-pxa2xx-ac97-objs := pxa2xx-ac97.o

snd-soc-pxa2xx-i2s-objs := pxa2xx-i2s.o

snd-soc-pxa-ssp-objs := pxa-ssp.o

snd-soc-mmp-objs := mmp-pcm.o

snd-soc-mmp-sspa-objs := mmp-sspa.o



obj-$(CONFIG_SND_PXA2XX_SOC) += snd-soc-pxa2xx.o

obj-$(CONFIG_SND_PXA2XX_SOC_AC97) += snd-soc-pxa2xx-ac97.o

obj-$(CONFIG_SND_PXA2XX_SOC_I2S) += snd-soc-pxa2xx-i2s.o

obj-$(CONFIG_SND_PXA_SOC_SSP) += snd-soc-pxa-ssp.o

obj-$(CONFIG_SND_MMP_SOC) += snd-soc-mmp.o

obj-$(CONFIG_SND_MMP_SOC_SSPA) += snd-soc-mmp-sspa.o



# PXA Machine Support

snd-soc-corgi-objs := corgi.o

snd-soc-poodle-objs := poodle.o

snd-soc-tosa-objs := tosa.o

snd-soc-e740-objs := e740_wm9705.o

snd-soc-e750-objs := e750_wm9705.o

snd-soc-e800-objs := e800_wm9712.o

snd-soc-spitz-objs := spitz.o

snd-soc-em-x270-objs := em-x270.o

snd-soc-palm27x-objs := palm27x.o

snd-soc-zylonite-objs := zylonite.o

snd-soc-hx4700-objs := hx4700.o

snd-soc-magician-objs := magician.o

snd-soc-mioa701-objs := mioa701_wm9713.o

snd-soc-z2-objs := z2.o

snd-soc-brownstone-objs := brownstone.o

snd-soc-ttc-dkb-objs := ttc-dkb.o



obj-$(CONFIG_SND_PXA2XX_SOC_CORGI) += snd-soc-corgi.o

obj-$(CONFIG_SND_PXA2XX_SOC_POODLE) += snd-soc-poodle.o

obj-$(CONFIG_SND_PXA2XX_SOC_TOSA) += snd-soc-tosa.o

obj-$(CONFIG_SND_PXA2XX_SOC_E740) += snd-soc-e740.o

obj-$(CONFIG_SND_PXA2XX_SOC_E750) += snd-soc-e750.o

obj-$(CONFIG_SND_PXA2XX_SOC_E800) += snd-soc-e800.o

obj-$(CONFIG_SND_PXA2XX_SOC_SPITZ) += snd-soc-spitz.o
 
obj-$(CONFIG_SND_PXA2XX_SOC_EM_X270) += snd-soc-em-x270.o

obj-$(CONFIG_SND_PXA2XX_SOC_PALM27X) += snd-soc-palm27x.o

obj-$(CONFIG_SND_PXA2XX_SOC_HX4700) += snd-soc-hx4700.o

obj-$(CONFIG_SND_PXA2XX_SOC_MAGICIAN) += snd-soc-magician.o

obj-$(CONFIG_SND_PXA2XX_SOC_MIOA701) += snd-soc-mioa701.o

obj-$(CONFIG_SND_PXA2XX_SOC_Z2) += snd-soc-z2.o

obj-$(CONFIG_SND_SOC_ZYLONITE) += snd-soc-zylonite.o

obj-$(CONFIG_SND_MMP_SOC_BROWNSTONE) += snd-soc-brownstone.o

obj-$(CONFIG_SND_SOC_TTC_DKB) += snd-soc-ttc-dkb.o