046e7d685b
This update contains a fairly wide range of changes all over in sound
subdirectory, mainly because of UAPI header moves by David and __dev*
annotation removals by Bill. Other highlights are:
- Introduced the support for wallclock timestamps in ALSA PCM core
- Add the poll loop implementation for HD-audio jack detection
- Yet more VGA-switcheroo fixes for HD-audio
- New VIA HD-audio codec support
- More fixes on resource management in USB audio and MIDI drivers
- More quirks for USB-audio ASUS Xonar U3, Reloop Play, Focusrite,
Roland VG-99, etc
- Add support for FastTrack C400 usb-audio
- Clean ups in many drivers regarding firmware loading
- Add PSC724 Ultiimate Edge support to ice1712
- A few hdspm driver updates
- New Stanton SCS.1d/1m FireWire driver
- Standardisation of the logging in ASoC codes
- DT and dmaengine support for ASoC Atmel
- Support for Wolfson ADSP cores
- New drivers for Freescale/iVeia P1022 and Maxim MAX98090
- Lots of other ASoC driver fixes and developments
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iQIcBAABAgAGBQJQyYh9AAoJEGwxgFQ9KSmk95UP+wcVXRynWulCVwEnVjjWv/UM
2fIsD0RkWO4WoqEVCNCHzW27pvFC36uqLx5vtas4CoJ2CX8ufQsPqWTx6K3MY/DQ
/VJT8CI2EKPQY1Q0PySVo2nBqwcUXWWoZE47t1ZowR6cxtmgrS8lLxYJvkbfEOHF
PS8WItACqH5F5VPxGFkhPwR2OTLfaYt7ilKx82vgxSzdMAel8q/I9uS/MUv8KV+1
1s5yBvlW5eyDXKpQbP/KiMJLJ/zk1MRAKK2HftAk8pNt+Xy160NvXhbILDWKC4uT
QBRPqyIe8BmL3VlXpw3mn7nbeU7rSfc/Rbrnm2+Yb54/Wtj4PnV6Z6bg7HO610im
e/tBNHoaL7qn1iNYSC3heW11rToksd03/LK0GREvkX3Bl21T+Naaun/DY/PGIfMQ
nOXy7uVo6sVdZnN2MTWof9qeMYBSlrwQVsMde6kbYadNcXnuqUqCOx41kiAdE8t5
jfZy5QR+uDjdJgDv8/CuiCYxSjjTUfO1tdSV/VjsTK17Gfw3DWTJpeznVnoIALbZ
81HXYxb+uGZ8xDr0WXGkydlnPvB6bnWu2vvfrLBkioA/p60EDNCtgKo1y3NzQGh8
P2qILNhXIRrS2EoAScQOb6F1RPsvbDN9PbihnkShX3r7DXyeynr9jgPy3L2vf0bR
xyu0jtQiqYb34ss7qqdz
=IIsz
-----END PGP SIGNATURE-----
Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai:
"This update contains a fairly wide range of changes all over in sound
subdirectory, mainly because of UAPI header moves by David and __dev*
annotation removals by Bill. Other highlights are:
- Introduced the support for wallclock timestamps in ALSA PCM core
- Add the poll loop implementation for HD-audio jack detection
- Yet more VGA-switcheroo fixes for HD-audio
- New VIA HD-audio codec support
- More fixes on resource management in USB audio and MIDI drivers
- More quirks for USB-audio ASUS Xonar U3, Reloop Play, Focusrite,
Roland VG-99, etc
- Add support for FastTrack C400 usb-audio
- Clean ups in many drivers regarding firmware loading
- Add PSC724 Ultiimate Edge support to ice1712
- A few hdspm driver updates
- New Stanton SCS.1d/1m FireWire driver
- Standardisation of the logging in ASoC codes
- DT and dmaengine support for ASoC Atmel
- Support for Wolfson ADSP cores
- New drivers for Freescale/iVeia P1022 and Maxim MAX98090
- Lots of other ASoC driver fixes and developments"
Fix up trivial conflicts. And go out on a limb and assume the dts file
'status' field of one of the conflicting things was supposed to be
"disabled", not "disable" like in pretty much all other cases.
* tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (341 commits)
ALSA: hda - Move runtime PM check to runtime_idle callback
ALSA: hda - Add stereo-dmic fixup for Acer Aspire One 522
ALSA: hda - Avoid doubly suspend after vga switcheroo
ALSA: usb-audio: Enable S/PDIF on the ASUS Xonar U3
ALSA: hda - Check validity of CORB/RIRB WP reads
ALSA: hda - use usleep_range in link reset and change timeout check
ALSA: HDA: VIA: Add support for codec VT1808.
ALSA: HDA: VIA Add support for codec VT1705CF.
ASoC: codecs: remove __dev* attributes
ASoC: utils: remove __dev* attributes
ASoC: ux500: remove __dev* attributes
ASoC: txx9: remove __dev* attributes
ASoC: tegra: remove __dev* attributes
ASoC: spear: remove __dev* attributes
ASoC: sh: remove __dev* attributes
ASoC: s6000: remove __dev* attributes
ASoC: OMAP: remove __dev* attributes
ASoC: nuc900: remove __dev* attributes
ASoC: mxs: remove __dev* attributes
ASoC: kirkwood: remove __dev* attributes
...
160 lines
6.1 KiB
C
160 lines
6.1 KiB
C
/* arch/arm/plat-samsung/include/plat/devs.h
|
|
*
|
|
* Copyright (c) 2011 Samsung Electronics Co., Ltd.
|
|
* http://www.samsung.com
|
|
*
|
|
* Copyright (c) 2004 Simtec Electronics
|
|
* Ben Dooks <ben@simtec.co.uk>
|
|
*
|
|
* Header file for s3c2410 standard platform devices
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#ifndef __PLAT_DEVS_H
|
|
#define __PLAT_DEVS_H __FILE__
|
|
|
|
#include <linux/platform_device.h>
|
|
|
|
struct s3c24xx_uart_resources {
|
|
struct resource *resources;
|
|
unsigned long nr_resources;
|
|
};
|
|
|
|
extern struct s3c24xx_uart_resources s3c2410_uart_resources[];
|
|
extern struct s3c24xx_uart_resources s3c64xx_uart_resources[];
|
|
extern struct s3c24xx_uart_resources s5p_uart_resources[];
|
|
extern struct s3c24xx_uart_resources exynos4_uart_resources[];
|
|
extern struct s3c24xx_uart_resources exynos5_uart_resources[];
|
|
|
|
extern struct platform_device *s3c24xx_uart_devs[];
|
|
extern struct platform_device *s3c24xx_uart_src[];
|
|
|
|
extern struct platform_device s3c64xx_device_ac97;
|
|
extern struct platform_device s3c64xx_device_iis0;
|
|
extern struct platform_device s3c64xx_device_iis1;
|
|
extern struct platform_device s3c64xx_device_iisv4;
|
|
extern struct platform_device s3c64xx_device_onenand1;
|
|
extern struct platform_device s3c64xx_device_pcm0;
|
|
extern struct platform_device s3c64xx_device_pcm1;
|
|
extern struct platform_device s3c64xx_device_spi0;
|
|
extern struct platform_device s3c64xx_device_spi1;
|
|
extern struct platform_device s3c64xx_device_spi2;
|
|
|
|
extern struct platform_device s3c_device_adc;
|
|
extern struct platform_device s3c_device_cfcon;
|
|
extern struct platform_device s3c_device_fb;
|
|
extern struct platform_device s3c_device_hwmon;
|
|
extern struct platform_device s3c_device_hsmmc0;
|
|
extern struct platform_device s3c_device_hsmmc1;
|
|
extern struct platform_device s3c_device_hsmmc2;
|
|
extern struct platform_device s3c_device_hsmmc3;
|
|
extern struct platform_device s3c_device_i2c0;
|
|
extern struct platform_device s3c_device_i2c1;
|
|
extern struct platform_device s3c_device_i2c2;
|
|
extern struct platform_device s3c_device_i2c3;
|
|
extern struct platform_device s3c_device_i2c4;
|
|
extern struct platform_device s3c_device_i2c5;
|
|
extern struct platform_device s3c_device_i2c6;
|
|
extern struct platform_device s3c_device_i2c7;
|
|
extern struct platform_device s3c_device_iis;
|
|
extern struct platform_device s3c_device_lcd;
|
|
extern struct platform_device s3c_device_nand;
|
|
extern struct platform_device s3c_device_ohci;
|
|
extern struct platform_device s3c_device_onenand;
|
|
extern struct platform_device s3c_device_rtc;
|
|
extern struct platform_device s3c_device_sdi;
|
|
extern struct platform_device s3c_device_spi0;
|
|
extern struct platform_device s3c_device_spi1;
|
|
extern struct platform_device s3c_device_ts;
|
|
extern struct platform_device s3c_device_timer[];
|
|
extern struct platform_device s3c_device_usbgadget;
|
|
extern struct platform_device s3c_device_usb_hsotg;
|
|
extern struct platform_device s3c_device_usb_hsudc;
|
|
extern struct platform_device s3c_device_wdt;
|
|
|
|
extern struct platform_device s5p_device_ehci;
|
|
extern struct platform_device s5p_device_fimc0;
|
|
extern struct platform_device s5p_device_fimc1;
|
|
extern struct platform_device s5p_device_fimc2;
|
|
extern struct platform_device s5p_device_fimc3;
|
|
extern struct platform_device s5p_device_fimc_md;
|
|
extern struct platform_device s5p_device_jpeg;
|
|
extern struct platform_device s5p_device_g2d;
|
|
extern struct platform_device s5p_device_fimd0;
|
|
extern struct platform_device s5p_device_hdmi;
|
|
extern struct platform_device s5p_device_i2c_hdmiphy;
|
|
extern struct platform_device s5p_device_mfc;
|
|
extern struct platform_device s5p_device_mfc_l;
|
|
extern struct platform_device s5p_device_mfc_r;
|
|
extern struct platform_device s5p_device_mipi_csis0;
|
|
extern struct platform_device s5p_device_mipi_csis1;
|
|
extern struct platform_device s5p_device_mixer;
|
|
extern struct platform_device s5p_device_onenand;
|
|
extern struct platform_device s5p_device_sdo;
|
|
|
|
extern struct platform_device s5p6440_device_iis;
|
|
extern struct platform_device s5p6440_device_pcm;
|
|
|
|
extern struct platform_device s5p6450_device_iis0;
|
|
extern struct platform_device s5p6450_device_iis1;
|
|
extern struct platform_device s5p6450_device_iis2;
|
|
extern struct platform_device s5p6450_device_pcm0;
|
|
|
|
|
|
extern struct platform_device s5pc100_device_ac97;
|
|
extern struct platform_device s5pc100_device_iis0;
|
|
extern struct platform_device s5pc100_device_iis1;
|
|
extern struct platform_device s5pc100_device_iis2;
|
|
extern struct platform_device s5pc100_device_pcm0;
|
|
extern struct platform_device s5pc100_device_pcm1;
|
|
extern struct platform_device s5pc100_device_spdif;
|
|
|
|
extern struct platform_device s5pv210_device_ac97;
|
|
extern struct platform_device s5pv210_device_iis0;
|
|
extern struct platform_device s5pv210_device_iis1;
|
|
extern struct platform_device s5pv210_device_iis2;
|
|
extern struct platform_device s5pv210_device_pcm0;
|
|
extern struct platform_device s5pv210_device_pcm1;
|
|
extern struct platform_device s5pv210_device_pcm2;
|
|
extern struct platform_device s5pv210_device_spdif;
|
|
|
|
extern struct platform_device exynos4_device_ac97;
|
|
extern struct platform_device exynos4_device_ahci;
|
|
extern struct platform_device exynos4_device_i2s0;
|
|
extern struct platform_device exynos4_device_i2s1;
|
|
extern struct platform_device exynos4_device_i2s2;
|
|
extern struct platform_device exynos4_device_ohci;
|
|
extern struct platform_device exynos4_device_pcm0;
|
|
extern struct platform_device exynos4_device_pcm1;
|
|
extern struct platform_device exynos4_device_pcm2;
|
|
extern struct platform_device exynos4_device_spdif;
|
|
|
|
extern struct platform_device samsung_asoc_idma;
|
|
extern struct platform_device samsung_device_keypad;
|
|
|
|
/* s3c2440 specific devices */
|
|
|
|
#ifdef CONFIG_CPU_S3C2440
|
|
|
|
extern struct platform_device s3c_device_camif;
|
|
extern struct platform_device s3c_device_ac97;
|
|
|
|
#endif
|
|
|
|
/**
|
|
* s3c_set_platdata() - helper for setting platform data
|
|
* @pd: The default platform data for this device.
|
|
* @pdsize: The size of the platform data.
|
|
* @pdev: Pointer to the device to fill in.
|
|
*
|
|
* This helper replaces a number of calls that copy and then set the
|
|
* platform data of the device.
|
|
*/
|
|
extern void *s3c_set_platdata(void *pd, size_t pdsize,
|
|
struct platform_device *pdev);
|
|
|
|
#endif /* __PLAT_DEVS_H */
|