mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-26 06:33:19 -04:00
Merge "Merge remote-tracking branch 'remotes/origin/tmp-aefd2d632eb0' into msm-lahaina"
This commit is contained in:
commit
71c01ac3f6
1257 changed files with 13728 additions and 39772 deletions
|
|
@ -264,6 +264,9 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };
|
|||
#define AZX_REG_ML_LOUTPAY 0x20
|
||||
#define AZX_REG_ML_LINPAY 0x30
|
||||
|
||||
/* bit0 is reserved, with BIT(1) mapping to stream1 */
|
||||
#define ML_LOSIDV_STREAM_MASK 0xFFFE
|
||||
|
||||
#define ML_LCTL_SCF_MASK 0xF
|
||||
#define AZX_MLCTL_SPA (0x1 << 16)
|
||||
#define AZX_MLCTL_CPA (0x1 << 23)
|
||||
|
|
|
|||
|
|
@ -58,9 +58,6 @@ enum snd_jack_types {
|
|||
SND_JACK_BTN_5 = 0x0200,
|
||||
};
|
||||
|
||||
/* Keep in sync with definitions above */
|
||||
#define SND_JACK_SWITCH_TYPES 6
|
||||
|
||||
struct snd_jack {
|
||||
struct list_head kctl_list;
|
||||
struct snd_card *card;
|
||||
|
|
|
|||
|
|
@ -135,9 +135,9 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv,
|
|||
struct link_info *li);
|
||||
|
||||
#ifdef DEBUG
|
||||
inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv,
|
||||
char *name,
|
||||
struct asoc_simple_dai *dai)
|
||||
static inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv,
|
||||
char *name,
|
||||
struct asoc_simple_dai *dai)
|
||||
{
|
||||
struct device *dev = simple_priv_to_dev(priv);
|
||||
|
||||
|
|
@ -167,7 +167,7 @@ inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv,
|
|||
dev_dbg(dev, "%s clk %luHz\n", name, clk_get_rate(dai->clk));
|
||||
}
|
||||
|
||||
inline void asoc_simple_debug_info(struct asoc_simple_priv *priv)
|
||||
static inline void asoc_simple_debug_info(struct asoc_simple_priv *priv)
|
||||
{
|
||||
struct snd_soc_card *card = simple_priv_to_card(priv);
|
||||
struct device *dev = simple_priv_to_dev(priv);
|
||||
|
|
|
|||
Loading…
Reference in a new issue