diff options
| author | Joonyoung Shim <jy0922.shim@samsung.com> | 2014-08-20 17:07:13 +0900 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 12:00:40 +0900 |
| commit | b0563b143575be5e01b267e24935c885bffac08f (patch) | |
| tree | d473e3d2cf03664dbae1aeb59595174207acee73 /sound | |
| parent | b86fdb2b0921f45ede7cd79feb773d7c88f99251 (diff) | |
| download | linux-3.10-b0563b143575be5e01b267e24935c885bffac08f.tar.gz linux-3.10-b0563b143575be5e01b267e24935c885bffac08f.tar.bz2 linux-3.10-b0563b143575be5e01b267e24935c885bffac08f.zip | |
ASoC: samsung: remove unnecessary controls of odroidx2_max98090
The control by user about external connectors is unnecesary.
Change-Id: Ib86f8ccccbb462c2ae17853dcc29313220eb407f
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/samsung/odroidx2_max98090.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/sound/soc/samsung/odroidx2_max98090.c b/sound/soc/samsung/odroidx2_max98090.c index ad1f3c8baae..fd2133512cb 100644 --- a/sound/soc/samsung/odroidx2_max98090.c +++ b/sound/soc/samsung/odroidx2_max98090.c @@ -16,9 +16,6 @@ struct odroidx2_drv_data { const struct snd_soc_dapm_widget *dapm_widgets; unsigned int num_dapm_widgets; - - const struct snd_kcontrol_new *controls; - unsigned int num_controls; }; /* Config I2S CDCLK output 19.2MHZ clock to Max98090 */ @@ -46,22 +43,11 @@ static const struct snd_soc_dapm_widget odroidx2_dapm_widgets[] = { SND_SOC_DAPM_MIC("DMIC", NULL), }; -static const struct snd_kcontrol_new odroidx2_max98090_controls[] = { - SOC_DAPM_PIN_SWITCH("Headphone Jack"), - SOC_DAPM_PIN_SWITCH("Mic Jack"), - SOC_DAPM_PIN_SWITCH("DMIC"), -}; - static const struct snd_soc_dapm_widget odroidu3_dapm_widgets[] = { SND_SOC_DAPM_HP("Headphone Jack", NULL), SND_SOC_DAPM_SPK("Speakers", NULL), }; -static const struct snd_kcontrol_new odroidu3_max98090_controls[] = { - SOC_DAPM_PIN_SWITCH("Headphone Jack"), - SOC_DAPM_PIN_SWITCH("Speakers"), -}; - static struct snd_soc_dai_link odroidx2_dai[] = { { .name = "MAX98090", @@ -91,15 +77,11 @@ static struct snd_soc_card odroidx2 = { struct odroidx2_drv_data odroidx2_drvdata = { .dapm_widgets = odroidx2_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(odroidx2_dapm_widgets), - .controls = odroidx2_max98090_controls, - .num_controls = ARRAY_SIZE(odroidx2_max98090_controls), }; struct odroidx2_drv_data odroidu3_drvdata = { .dapm_widgets = odroidu3_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(odroidu3_dapm_widgets), - .controls = odroidu3_max98090_controls, - .num_controls = ARRAY_SIZE(odroidu3_max98090_controls), }; static const struct of_device_id odroidx2_audio_of_match[] = { @@ -128,8 +110,7 @@ static int odroidx2_audio_probe(struct platform_device *pdev) card->dapm_widgets = dd->dapm_widgets; card->num_dapm_widgets = dd->num_dapm_widgets; - card->controls = dd->controls; - card->num_controls = dd->num_controls; + card->dev = &pdev->dev; ret = snd_soc_of_parse_card_name(card, "samsung,model"); |