mirror of
https://github.com/torvalds/linux.git
synced 2024-12-24 20:01:55 +00:00
f5a246eab9
This contains pretty many small commits covering fairly large range of
files in sound/ directory. Partly because of additional API support
and partly because of constantly developed ASoC and ARM stuff.
Some highlights:
- Introduced the helper function and documentation for exposing the
channel map via control API, as discussed in Plumbers; most of PCI
drivers are covered, will follow more drivers later
- Most of drivers have been replaced with the new PM callbacks (if
the bus is supported)
- HD-audio controller got the support of runtime PM and the support of
D3 clock-stop. Also changing the power_save option in sysfs kicks
off immediately to enable / disable the power-save mode.
- Another significant code change in HD-audio is the rewrite of
firmware loading code. Other than that, most of changes in HD-audio
are continued cleanups and standardization for the generic auto
parser and bug fixes (HBR, device-specific fixups), in addition to
the support of channel-map API.
- Addition of ASoC bindings for the compressed API, used by the
mid-x86 drivers.
- Lots of cleanups and API refreshes for ASoC codec drivers and
DaVinci.
- Conversion of OMAP to dmaengine.
- New machine driver for Wolfson Microelectronics Bells.
- New CODEC driver for Wolfson Microelectronics WM0010.
- Enhancements to the ux500 and wm2000 drivers
- A new driver for DA9055 and the support for regulator bypass mode.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iQIcBAABAgAGBQJQcpeWAAoJEGwxgFQ9KSmkpi4P/2etDDz5aEkEHNa1l4xEmFcm
ymiGTgjaalqpUAVbM/gYx9G59EFMEbzUl1BHAqE5La4wO/v9lNPb+VrdUo+B+NZ7
WSxIPWcNqdinSuoSqyYPjoPMVnhs3EMtNOqmf4jm1JOvdqA+4rO29xQVAqK/5Gfu
LpMOyPiRi5ODnbQ1BOIWwpKICioY/mLwGJudK3z0i/fYVA7gLub20f+w+sOjKIA4
wmwQAMTjAR798Cg/tVy4fQmf4SLw+c2nIgGe/PD+2gVlGXLNKBrJfMonHPTbmwKu
lmJO/EtnijNOnpbn6up7ryUQ9cSoZAUZOfdIOgmAeQgQ/LWR0f+zf2IQehSPwrul
g6hqOnQI2DNN7ugT3cYVbYnsh56TjyhnxhhxZgkapqh706QkqHGyKJNMRetzuXmP
1O//MnZJrFQWd6sOKLlTL2ZzRvnxEJcNVGaE6bbwZTfQMtPeo9l1842uIq1dLUtG
VxZb/svKUkMXv4is1dwUYUkpDsKxsgMEmabmuovceGf2N7jj/irkXgqxf6LWkaY1
JQ7ZFWUJyDzEMXRaFfzdGO15T532CfB84wvFX5xoPMwMste2AA7QuybFBVstXhKu
AtKNDgRJFUTlnLIxydpPBWdWH3UJdEaFwwsSfuNKI8OmmGKhWC/aP83k4hzueu9H
KYLvY/0ObMSMqiwh/ndQ
=uNqD
-----END PGP SIGNATURE-----
Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai:
"This contains pretty many small commits covering fairly large range of
files in sound/ directory. Partly because of additional API support
and partly because of constantly developed ASoC and ARM stuff.
Some highlights:
- Introduced the helper function and documentation for exposing the
channel map via control API, as discussed in Plumbers; most of PCI
drivers are covered, will follow more drivers later
- Most of drivers have been replaced with the new PM callbacks (if
the bus is supported)
- HD-audio controller got the support of runtime PM and the support
of D3 clock-stop. Also changing the power_save option in sysfs
kicks off immediately to enable / disable the power-save mode.
- Another significant code change in HD-audio is the rewrite of
firmware loading code. Other than that, most of changes in
HD-audio are continued cleanups and standardization for the generic
auto parser and bug fixes (HBR, device-specific fixups), in
addition to the support of channel-map API.
- Addition of ASoC bindings for the compressed API, used by the
mid-x86 drivers.
- Lots of cleanups and API refreshes for ASoC codec drivers and
DaVinci.
- Conversion of OMAP to dmaengine.
- New machine driver for Wolfson Microelectronics Bells.
- New CODEC driver for Wolfson Microelectronics WM0010.
- Enhancements to the ux500 and wm2000 drivers
- A new driver for DA9055 and the support for regulator bypass mode."
Fix up various arm soc header file reorg conflicts.
* tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (339 commits)
ALSA: hda - Add new codec ALC283 ALC290 support
ALSA: hda - avoid unneccesary indices on "Headphone Jack" controls
ALSA: hda - fix indices on boost volume on Conexant
ALSA: aloop - add locking to timer access
ALSA: hda - Fix hang caused by race during suspend.
sound: Remove unnecessary semicolon
ALSA: hda/realtek - Fix detection of ALC271X codec
ALSA: hda - Add inverted internal mic quirk for Lenovo IdeaPad U310
ALSA: hda - make Realtek/Sigmatel/Conexant use the generic unsol event
ALSA: hda - make a generic unsol event handler
ASoC: codecs: Add DA9055 codec driver
ASoC: eukrea-tlv320: Convert it to platform driver
ALSA: ASoC: add DT bindings for CS4271
ASoC: wm_hubs: Ensure volume updates are handled during class W startup
ASoC: wm5110: Adding missing volume update bits
ASoC: wm5110: Add OUT3R support
ASoC: wm5110: Add AEC loopback support
ASoC: wm5110: Rename EPOUT to HPOUT3
ASoC: arizona: Add more clock rates
ASoC: arizona: Add more DSP options for mixer input muxes
...
66 lines
2.0 KiB
C
66 lines
2.0 KiB
C
#ifndef __OMAP_PMIC_COMMON__
|
|
#define __OMAP_PMIC_COMMON__
|
|
|
|
#include "common.h"
|
|
|
|
#define TWL_COMMON_PDATA_USB (1 << 0)
|
|
#define TWL_COMMON_PDATA_BCI (1 << 1)
|
|
#define TWL_COMMON_PDATA_MADC (1 << 2)
|
|
#define TWL_COMMON_PDATA_AUDIO (1 << 3)
|
|
|
|
/* Common LDO regulators for TWL4030/TWL6030 */
|
|
#define TWL_COMMON_REGULATOR_VDAC (1 << 0)
|
|
#define TWL_COMMON_REGULATOR_VAUX1 (1 << 1)
|
|
#define TWL_COMMON_REGULATOR_VAUX2 (1 << 2)
|
|
#define TWL_COMMON_REGULATOR_VAUX3 (1 << 3)
|
|
|
|
/* TWL6030 LDO regulators */
|
|
#define TWL_COMMON_REGULATOR_VMMC (1 << 4)
|
|
#define TWL_COMMON_REGULATOR_VPP (1 << 5)
|
|
#define TWL_COMMON_REGULATOR_VUSIM (1 << 6)
|
|
#define TWL_COMMON_REGULATOR_VANA (1 << 7)
|
|
#define TWL_COMMON_REGULATOR_VCXIO (1 << 8)
|
|
#define TWL_COMMON_REGULATOR_VUSB (1 << 9)
|
|
#define TWL_COMMON_REGULATOR_CLK32KG (1 << 10)
|
|
#define TWL_COMMON_REGULATOR_V1V8 (1 << 11)
|
|
#define TWL_COMMON_REGULATOR_V2V1 (1 << 12)
|
|
|
|
/* TWL4030 LDO regulators */
|
|
#define TWL_COMMON_REGULATOR_VPLL1 (1 << 4)
|
|
#define TWL_COMMON_REGULATOR_VPLL2 (1 << 5)
|
|
|
|
|
|
struct twl4030_platform_data;
|
|
struct twl6040_platform_data;
|
|
struct i2c_board_info;
|
|
|
|
void omap_pmic_init(int bus, u32 clkrate, const char *pmic_type, int pmic_irq,
|
|
struct twl4030_platform_data *pmic_data);
|
|
void omap_pmic_late_init(void);
|
|
|
|
static inline void omap2_pmic_init(const char *pmic_type,
|
|
struct twl4030_platform_data *pmic_data)
|
|
{
|
|
omap_pmic_init(2, 2600, pmic_type, 7 + OMAP_INTC_START, pmic_data);
|
|
}
|
|
|
|
static inline void omap3_pmic_init(const char *pmic_type,
|
|
struct twl4030_platform_data *pmic_data)
|
|
{
|
|
omap_pmic_init(1, 2600, pmic_type, 7 + OMAP_INTC_START, pmic_data);
|
|
}
|
|
|
|
void omap4_pmic_init(const char *pmic_type,
|
|
struct twl4030_platform_data *pmic_data,
|
|
struct i2c_board_info *devices, int nr_devices);
|
|
|
|
void omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,
|
|
u32 pdata_flags, u32 regulators_flags);
|
|
|
|
void omap4_pmic_get_config(struct twl4030_platform_data *pmic_data,
|
|
u32 pdata_flags, u32 regulators_flags);
|
|
|
|
void omap_twl4030_audio_init(char *card_name);
|
|
|
|
#endif /* __OMAP_PMIC_COMMON__ */
|