Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding button press flag and organizing jd2 code #1

Closed
wants to merge 2 commits into from
Closed

Adding button press flag and organizing jd2 code #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e678e8
Adding button press flag and organizing jd2 code
fdmendez Jan 7, 2016
d19ef09
Clean up interruption functions and gpios
fdmendez Jan 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 6 additions & 20 deletions sound/soc/intel/boards/byt_cr_board_configs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ enum {
#define BYT_RT5640_MCLK_25MHZ BIT(18)
#define BYT_RT5640_JACK_DET_EN BIT(19)
#define BYT_RT5640_JACK_ACTIVE_LOW BIT(20) /* default 0 */
#define BYT_RT5640_JACK_INT1 BIT(21)
#define BYT_RT5640_JACK_INT2 BIT(22)
#define BYT_RT5640_JACK_BP_CODEC BIT(23)
#define BYT_RT5640_JACK_BP_MICBIAS BIT(24)
#define BYT_RT5640_JACK_BP_CODEC BIT(21)
#define BYT_RT5640_JACK_BP_MICBIAS BIT(22)
#define BYT_RT5640_JACK_DET_PIN2 BIT(23) /* default 0 */
#define BYT_RT5640_JACK_BP_EN BIT(24)


static unsigned long byt_rt5640_quirk = BYT_RT5640_DMIC1_MAP |
Expand All @@ -62,9 +62,9 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
},
.driver_data = (unsigned long *)(BYT_RT5640_IN1_MAP |
BYT_RT5640_JACK_DET_EN |
BYT_RT5640_JACK_INT1 |
BYT_RT5640_JACK_BP_MICBIAS |
BYT_RT5640_MCLK_EN),
BYT_RT5640_MCLK_EN |
BYT_RT5640_JACK_DET_PIN2),
},
{
.callback = byt_rt5640_quirk_cb,
Expand Down Expand Up @@ -102,7 +102,6 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
},
.driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP |
BYT_RT5640_JACK_DET_EN |
BYT_RT5640_JACK_INT1 |
BYT_RT5640_JACK_BP_MICBIAS |
BYT_RT5640_MCLK_EN),
},
Expand All @@ -116,7 +115,6 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
.driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP |
BYT_RT5640_JACK_DET_EN |
BYT_RT5640_JACK_ACTIVE_LOW |
BYT_RT5640_JACK_INT2 |
BYT_RT5640_JACK_BP_CODEC |
BYT_RT5640_MCLK_EN),
},
Expand All @@ -129,7 +127,6 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
.driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP |
BYT_RT5640_JACK_DET_EN |
BYT_RT5640_JACK_ACTIVE_LOW |
BYT_RT5640_JACK_INT2 |
BYT_RT5640_JACK_BP_CODEC |
BYT_RT5640_MCLK_EN),
},
Expand All @@ -142,7 +139,6 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
.driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP |
BYT_RT5640_JACK_DET_EN |
BYT_RT5640_JACK_ACTIVE_LOW |
BYT_RT5640_JACK_INT2 |
BYT_RT5640_JACK_BP_CODEC |
BYT_RT5640_MCLK_EN),
},
Expand All @@ -155,7 +151,6 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
.driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP |
BYT_RT5640_JACK_DET_EN |
BYT_RT5640_JACK_ACTIVE_LOW |
BYT_RT5640_JACK_INT2 |
BYT_RT5640_JACK_BP_CODEC |
BYT_RT5640_MCLK_EN),
},
Expand All @@ -168,7 +163,6 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
.driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP |
BYT_RT5640_JACK_DET_EN |
BYT_RT5640_JACK_ACTIVE_LOW |
BYT_RT5640_JACK_INT2 |
BYT_RT5640_JACK_BP_CODEC |
BYT_RT5640_MCLK_EN),
},
Expand All @@ -181,7 +175,6 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
.driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP |
BYT_RT5640_JACK_DET_EN |
BYT_RT5640_JACK_ACTIVE_LOW |
BYT_RT5640_JACK_INT2 |
BYT_RT5640_JACK_BP_CODEC |
BYT_RT5640_MCLK_EN),
},
Expand All @@ -194,7 +187,6 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
.driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP |
BYT_RT5640_JACK_DET_EN |
BYT_RT5640_JACK_ACTIVE_LOW |
BYT_RT5640_JACK_INT1 |
BYT_RT5640_JACK_BP_MICBIAS |
BYT_RT5640_MCLK_EN),
},
Expand All @@ -207,7 +199,6 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
.driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP |
BYT_RT5640_JACK_DET_EN |
BYT_RT5640_JACK_ACTIVE_LOW |
BYT_RT5640_JACK_INT2 |
BYT_RT5640_JACK_BP_CODEC |
BYT_RT5640_MCLK_EN),
},
Expand All @@ -221,7 +212,6 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
.driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP |
BYT_RT5640_JACK_DET_EN |
BYT_RT5640_JACK_ACTIVE_LOW |
BYT_RT5640_JACK_INT1 |
BYT_RT5640_JACK_BP_MICBIAS |
BYT_RT5640_MCLK_EN),
},
Expand All @@ -234,7 +224,6 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
.driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP |
BYT_RT5640_JACK_DET_EN |
BYT_RT5640_JACK_ACTIVE_LOW |
BYT_RT5640_JACK_INT1 |
BYT_RT5640_JACK_BP_MICBIAS |
BYT_RT5640_MCLK_EN),
},
Expand All @@ -247,7 +236,6 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
.driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP |
BYT_RT5640_JACK_DET_EN |
BYT_RT5640_JACK_ACTIVE_LOW |
BYT_RT5640_JACK_INT1 |
BYT_RT5640_JACK_BP_MICBIAS |
BYT_RT5640_MCLK_EN),
},
Expand All @@ -260,7 +248,6 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
.driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP |
BYT_RT5640_JACK_DET_EN |
BYT_RT5640_JACK_ACTIVE_LOW |
BYT_RT5640_JACK_INT1 |
BYT_RT5640_JACK_BP_MICBIAS |
BYT_RT5640_MCLK_EN),
},
Expand All @@ -273,7 +260,6 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
.driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP |
BYT_RT5640_JACK_DET_EN |
BYT_RT5640_JACK_ACTIVE_LOW |
BYT_RT5640_JACK_INT1 |
BYT_RT5640_JACK_BP_MICBIAS |
BYT_RT5640_MCLK_EN),
},
Expand Down
Loading