forked from Minki/linux
d4371f94bc
It was holiday season, so no wonder that there are little changes in
framework level, although diffstat shows quite many changes spreaded
over sound/* directories. Most of changes are cleanups, code
refactoring and fixes.
Some highlights:
- Removal of OSS sleep_on usages by Arnd
- Simplified memalloc helper codes, drop obsoleted features;
now it's built into PCM driver instead of an individual module
- Warn if PCM buffer preallocation fails, which will show page
allocation issues more clearly
- Compress offload API updates for sample rates by Vinod
- PCM glitch workaround on ctxfi emu20k1 by Sarah
- Drop cs46xx DSP blobs, using firmware loader now
- USB-audio quitks for Plantronics Gamecom 780, Creative VF0420,
and Focusrite Saffire 6
HD-audio specifics:
- Standardize Kconfigs of HD-audio codec drivers;
now "make localmodconfig" recognizes configs properly (finally!)
- Parallel PM implementation by Mengdong
- BayleyBay/ValleyView2 board fixups
- Broadwell audio support
- Runtime PM improvement (PantherPoint, etc)
- Quirks: Dell subwooer, Gigabyte mobo jack detection oddity,
Dell AiO click noise fixes, Dell headset mic fixes, etc
- Automatic bind with HDMI codec parser without generic parser
- More AD codec fixes (since 3.12 regression) including the automatic
stereo mix support
- Common Thinkpad ACPI helper for Realtek and Conexant codecs
ASoC specifics:
- Update to the generic DMA code to support deferred probe and managed
resources
- New drivers for BCM2835 (used in Raspberry Pi), Tegra with MAX98090
and Analog Devices AXI I2S and S/PDIF controller IPs
- Device tree support for the simple card, max98090 and cs42l52
- Conversion of the Samsung drivers to native dmaengine, making them
multiplatform compatible and hopefully helping keep them more modern
and up to date.
- More regmap conversions, including a very welcome one for twl6040
from Peter Ujfalusi
- A big overhaul of the DaVinci drivers also from Peter Ujfalusi
- Lots of DMA updates from Lars-Peter
- Improvements to the constraints handling code from Lars-Peter
- A very helpful conversion of the TWL4030 driver to regmap from Peter
- A new driver for the Freescale ESAI controller from Nicolin Chen
- Conversion of some of the drivers to use params_width()
- Extensions to DPCM for use with compressed audio from Liam
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQIcBAABAgAGBQJS3ocNAAoJEGwxgFQ9KSmkZEcP/3ImC7SrUC8NbCJF51tm31jk
Ed6eKNEJPcVEbUkZ6QN215w8OkgGCXnxMge1Mhu5VGFJiIjmdtls297DqJAXUL3d
l3/icCeYK7BN7ocMyaFRnwUipRtSiI0YuuU5cIcdbAoSrI8gtc+yZES82ivjOY4i
cFs/owDc5nqTNtx414N14a0NQOTJU5gMNjOVqCno8VLsUUUlg3nEY0kyHKiBNe4O
EqYmHHS2L4xu3tqxmh8pvd82OUnO53rMJXRntU6nuw1sgY7o+4pjmi3k10l1SHpH
Rv0dB8PunY72AnxPMPORISKHJ3isKPz0QdZVtdj0+WrFUwD1vrFE3Yktq3hYQvwd
NrOcMoEosQQhDcD74SSt1xfKVpW+gJazN4154VK/O2PKdNHLdc3/4rw95tYA8ywO
/jnDH+qNlzHSrAdq2Fj21FfTKOYvow8RBB+Rp05RymKESwJ9sk0yLLN1QgDoJXwW
kNBH6SxMxhaHOch0PzXidErydxnB2+j59i485DmJlI1GsjJTMFZvm8f85OlNstrn
ad5OsXKfBkS78oT5vBeDkp5uH56hPiyP89lhnd+cE/MgjBHHnQliJ8thLumgUjN+
vf6VGnpJywacH/VYrA2v8xKj514Q0CgsEydYtq5Z4J6WQVKrECOYlgYgpbJt6dsC
WE9DYZECRVCp74N8WB+z
=IWy2
-----END PGP SIGNATURE-----
Merge tag 'sound-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai:
"It was holiday season, so no wonder that there are little changes in
framework level, although diffstat shows quite many changes spreaded
over sound/* directories. Most of changes are cleanups, code
refactoring and fixes.
Some highlights:
- Removal of OSS sleep_on usages by Arnd
- Simplified memalloc helper codes, drop obsoleted features; now it's
built into PCM driver instead of an individual module
- Warn if PCM buffer preallocation fails, which will show page
allocation issues more clearly
- Compress offload API updates for sample rates by Vinod
- PCM glitch workaround on ctxfi emu20k1 by Sarah
- Drop cs46xx DSP blobs, using firmware loader now
- USB-audio quitks for Plantronics Gamecom 780, Creative VF0420, and
Focusrite Saffire 6
HD-audio specifics:
- Standardize Kconfigs of HD-audio codec drivers; now "make
localmodconfig" recognizes configs properly (finally!)
- Parallel PM implementation by Mengdong
- BayleyBay/ValleyView2 board fixups
- Broadwell audio support
- Runtime PM improvement (PantherPoint, etc)
- Quirks: Dell subwooer, Gigabyte mobo jack detection oddity, Dell
AiO click noise fixes, Dell headset mic fixes, etc
- Automatic bind with HDMI codec parser without generic parser
- More AD codec fixes (since 3.12 regression) including the automatic
stereo mix support
- Common Thinkpad ACPI helper for Realtek and Conexant codecs
ASoC specifics:
- Update to the generic DMA code to support deferred probe and
managed resources
- New drivers for BCM2835 (used in Raspberry Pi), Tegra with MAX98090
and Analog Devices AXI I2S and S/PDIF controller IPs
- Device tree support for the simple card, max98090 and cs42l52
- Conversion of the Samsung drivers to native dmaengine, making them
multiplatform compatible and hopefully helping keep them more
modern and up to date.
- More regmap conversions, including a very welcome one for twl6040
from Peter Ujfalusi
- A big overhaul of the DaVinci drivers also from Peter Ujfalusi
- Lots of DMA updates from Lars-Peter
- Improvements to the constraints handling code from Lars-Peter
- A very helpful conversion of the TWL4030 driver to regmap from Peter
- A new driver for the Freescale ESAI controller from Nicolin Chen
- Conversion of some of the drivers to use params_width()
- Extensions to DPCM for use with compressed audio from Liam"
* tag 'sound-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (396 commits)
ASoC: dapm: Fix double prefix addition
ASoC: compress: Add suport for DPCM into compressed audio
ASoC: DPCM: make some DPCM API calls non static for compressed usage
ASoC: core: Fix possible NULL pointer dereference of pcm->config
ALSA: hda - add headset mic detect quirks for some Dell machines
ASoC: tlv320aic32x4: Fix regmap range_min
ASoC: core: Return -ENOTSUPP from set_sysclk() if no operation provided
ASoC: dapm: Change prototype of soc_widget_read
ASoC: samsung: Remove SND_DMAENGINE_PCM_FLAG_NO_RESIDUE flag
ASoC: axi-{spdif,i2s}: Remove SND_DMAENGINE_PCM_FLAG_NO_RESIDUE flag
ASoC: generic-dmaengine-pcm: Check DMA residue granularity
ASoC: generic-dmaengine-pcm: Check NO_RESIDUE flag at runtime
dma: pl330: Set residue_granularity
dma: Indicate residue granularity in dma_slave_caps
ASoC: simple-card: fix one bug to writing to the platform data
ASoC: pcm: Use snd_pcm_rate_mask_intersect() helper
ALSA: Add helper function for intersecting two rate masks
ASoC: s6000: Don't mix SNDRV_PCM_RATE_CONTINUOUS with specific rates
ASoC: fsl: Don't mix SNDRV_PCM_RATE_CONTINUOUS with specific rates
ASoC: pcm: Properly initialize hw->rate_max
...
316 lines
7.2 KiB
Plaintext
316 lines
7.2 KiB
Plaintext
# Copyright 2008 Openmoko, Inc.
|
|
# Simtec Electronics, Ben Dooks <ben@simtec.co.uk>
|
|
#
|
|
# Licensed under GPLv2
|
|
|
|
if ARCH_S3C64XX
|
|
|
|
# Configuration options for the S3C6410 CPU
|
|
|
|
config CPU_S3C6400
|
|
bool
|
|
help
|
|
Enable S3C6400 CPU support
|
|
|
|
config CPU_S3C6410
|
|
bool
|
|
help
|
|
Enable S3C6410 CPU support
|
|
|
|
config S3C64XX_PL080
|
|
bool "S3C64XX DMA using generic PL08x driver"
|
|
select AMBA_PL08X
|
|
select SAMSUNG_DMADEV
|
|
|
|
config S3C64XX_SETUP_SDHCI
|
|
bool
|
|
select S3C64XX_SETUP_SDHCI_GPIO
|
|
help
|
|
Internal configuration for default SDHCI setup for S3C6400 and
|
|
S3C6410 SoCs.
|
|
|
|
config S3C64XX_DEV_ONENAND1
|
|
bool
|
|
help
|
|
Compile in platform device definition for OneNAND1 controller
|
|
|
|
# platform specific device setup
|
|
|
|
config S3C64XX_SETUP_I2C0
|
|
bool
|
|
default y
|
|
help
|
|
Common setup code for i2c bus 0.
|
|
|
|
Note, currently since i2c0 is always compiled, this setup helper
|
|
is always compiled with it.
|
|
|
|
config S3C64XX_SETUP_I2C1
|
|
bool
|
|
help
|
|
Common setup code for i2c bus 1.
|
|
|
|
config S3C64XX_SETUP_IDE
|
|
bool
|
|
help
|
|
Common setup code for S3C64XX IDE.
|
|
|
|
config S3C64XX_SETUP_FB_24BPP
|
|
bool
|
|
help
|
|
Common setup code for S3C64XX with an 24bpp RGB display helper.
|
|
|
|
config S3C64XX_SETUP_KEYPAD
|
|
bool
|
|
help
|
|
Common setup code for S3C64XX KEYPAD GPIO configurations
|
|
|
|
config S3C64XX_SETUP_SDHCI_GPIO
|
|
bool
|
|
help
|
|
Common setup code for S3C64XX SDHCI GPIO configurations
|
|
|
|
config S3C64XX_SETUP_SPI
|
|
bool
|
|
help
|
|
Common setup code for SPI GPIO configurations
|
|
|
|
config S3C64XX_SETUP_USB_PHY
|
|
bool
|
|
help
|
|
Common setup code for USB PHY controller
|
|
|
|
# S36400 Macchine support
|
|
|
|
config MACH_SMDK6400
|
|
bool "SMDK6400"
|
|
select CPU_S3C6400
|
|
select S3C64XX_SETUP_SDHCI
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_NAND
|
|
help
|
|
Machine support for the Samsung SMDK6400
|
|
|
|
# S3C6410 machine support
|
|
|
|
config MACH_ANW6410
|
|
bool "A&W6410"
|
|
select CPU_S3C6410
|
|
select S3C64XX_SETUP_FB_24BPP
|
|
select S3C_DEV_FB
|
|
help
|
|
Machine support for the A&W6410
|
|
|
|
config MACH_MINI6410
|
|
bool "MINI6410"
|
|
select CPU_S3C6410
|
|
select S3C64XX_SETUP_FB_24BPP
|
|
select S3C64XX_SETUP_SDHCI
|
|
select S3C_DEV_FB
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC1
|
|
select S3C_DEV_NAND
|
|
select S3C_DEV_USB_HOST
|
|
select SAMSUNG_DEV_ADC
|
|
select SAMSUNG_DEV_TS
|
|
help
|
|
Machine support for the FriendlyARM MINI6410
|
|
|
|
config MACH_REAL6410
|
|
bool "REAL6410"
|
|
select CPU_S3C6410
|
|
select S3C64XX_SETUP_FB_24BPP
|
|
select S3C64XX_SETUP_SDHCI
|
|
select S3C_DEV_FB
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC1
|
|
select S3C_DEV_NAND
|
|
select S3C_DEV_USB_HOST
|
|
select SAMSUNG_DEV_ADC
|
|
select SAMSUNG_DEV_TS
|
|
help
|
|
Machine support for the CoreWind REAL6410
|
|
|
|
config MACH_SMDK6410
|
|
bool "SMDK6410"
|
|
select CPU_S3C6410
|
|
select HAVE_S3C2410_WATCHDOG if WATCHDOG
|
|
select S3C64XX_SETUP_FB_24BPP
|
|
select S3C64XX_SETUP_I2C1
|
|
select S3C64XX_SETUP_IDE
|
|
select S3C64XX_SETUP_KEYPAD
|
|
select S3C64XX_SETUP_SDHCI
|
|
select S3C64XX_SETUP_USB_PHY
|
|
select S3C_DEV_FB
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC1
|
|
select S3C_DEV_I2C1
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_USB_HOST
|
|
select S3C_DEV_USB_HSOTG
|
|
select S3C_DEV_WDT
|
|
select SAMSUNG_DEV_ADC
|
|
select SAMSUNG_DEV_BACKLIGHT
|
|
select SAMSUNG_DEV_IDE
|
|
select SAMSUNG_DEV_KEYPAD
|
|
select SAMSUNG_DEV_PWM
|
|
select SAMSUNG_DEV_TS
|
|
help
|
|
Machine support for the Samsung SMDK6410
|
|
|
|
# At least some of the SMDK6410s were shipped with the card detect
|
|
# for the MMC/SD slots connected to the same input. This means that
|
|
# either the boards need to be altered to have channel0 to an alternate
|
|
# configuration or that only one slot can be used.
|
|
|
|
choice
|
|
prompt "SMDK6410 MMC/SD slot setup"
|
|
depends on MACH_SMDK6410
|
|
|
|
config SMDK6410_SD_CH0
|
|
bool "Use channel 0 only"
|
|
depends on MACH_SMDK6410
|
|
help
|
|
Select CON7 (channel 0) as the MMC/SD slot, as
|
|
at least some SMDK6410 boards come with the
|
|
resistors fitted so that the card detects for
|
|
channels 0 and 1 are the same.
|
|
|
|
config SMDK6410_SD_CH1
|
|
bool "Use channel 1 only"
|
|
depends on MACH_SMDK6410
|
|
help
|
|
Select CON6 (channel 1) as the MMC/SD slot, as
|
|
at least some SMDK6410 boards come with the
|
|
resistors fitted so that the card detects for
|
|
channels 0 and 1 are the same.
|
|
|
|
endchoice
|
|
|
|
config SMDK6410_WM1190_EV1
|
|
bool "Support Wolfson Microelectronics 1190-EV1 PMIC card"
|
|
depends on MACH_SMDK6410
|
|
select MFD_WM8350_I2C
|
|
select REGULATOR
|
|
select REGULATOR_WM8350
|
|
help
|
|
The Wolfson Microelectronics 1190-EV1 is a WM835x based PMIC
|
|
and audio daughtercard for the Samsung SMDK6410 reference
|
|
platform. Enabling this option will build support for this
|
|
module into the kernel. The presence of the module will be
|
|
detected at runtime so the resulting kernel can be used
|
|
with or without the 1190-EV1 fitted.
|
|
|
|
config SMDK6410_WM1192_EV1
|
|
bool "Support Wolfson Microelectronics 1192-EV1 PMIC card"
|
|
depends on MACH_SMDK6410
|
|
select MFD_WM831X
|
|
select MFD_WM831X_I2C
|
|
select REGULATOR
|
|
select REGULATOR_WM831X
|
|
help
|
|
The Wolfson Microelectronics 1192-EV1 is a WM831x based PMIC
|
|
daughtercard for the Samsung SMDK6410 reference platform.
|
|
Enabling this option will build support for this module into
|
|
the kernel. The presence of the daughtercard will be
|
|
detected at runtime so the resulting kernel can be used
|
|
with or without the 1192-EV1 fitted.
|
|
|
|
config MACH_NCP
|
|
bool "NCP"
|
|
select CPU_S3C6410
|
|
select S3C64XX_SETUP_I2C1
|
|
select S3C_DEV_HSMMC1
|
|
select S3C_DEV_I2C1
|
|
help
|
|
Machine support for the Samsung NCP
|
|
|
|
config MACH_HMT
|
|
bool "Airgoo HMT"
|
|
select CPU_S3C6410
|
|
select S3C64XX_SETUP_FB_24BPP
|
|
select S3C_DEV_FB
|
|
select S3C_DEV_NAND
|
|
select S3C_DEV_USB_HOST
|
|
select SAMSUNG_DEV_PWM
|
|
help
|
|
Machine support for the Airgoo HMT
|
|
|
|
config MACH_SMARTQ
|
|
bool
|
|
select CPU_S3C6410
|
|
select S3C64XX_SETUP_FB_24BPP
|
|
select S3C64XX_SETUP_SDHCI
|
|
select S3C64XX_SETUP_USB_PHY
|
|
select S3C_DEV_FB
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC1
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_HWMON
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_USB_HOST
|
|
select S3C_DEV_USB_HSOTG
|
|
select SAMSUNG_DEV_ADC
|
|
select SAMSUNG_DEV_PWM
|
|
select SAMSUNG_DEV_TS
|
|
help
|
|
Shared machine support for SmartQ 5/7
|
|
|
|
config MACH_SMARTQ5
|
|
bool "SmartQ 5"
|
|
select MACH_SMARTQ
|
|
help
|
|
Machine support for the SmartQ 5
|
|
|
|
config MACH_SMARTQ7
|
|
bool "SmartQ 7"
|
|
select MACH_SMARTQ
|
|
help
|
|
Machine support for the SmartQ 7
|
|
|
|
config MACH_WLF_CRAGG_6410
|
|
bool "Wolfson Cragganmore 6410"
|
|
select CPU_S3C6410
|
|
select I2C
|
|
select LEDS_GPIO_REGISTER
|
|
select S3C64XX_DEV_SPI0
|
|
select S3C64XX_SETUP_FB_24BPP
|
|
select S3C64XX_SETUP_I2C1
|
|
select S3C64XX_SETUP_IDE
|
|
select S3C64XX_SETUP_KEYPAD
|
|
select S3C64XX_SETUP_SDHCI
|
|
select S3C64XX_SETUP_SPI
|
|
select S3C64XX_SETUP_USB_PHY
|
|
select S3C_DEV_FB
|
|
select S3C_DEV_HSMMC
|
|
select S3C_DEV_HSMMC1
|
|
select S3C_DEV_HSMMC2
|
|
select S3C_DEV_I2C1
|
|
select S3C_DEV_RTC
|
|
select S3C_DEV_USB_HOST
|
|
select S3C_DEV_USB_HSOTG
|
|
select S3C_DEV_WDT
|
|
select SAMSUNG_DEV_ADC
|
|
select SAMSUNG_DEV_KEYPAD
|
|
select SAMSUNG_DEV_PWM
|
|
help
|
|
Machine support for the Wolfson Cragganmore S3C6410 variant.
|
|
|
|
config MACH_S3C64XX_DT
|
|
bool "Samsung S3C6400/S3C6410 machine using Device Tree"
|
|
select CLKSRC_OF
|
|
select CPU_S3C6400
|
|
select CPU_S3C6410
|
|
select PINCTRL
|
|
select PINCTRL_S3C64XX
|
|
select USE_OF
|
|
help
|
|
Machine support for Samsung S3C6400/S3C6410 machines with Device Tree
|
|
enabled.
|
|
Select this if a fdt blob is available for your S3C64XX SoC based
|
|
board.
|
|
Note: This is under development and not all peripherals can be
|
|
supported with this machine file.
|
|
|
|
endif
|