p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ARM: pxa: move mach/sound.h to linux/platform_data/ 

This is a basically a platform_data file, so move it out of
the mach/* header directory.

Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Tomas Cech <sleep_walker@suse.com>
Cc: Sergey Lapin <slapin@ossfans.org>
Acked-by: Mark Brown <broonie@kernel.org>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: alsa-devel@alsa-project.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2019-09-02 00:02:08 +02:00
parent 2a0fd0a95a
commit 22f0866513
42 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-pxa/balloon3.c
View File

@ -41,7 +41,7 @@
#include "pxa27x.h"
#include <mach/balloon3.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
#include "udc.h"

2
arch/arm/mach-pxa/cm-x300.c
View File

@ -53,7 +53,7 @@
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/mtd-nand-pxa3xx.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <linux/platform_data/usb-pxa3xx-ulpi.h>
#include <asm/mach/map.h>

2
arch/arm/mach-pxa/colibri-pxa270.c
View File

@ -23,7 +23,7 @@
#include <asm/mach-types.h>
#include <linux/sizes.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include "colibri.h"
#include "pxa27x.h"

2
arch/arm/mach-pxa/colibri-pxa300.c
View File

@ -24,7 +24,7 @@
#include "colibri.h"
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/video-pxafb.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include "generic.h"
#include "devices.h"

2
arch/arm/mach-pxa/colibri-pxa320.c
View File

@ -24,7 +24,7 @@
#include "colibri.h"
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include "pxa27x-udc.h"
#include "udc.h"

2
arch/arm/mach-pxa/csb726.c
View File

@ -22,7 +22,7 @@
#include "pxa27x.h"
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <mach/smemc.h>
#include "generic.h"

2
arch/arm/mach-pxa/devices.c
View File

@ -20,7 +20,7 @@
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/keypad-pxa27x.h>
#include <linux/platform_data/media/camera-pxa.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <linux/platform_data/mmp_dma.h>
#include <linux/platform_data/mtd-nand-pxa3xx.h>

2
arch/arm/mach-pxa/eseries.c
View File

@ -34,7 +34,7 @@
#include "pxa25x.h"
#include <mach/eseries-gpio.h>
#include "eseries-irq.h"
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <linux/platform_data/video-pxafb.h>
#include "udc.h"
#include <linux/platform_data/irda-pxaficp.h>

2
arch/arm/mach-pxa/lpd270.c
View File

@ -39,7 +39,7 @@
#include "pxa27x.h"
#include "lpd270.h"
#include <mach/addr-map.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/irda-pxaficp.h>

2
arch/arm/mach-pxa/lubbock.c
View File

@ -45,7 +45,7 @@
#include <asm/hardware/sa1111.h>
#include "pxa25x.h"
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <mach/lubbock.h>
#include "udc.h"
#include <linux/platform_data/irda-pxaficp.h>

2
arch/arm/mach-pxa/mainstone.c
View File

@ -45,7 +45,7 @@
#include "pxa27x.h"
#include "mainstone.h"
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/irda-pxaficp.h>

2
arch/arm/mach-pxa/mioa701.c
View File

@ -41,7 +41,7 @@
#include "udc.h"
#include "pxa27x-udc.h"
#include <linux/platform_data/media/camera-pxa.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <mach/smemc.h>
#include "mioa701.h"

2
arch/arm/mach-pxa/palm27x.c
View File

@ -25,7 +25,7 @@
#include <asm/mach/map.h>
#include "pxa27x.h"
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/irda-pxaficp.h>

2
arch/arm/mach-pxa/palmld.c
View File

@ -29,7 +29,7 @@
#include <asm/mach/map.h>
#include "pxa27x.h"
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <mach/palmld.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/video-pxafb.h>

2
arch/arm/mach-pxa/palmt5.c
View File

@ -29,7 +29,7 @@
#include <asm/mach/map.h>
#include "pxa27x.h"
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include "palmt5.h"
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/video-pxafb.h>

2
arch/arm/mach-pxa/palmtc.c
View File

@ -29,7 +29,7 @@
#include <asm/mach/map.h>
#include "pxa25x.h"
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <mach/palmtc.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/video-pxafb.h>

2
arch/arm/mach-pxa/palmte2.c
View File

@ -29,7 +29,7 @@
#include <asm/mach/map.h>
#include "pxa25x.h"
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include "palmte2.h"
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/video-pxafb.h>

2
arch/arm/mach-pxa/palmtreo.c
View File

@ -29,7 +29,7 @@
#include "pxa27x.h"
#include "pxa27x-udc.h"
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include "palmtreo.h"
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/video-pxafb.h>

2
arch/arm/mach-pxa/palmtx.c
View File

@ -32,7 +32,7 @@
#include <asm/mach/map.h>
#include "pxa27x.h"
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <mach/palmtx.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/video-pxafb.h>

2
arch/arm/mach-pxa/palmz72.c
View File

@ -34,7 +34,7 @@
#include <asm/mach/map.h>
#include "pxa27x.h"
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include "palmz72.h"
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/video-pxafb.h>

2
arch/arm/mach-pxa/pcm990-baseboard.c
View File

@ -26,7 +26,7 @@
#include <asm/mach/map.h>
#include "pxa27x.h"
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include "pcm990_baseboard.h"

2
arch/arm/mach-pxa/tosa.c
View File

@ -45,7 +45,7 @@
#include <linux/platform_data/mmc-pxamci.h>
#include "udc.h"
#include "tosa_bt.h"
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <mach/smemc.h>
#include <asm/mach/arch.h>

2
arch/arm/mach-pxa/trizeps4.c
View File

@ -41,7 +41,7 @@
#include "pxa27x.h"
#include <mach/trizeps4.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/irda-pxaficp.h>

2
arch/arm/mach-pxa/viper.c
View File

@ -46,7 +46,7 @@
#include <linux/syscore_ops.h>
#include "pxa25x.h"
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <linux/platform_data/video-pxafb.h>
#include "regs-uart.h"
#include <linux/platform_data/pcmcia-pxa2xx_viper.h>

2
arch/arm/mach-pxa/vpac270.c
View File

@ -29,7 +29,7 @@
#include <asm/mach/arch.h>
#include "pxa27x.h"
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <mach/vpac270.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/video-pxafb.h>

2
arch/arm/mach-pxa/zeus.c
View File

@ -46,7 +46,7 @@
#include "udc.h"
#include <linux/platform_data/video-pxafb.h>
#include "pm.h"
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <linux/platform_data/pcmcia-pxa2xx_viper.h>
#include "zeus.h"
#include <mach/smemc.h>

2
arch/arm/mach-pxa/zylonite.c
View File

@ -25,7 +25,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include "pxa3xx.h"
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <linux/platform_data/video-pxafb.h>
#include "zylonite.h"
#include <linux/platform_data/mmc-pxamci.h>

4
arch/arm/mach-pxa/include/mach/audio.h → include/linux/platform_data/asoc-pxa.h
View File

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __ASM_ARCH_AUDIO_H__
#define __ASM_ARCH_AUDIO_H__
#ifndef __SOC_PXA_AUDIO_H__
#define __SOC_PXA_AUDIO_H__
#include <sound/core.h>
#include <sound/pcm.h>

2
sound/arm/pxa2xx-ac97-lib.c
View File

@ -23,7 +23,7 @@
#include <mach/irqs.h>
#include <mach/regs-ac97.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
static DEFINE_MUTEX(car_mutex);
static DECLARE_WAIT_QUEUE_HEAD(gsr_wq);

2
sound/arm/pxa2xx-ac97.c
View File

@ -22,7 +22,7 @@
#include <sound/dmaengine_pcm.h>
#include <mach/regs-ac97.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
static void pxa2xx_ac97_legacy_reset(struct snd_ac97 *ac97)
{

2
sound/soc/pxa/corgi.c
View File

@ -22,7 +22,7 @@
#include <asm/mach-types.h>
#include <mach/corgi.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include "../codecs/wm8731.h"
#include "pxa2xx-i2s.h"

2
sound/soc/pxa/e740_wm9705.c
View File

@ -13,7 +13,7 @@
#include <sound/pcm.h>
#include <sound/soc.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <mach/eseries-gpio.h>
#include <asm/mach-types.h>

2
sound/soc/pxa/e750_wm9705.c
View File

@ -13,7 +13,7 @@
#include <sound/pcm.h>
#include <sound/soc.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <mach/eseries-gpio.h>
#include <asm/mach-types.h>

2
sound/soc/pxa/e800_wm9712.c
View File

@ -14,7 +14,7 @@
#include <sound/soc.h>
#include <asm/mach-types.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <mach/eseries-gpio.h>
static int e800_spk_amp_event(struct snd_soc_dapm_widget *w,

2
sound/soc/pxa/em-x270.c
View File

@ -23,7 +23,7 @@
#include <sound/soc.h>
#include <asm/mach-types.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
SND_SOC_DAILINK_DEFS(ac97,
DAILINK_COMP_ARRAY(COMP_CPU("pxa2xx-ac97")),

2
sound/soc/pxa/mioa701_wm9713.c
View File

@ -33,7 +33,7 @@
#include <linux/platform_device.h>
#include <asm/mach-types.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <sound/core.h>
#include <sound/pcm.h>

2
sound/soc/pxa/palm27x.c
View File

@ -20,7 +20,7 @@
#include <sound/jack.h>
#include <asm/mach-types.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <linux/platform_data/asoc-palm27x.h>
static struct snd_soc_jack hs_jack;

2
sound/soc/pxa/poodle.c
View File

@ -22,7 +22,7 @@
#include <asm/mach-types.h>
#include <asm/hardware/locomo.h>
#include <mach/poodle.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include "../codecs/wm8731.h"
#include "pxa2xx-i2s.h"

2
sound/soc/pxa/pxa2xx-ac97.c
View File

@ -23,7 +23,7 @@
#include <mach/pxa-regs.h>
#include <mach/regs-ac97.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
static void pxa2xx_ac97_warm_reset(struct ac97_controller *adrv)
{

2
sound/soc/pxa/pxa2xx-i2s.c
View File

@ -22,7 +22,7 @@
#include <sound/dmaengine_pcm.h>
#include <mach/pxa-regs.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include "pxa2xx-i2s.h"

2
sound/soc/pxa/tosa.c
View File

@ -24,7 +24,7 @@
#include <asm/mach-types.h>
#include <mach/tosa.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#define TOSA_HP 0
#define TOSA_MIC_INT 1

2
sound/soc/pxa/z2.c
View File

@ -21,7 +21,7 @@
#include <sound/jack.h>
#include <asm/mach-types.h>
#include <mach/audio.h>
#include <linux/platform_data/asoc-pxa.h>
#include <mach/z2.h>
#include "../codecs/wm8750.h"