diff options
author | Mark Brown <broonie@kernel.org> | 2019-07-06 14:25:26 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-07-06 14:25:26 +0300 |
commit | 043b35f281f5f141e7a928d27492133ef33b8119 (patch) | |
tree | 30a9598866d6b8d44ee6b3fe88506881f23e0203 /include/linux | |
parent | 0dceaf7c798de953c74073cc77be40b7be49abbc (diff) | |
parent | 87a6fe80d56be85bda093c4dd8a3e6535bda7e4a (diff) | |
download | linux-043b35f281f5f141e7a928d27492133ef33b8119.tar.xz |
Merge branch 'asoc-5.3' into asoc-next
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/mfd/madera/pdata.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/mfd/madera/pdata.h b/include/linux/mfd/madera/pdata.h index 8dc852402dbb..60cd8ec98563 100644 --- a/include/linux/mfd/madera/pdata.h +++ b/include/linux/mfd/madera/pdata.h @@ -16,6 +16,7 @@ #include <linux/regulator/arizona-ldo1.h> #include <linux/regulator/arizona-micsupp.h> #include <linux/regulator/machine.h> +#include <sound/madera-pdata.h> #define MADERA_MAX_MICBIAS 4 #define MADERA_MAX_CHILD_MICBIAS 4 @@ -39,6 +40,7 @@ struct madera_codec_pdata; * @gpsw: General purpose switch mode setting. Depends on the external * hardware connected to the switch. (See the SW1_MODE field * in the datasheet for the available values for your codec) + * @codec: Substruct of pdata for the ASoC codec driver */ struct madera_pdata { struct gpio_desc *reset; @@ -53,6 +55,8 @@ struct madera_pdata { int n_gpio_configs; u32 gpsw[MADERA_MAX_GPSW]; + + struct madera_codec_pdata codec; }; #endif |