mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 06:08:07 +00:00
d6748066ad
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (37 commits) MIPS: O32: Provide definition of registers ta0 .. ta3. MIPS: perf: Add Octeon support for hardware perf. MIPS: perf: Add support for 64-bit perf counters. MIPS: perf: Reorganize contents of perf support files. MIPS: perf: Cleanup formatting in arch/mips/kernel/perf_event.c MIPS: Add accessor macros for 64-bit performance counter registers. MIPS: Add probes for more Octeon II CPUs. MIPS: Add more CPU identifiers for Octeon II CPUs. MIPS: XLR, XLS: Add comment for smp setup MIPS: JZ4740: GPIO: Check correct IRQ in demux handler MIPS: JZ4740: GPIO: Simplify IRQ demuxer MIPS: JZ4740: Use generic irq chip MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines MIPS: Alchemy: kill au1xxx.h header MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header dep MIPS: Alchemy: Redo PCI as platform driver MIPS: Alchemy: more base address cleanup MIPS: Alchemy: rewrite USB platform setup. MIPS: Alchemy: abstract USB block control register access ... Fix up trivial conflicts in: arch/mips/alchemy/devboards/db1x00/platform.c drivers/ide/Kconfig drivers/mmc/host/au1xmmc.c drivers/video/Kconfig sound/mips/Kconfig
62 lines
1.4 KiB
Text
62 lines
1.4 KiB
Text
##
|
|
## Au1200/Au1550 PSC + DBDMA
|
|
##
|
|
config SND_SOC_AU1XPSC
|
|
tristate "SoC Audio for Au1200/Au1250/Au1550"
|
|
depends on MIPS_ALCHEMY
|
|
help
|
|
This option enables support for the Programmable Serial
|
|
Controllers in AC97 and I2S mode, and the Descriptor-Based DMA
|
|
Controller (DBDMA) as found on the Au1200/Au1250/Au1550 SoC.
|
|
|
|
config SND_SOC_AU1XPSC_I2S
|
|
tristate
|
|
|
|
config SND_SOC_AU1XPSC_AC97
|
|
tristate
|
|
select AC97_BUS
|
|
select SND_AC97_CODEC
|
|
select SND_SOC_AC97_BUS
|
|
|
|
##
|
|
## Au1000/1500/1100 DMA + AC97C/I2SC
|
|
##
|
|
config SND_SOC_AU1XAUDIO
|
|
tristate "SoC Audio for Au1000/Au1500/Au1100"
|
|
depends on MIPS_ALCHEMY
|
|
help
|
|
This is a driver set for the AC97 unit and the
|
|
old DMA controller as found on the Au1000/Au1500/Au1100 chips.
|
|
|
|
config SND_SOC_AU1XAC97C
|
|
tristate
|
|
select AC97_BUS
|
|
select SND_AC97_CODEC
|
|
select SND_SOC_AC97_BUS
|
|
|
|
config SND_SOC_AU1XI2SC
|
|
tristate
|
|
|
|
|
|
##
|
|
## Boards
|
|
##
|
|
config SND_SOC_DB1000
|
|
tristate "DB1000 Audio support"
|
|
depends on SND_SOC_AU1XAUDIO
|
|
select SND_SOC_AU1XAC97C
|
|
select SND_SOC_AC97_CODEC
|
|
help
|
|
Select this option to enable AC97 audio on the early DB1x00 series
|
|
of boards (DB1000/DB1500/DB1100).
|
|
|
|
config SND_SOC_DB1200
|
|
tristate "DB1200 AC97+I2S audio support"
|
|
depends on SND_SOC_AU1XPSC
|
|
select SND_SOC_AU1XPSC_AC97
|
|
select SND_SOC_AC97_CODEC
|
|
select SND_SOC_AU1XPSC_I2S
|
|
select SND_SOC_WM8731
|
|
help
|
|
Select this option to enable audio (AC97 or I2S) on the
|
|
Alchemy/AMD/RMI DB1200 demoboard.
|