Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
05997302
Commit
05997302
authored
Aug 31, 2017
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/rt5670' into asoc-fixes
parents
1b4a56cd
804e73ad
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
sound/soc/codecs/rt5670.c
sound/soc/codecs/rt5670.c
+1
-1
sound/soc/intel/boards/cht_bsw_rt5672.c
sound/soc/intel/boards/cht_bsw_rt5672.c
+10
-0
No files found.
sound/soc/codecs/rt5670.c
View file @
05997302
...
@@ -567,7 +567,7 @@ int rt5670_set_jack_detect(struct snd_soc_codec *codec,
...
@@ -567,7 +567,7 @@ int rt5670_set_jack_detect(struct snd_soc_codec *codec,
rt5670
->
jack
=
jack
;
rt5670
->
jack
=
jack
;
rt5670
->
hp_gpio
.
gpiod_dev
=
codec
->
dev
;
rt5670
->
hp_gpio
.
gpiod_dev
=
codec
->
dev
;
rt5670
->
hp_gpio
.
name
=
"head
phone detec
t"
;
rt5670
->
hp_gpio
.
name
=
"head
se
t"
;
rt5670
->
hp_gpio
.
report
=
SND_JACK_HEADSET
|
rt5670
->
hp_gpio
.
report
=
SND_JACK_HEADSET
|
SND_JACK_BTN_0
|
SND_JACK_BTN_1
|
SND_JACK_BTN_2
;
SND_JACK_BTN_0
|
SND_JACK_BTN_1
|
SND_JACK_BTN_2
;
rt5670
->
hp_gpio
.
debounce_time
=
150
;
rt5670
->
hp_gpio
.
debounce_time
=
150
;
...
...
sound/soc/intel/boards/cht_bsw_rt5672.c
View file @
05997302
...
@@ -184,6 +184,13 @@ static int cht_aif1_hw_params(struct snd_pcm_substream *substream,
...
@@ -184,6 +184,13 @@ static int cht_aif1_hw_params(struct snd_pcm_substream *substream,
return
0
;
return
0
;
}
}
static
const
struct
acpi_gpio_params
headset_gpios
=
{
0
,
0
,
false
};
static
const
struct
acpi_gpio_mapping
cht_rt5672_gpios
[]
=
{
{
"headset-gpios"
,
&
headset_gpios
,
1
},
{},
};
static
int
cht_codec_init
(
struct
snd_soc_pcm_runtime
*
runtime
)
static
int
cht_codec_init
(
struct
snd_soc_pcm_runtime
*
runtime
)
{
{
int
ret
;
int
ret
;
...
@@ -191,6 +198,9 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
...
@@ -191,6 +198,9 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
struct
snd_soc_codec
*
codec
=
codec_dai
->
codec
;
struct
snd_soc_codec
*
codec
=
codec_dai
->
codec
;
struct
cht_mc_private
*
ctx
=
snd_soc_card_get_drvdata
(
runtime
->
card
);
struct
cht_mc_private
*
ctx
=
snd_soc_card_get_drvdata
(
runtime
->
card
);
if
(
devm_acpi_dev_add_driver_gpios
(
codec
->
dev
,
cht_rt5672_gpios
))
dev_warn
(
runtime
->
dev
,
"Unable to add GPIO mapping table
\n
"
);
/* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */
/* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */
ret
=
snd_soc_dai_set_tdm_slot
(
codec_dai
,
0xF
,
0xF
,
4
,
24
);
ret
=
snd_soc_dai_set_tdm_slot
(
codec_dai
,
0xF
,
0xF
,
4
,
24
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment