August 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] usb 1-2: 1:1: cannot set freq 44100 to ep 0x81 and potential fix
by Joakim Tjernlund 22 Aug '17

22 Aug '17

I have two USB headsets (Logitech Inc Logitech Stereo H650e and Jabra Jabra UC VOICE 550a) who both causes lots of: usb 1-2: 1:1: cannot set freq 44100 to ep 0x81 errors when using them for pidgin audio chats. The actual freq varies though. I found that adding a small delay here: diff -u sound/usb/clock.c.org sound/usb/clock.c --- sound/usb/clock.c.org 2017-08-18 14:38:05.597977669 +0200 +++ sound/usb/clock.c 2017-08-18 14:20:14.653661513 +0200 @@ -304,6 +304,7 @@ iface, fmt->altsetting, rate, ep); return err; } + msleep(1); /* Don't check the sample rate for devices which we know don't * support reading */ it seems one cannot do these settings too fast Ant better idea for a fix? kernel 4.9.44 Jocke PS. When starting a chat with pidgin-sipe, I see the same sample rate freq setting twice, not sure where that comes from.

2 2

[alsa-devel] [PATCH v4 0/9] ASoC: rockchip: Parse dai links from dts
by Jeffy Chen 22 Aug '17

22 Aug '17

Currently we are using a fixed list of dai links in the driver. This serial of patches would let the driver parse dai links from dts, so that we can make some of them optional for future boards. Tested on my chromebook bob(with cros 4.4 kernel), it still works after disabled rt5514 codecs in the dts. Changes in v4: Use non-zero drv id to avoid legacy dai naming instead of switching to snd_soc_register_codec. Changes in v3: Use compatible to match audio codecs -- Suggested-by Matthias Kaehlcke <mka(a)chromium.org> Changes in v2: Let rockchip,codec-names be a required property, because we plan to add more supported codecs to the fixed dai link list in the driver. Jeffy Chen (9): ASoC: rt5514: Avoid legacy dai naming ASoC: rockchip: Remove obsolete dmic-delay ASoC: rockchip: Use codec of_node and dai_name for rt5514 dsp arm64: dts: rockchip: Add rt5514 dsp for Gru arm64: dts: rockchip: Update rt5514 devices' compatible for Gru ASoC: rockchip: Parse dai links from dts ASoC: rockchip: Add support for DP codec ASoC: rockchip: Add support for DMIC codec dt-bindings: ASoC: rockchip: Update description of rockchip,codec .../bindings/sound/rockchip,rk3399-gru-sound.txt | 9 +- arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 7 +- sound/soc/codecs/rt5514-spi.c | 2 +- sound/soc/rockchip/Kconfig | 2 + sound/soc/rockchip/rk3399_gru_sound.c | 263 ++++++++++++++------- 5 files changed, 183 insertions(+), 100 deletions(-) -- 2.11.0

4 12

[alsa-devel] [PATCH v2] ASoC: rsnd: remove unused rsnd_xxx_to_dma()
by Kuninori Morimoto 22 Aug '17

22 Aug '17

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- v1 -> v2 - based on latest mark/topic/rcar b65cb7a590274bf5dbf5bbccbbd0c495c27ab14d ("ASoC: rsnd: tidyup comments position/space/tab") sound/soc/sh/rcar/src.c | 1 - sound/soc/sh/rcar/ssi.c | 1 - 2 files changed, 2 deletions(-) diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c index 4640039..510b68a 100644 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c @@ -27,7 +27,6 @@ struct rsnd_src { #define RSND_SRC_NAME_SIZE 16 #define rsnd_src_get(priv, id) ((struct rsnd_src *)(priv->src) + id) -#define rsnd_src_to_dma(src) ((src)->dma) #define rsnd_src_nr(priv) ((priv)->src_nr) #define rsnd_src_sync_is_enabled(mod) (rsnd_mod_to_src(mod)->sen.val) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 8bb4714..fffc07e 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -99,7 +99,6 @@ struct rsnd_ssi { i++) #define rsnd_ssi_get(priv, id) ((struct rsnd_ssi *)(priv->ssi) + id) -#define rsnd_ssi_to_dma(mod) ((ssi)->dma) #define rsnd_ssi_nr(priv) ((priv)->ssi_nr) #define rsnd_mod_to_ssi(_mod) container_of((_mod), struct rsnd_ssi, mod) #define rsnd_ssi_flags_has(p, f) ((p)->flags & f) -- 1.9.1

1 0

[alsa-devel] [PATCH] ASoC: simple-scu-card: Parse off codec widgets
by Daniel Baluta 22 Aug '17

22 Aug '17

Signed-off-by: Daniel Baluta <daniel.baluta(a)nxp.com> --- Documentation/devicetree/bindings/sound/simple-scu-card.txt | 1 + sound/soc/generic/simple-scu-card.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/simple-scu-card.txt b/Documentation/devicetree/bindings/sound/simple-scu-card.txt index 327d229..32f8dbc 100644 --- a/Documentation/devicetree/bindings/sound/simple-scu-card.txt +++ b/Documentation/devicetree/bindings/sound/simple-scu-card.txt @@ -24,6 +24,7 @@ Optional subnode properties: - simple-audio-card,convert-rate : platform specified sampling rate convert - simple-audio-card,convert-channels : platform specified converted channel size (2 - 8 ch) - simple-audio-card,prefix : see routing +- simple-audio-card,widgets : Please refer to widgets.txt. - simple-audio-card,routing : A list of the connections between audio components. Each entry is a pair of strings, the first being the connection's sink, the second being the connection's source. Valid names for sources. diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c index a75b385..0bb3da7 100644 --- a/sound/soc/generic/simple-scu-card.c +++ b/sound/soc/generic/simple-scu-card.c @@ -191,6 +191,10 @@ static int asoc_simple_card_parse_of(struct simple_card_data *priv) if (!node) return -EINVAL; + ret = asoc_simple_card_of_parse_widgets(card, PREFIX); + if (ret < 0) + return ret; + ret = asoc_simple_card_of_parse_routing(card, PREFIX, 0); if (ret < 0) return ret; -- 2.7.4

3 4

[alsa-devel] [PATCH v4 0/3] ASoC: codecs: msm8916-wcd-analog: Add support to MBHC
by srinivas.kandagatla＠linaro.org 21 Aug '17

21 Aug '17

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> This patchset adds support to MBHC(Multibutton headset control) block in PM8916 analog block. MBHC support comes from 2 blocks first mechanical headset detection and second headset type, 5 button detection. This patchset adds support to: 1> Support to NC and NO type of headset Jacks. 2> Mechanical insertion and detection of headset jack. 3> Detect a 3 pole Headphone and a 4 pole Headset. 4> Detect 5 buttons. Tested it on DB410c with Audio Mezz board with 4 pole and 3 pole and during playback and recording use cases. Changes since v3(https://lkml.org/lkml/2017/8/2/609): - dropped ASoC: codecs: msm8916-wcd-analog: move codec reset to probe - fixed rampup time for micbias spotted by Mark. - Added tested-by from Dimien - Dropped dt patch from this series. Srinivas Kandagatla (3): ASoC: codecs: msm8916-wcd-analog: get micbias voltage from dt ASoC: codecs: msm8916-wcd-analog: add MBHC support ASoC: qcom: apq8016-sbc: Add support to Headset JACK .../bindings/sound/qcom,msm8916-wcd-analog.txt | 18 +- sound/soc/codecs/msm8916-wcd-analog.c | 400 ++++++++++++++++++++- sound/soc/qcom/apq8016_sbc.c | 34 ++ 3 files changed, 444 insertions(+), 8 deletions(-) -- 2.11.0

2 6

[alsa-devel] [PATCH v2 0/6] ASoC: codecs: msm8916-wcd-analog: Add support to MBHC
by srinivas.kandagatla＠linaro.org 21 Aug '17

21 Aug '17

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> This patchset adds support to MBHC(Multibutton headset control) block in PM8916 analog block. MBHC support comes from2 blocks first mechanical headset detection and second headset type, 5 button detection. This patchset adds support to: 1> Support to NC and NO type of headset Jacks. 2> Mechanical insertion and detection of headset jack. 3> Detect a 3 pole Headphone and a 4 pole Headset. 4> Detect 5 buttons. Damien sent a similar patchset to add support to mechanical detection, but that patch has issues and will not work on most usecases (for example after a playback/capture session, multicodec case). So I only picked up the BIT mask patch from that series. Tested it on DB410c with Audio Mezz board with 4 pole and 3 pole and during playback and recording use cases. Changes since v1(https://www.spinics.net/lists/kernel/msg2565463.html): - Micbias left to hardware default value suggested by Mark. - Updated commit log to reflect low power state for mbhc - cleaned up code spotted by Mark. - Moved the button voltage threshold to dt, suggested by Mark - Fixed key release issue reported by Damien Srinivas Kandagatla (6): ASoC: jack: fix snd_soc_codec_set_jack return error ASoC: codecs: msm8916-wcd-analog: move codec reset to probe ASoC: codecs: msm8916-wcd-analog: get micbias voltage from dt ASoC: codecs: msm8916-wcd-analog: add MBHC support ASoC: qcom: apq8016-sbc: Add support to Headset JACK arm64: dts: apq8016-sbc: add mbhc buttons support .../bindings/sound/qcom,msm8916-wcd-analog.txt | 18 +- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 2 + sound/soc/codecs/msm8916-wcd-analog.c | 412 +++++++++++++++++++-- sound/soc/qcom/apq8016_sbc.c | 34 ++ sound/soc/soc-jack.c | 2 +- 5 files changed, 444 insertions(+), 24 deletions(-) -- 2.9.3

4 11

[alsa-devel] [PATCH 03/12] ASoC: Intel: Remove unnecessary function call
by Peng Donglin 21 Aug '17

21 Aug '17

First of all,the address of pdev->dev is assigned to card->dev, when calling snd_soc_register_card,the function dev_set_drvdata(card->dev, card) copies the value the variable card to card->dev->driver_data.After that,the function platform_set_drvdata does the same copy operation, so i think that the latter copy operation can be removed. Signed-off-by: Peng Donglin <dolinux.peng(a)gmail.com> --- sound/soc/intel/boards/bytcht_da7213.c | 1 - sound/soc/intel/boards/bytcht_es8316.c | 1 - sound/soc/intel/boards/bytcr_rt5651.c | 1 - sound/soc/intel/boards/cht_bsw_max98090_ti.c | 1 - sound/soc/intel/boards/cht_bsw_rt5645.c | 1 - sound/soc/intel/boards/cht_bsw_rt5672.c | 1 - 6 files changed, 6 deletions(-) diff --git a/sound/soc/intel/boards/bytcht_da7213.c b/sound/soc/intel/boards/bytcht_da7213.c index 18873e2..fbc870b 100644 --- a/sound/soc/intel/boards/bytcht_da7213.c +++ b/sound/soc/intel/boards/bytcht_da7213.c @@ -265,7 +265,6 @@ static int bytcht_da7213_probe(struct platform_device *pdev) "snd_soc_register_card failed %d\n", ret_val); return ret_val; } - platform_set_drvdata(pdev, card); return ret_val; } diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 5263546..5e6e8e9 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -282,7 +282,6 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) dev_err(&pdev->dev, "snd_soc_register_card failed %d\n", ret); return ret; } - platform_set_drvdata(pdev, &byt_cht_es8316_card); return ret; } diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 4a3516b..77702aa 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -310,7 +310,6 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) ret_val); return ret_val; } - platform_set_drvdata(pdev, &byt_rt5651_card); return ret_val; } diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c index 20755ec..8583c0c 100644 --- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c +++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c @@ -300,7 +300,6 @@ static int snd_cht_mc_probe(struct platform_device *pdev) "snd_soc_register_card failed %d\n", ret_val); return ret_val; } - platform_set_drvdata(pdev, &snd_soc_card_cht); return ret_val; } diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index 5bcde01..0e6a24c 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -699,7 +699,6 @@ static int snd_cht_mc_probe(struct platform_device *pdev) "snd_soc_register_card failed %d\n", ret_val); return ret_val; } - platform_set_drvdata(pdev, card); return ret_val; } diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c index bc2a52d..e8bd22b 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5672.c +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c @@ -448,7 +448,6 @@ static int snd_cht_mc_probe(struct platform_device *pdev) "snd_soc_register_card failed %d\n", ret_val); return ret_val; } - platform_set_drvdata(pdev, &snd_soc_card_cht); return ret_val; } -- 1.9.1

2 1

[alsa-devel] [PATCH 12/12] ASoC: ux500: Remove unnecessary function call
by Peng Donglin 21 Aug '17

21 Aug '17

First of all,the address of pdev->dev is assigned to mop500_card.dev, then the function platform_set_drvdata copies the value the variable card to pdev->dev.driver_data,but when calling snd_soc_register_card, the function dev_set_drvdata(card->dev, card) will also do the same copy operation,so i think that the former copy operation can be removed. Signed-off-by: Peng Donglin <dolinux.peng(a)gmail.com> --- sound/soc/ux500/mop500.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/ux500/mop500.c b/sound/soc/ux500/mop500.c index ba9fc09..070a688 100644 --- a/sound/soc/ux500/mop500.c +++ b/sound/soc/ux500/mop500.c @@ -115,7 +115,6 @@ static int mop500_probe(struct platform_device *pdev) dev_dbg(&pdev->dev, "%s: Card %s: Set platform drvdata.\n", __func__, mop500_card.name); - platform_set_drvdata(pdev, &mop500_card); snd_soc_card_set_drvdata(&mop500_card, NULL); -- 1.9.1

2 1

[alsa-devel] [PATCH 02/12] ASoC: mediatek: Remove unnecessary function call
by Peng Donglin 21 Aug '17

21 Aug '17

First of all,the address of pdev->dev is assigned to card->dev,then the function platform_set_drvdata copies the value the variable card to pdev->dev.driver_data, but when calling snd_soc_register_card,the function dev_set_drvdata(card->dev, card) will also do the same copy operation,so i think that the former copy operation can be removed. Signed-off-by: Peng Donglin <dolinux.peng(a)gmail.com> --- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 1 - sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 1 - sound/soc/mediatek/mt8173/mt8173-rt5650.c | 1 - 3 files changed, 3 deletions(-) diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c index 5e383eb..99c1521 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c @@ -222,7 +222,6 @@ static int mt8173_rt5650_rt5514_dev_probe(struct platform_device *pdev) mt8173_rt5650_rt5514_codecs[1].of_node; card->dev = &pdev->dev; - platform_set_drvdata(pdev, card); ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c index fed1f15..42de84c 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c @@ -279,7 +279,6 @@ static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev) } card->dev = &pdev->dev; - platform_set_drvdata(pdev, card); ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c index a784708..e69c141 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c @@ -311,7 +311,6 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) return -EINVAL; } card->dev = &pdev->dev; - platform_set_drvdata(pdev, card); ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) -- 1.9.1

2 1

[alsa-devel] [PATCH 11/12] ASoC: tegra: Remove unnecessary function call
by Peng Donglin 21 Aug '17

21 Aug '17

First of all,the address of pdev->dev is assigned to card->dev,then the function platform_set_drvdata copies the value the variable card to pdev->dev.driver_data, but when calling snd_soc_register_card,the function dev_set_drvdata(card->dev, card) will also do the same copy operation,so i think that the former copy operation can be removed. Signed-off-by: Peng Donglin <dolinux.peng(a)gmail.com> --- sound/soc/tegra/tegra_alc5632.c | 1 - sound/soc/tegra/tegra_max98090.c | 1 - sound/soc/tegra/tegra_rt5640.c | 1 - sound/soc/tegra/tegra_rt5677.c | 1 - sound/soc/tegra/tegra_sgtl5000.c | 1 - sound/soc/tegra/tegra_wm8753.c | 1 - sound/soc/tegra/tegra_wm8903.c | 1 - sound/soc/tegra/tegra_wm9712.c | 1 - sound/soc/tegra/trimslice.c | 1 - 9 files changed, 9 deletions(-) diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c index 0509902..053fe4c 100644 --- a/sound/soc/tegra/tegra_alc5632.c +++ b/sound/soc/tegra/tegra_alc5632.c @@ -173,7 +173,6 @@ static int tegra_alc5632_probe(struct platform_device *pdev) return -ENOMEM; card->dev = &pdev->dev; - platform_set_drvdata(pdev, card); snd_soc_card_set_drvdata(card, alc5632); alc5632->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0); diff --git a/sound/soc/tegra/tegra_max98090.c b/sound/soc/tegra/tegra_max98090.c index c34a54d..41feee9 100644 --- a/sound/soc/tegra/tegra_max98090.c +++ b/sound/soc/tegra/tegra_max98090.c @@ -229,7 +229,6 @@ static int tegra_max98090_probe(struct platform_device *pdev) return -ENOMEM; card->dev = &pdev->dev; - platform_set_drvdata(pdev, card); snd_soc_card_set_drvdata(card, machine); machine->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0); diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c index 93a3568..02f27fe 100644 --- a/sound/soc/tegra/tegra_rt5640.c +++ b/sound/soc/tegra/tegra_rt5640.c @@ -174,7 +174,6 @@ static int tegra_rt5640_probe(struct platform_device *pdev) return -ENOMEM; card->dev = &pdev->dev; - platform_set_drvdata(pdev, card); snd_soc_card_set_drvdata(card, machine); machine->gpio_hp_det = of_get_named_gpio_flags( diff --git a/sound/soc/tegra/tegra_rt5677.c b/sound/soc/tegra/tegra_rt5677.c index ebf58d0..3dbf0e1 100644 --- a/sound/soc/tegra/tegra_rt5677.c +++ b/sound/soc/tegra/tegra_rt5677.c @@ -222,7 +222,6 @@ static int tegra_rt5677_probe(struct platform_device *pdev) return -ENOMEM; card->dev = &pdev->dev; - platform_set_drvdata(pdev, card); snd_soc_card_set_drvdata(card, machine); machine->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0); diff --git a/sound/soc/tegra/tegra_sgtl5000.c b/sound/soc/tegra/tegra_sgtl5000.c index 6dda01f..45a4aa9 100644 --- a/sound/soc/tegra/tegra_sgtl5000.c +++ b/sound/soc/tegra/tegra_sgtl5000.c @@ -124,7 +124,6 @@ static int tegra_sgtl5000_driver_probe(struct platform_device *pdev) return -ENOMEM; card->dev = &pdev->dev; - platform_set_drvdata(pdev, card); snd_soc_card_set_drvdata(card, machine); ret = snd_soc_of_parse_card_name(card, "nvidia,model"); diff --git a/sound/soc/tegra/tegra_wm8753.c b/sound/soc/tegra/tegra_wm8753.c index d0ab0026..23a810e 100644 --- a/sound/soc/tegra/tegra_wm8753.c +++ b/sound/soc/tegra/tegra_wm8753.c @@ -132,7 +132,6 @@ static int tegra_wm8753_driver_probe(struct platform_device *pdev) return -ENOMEM; card->dev = &pdev->dev; - platform_set_drvdata(pdev, card); snd_soc_card_set_drvdata(card, machine); ret = snd_soc_of_parse_card_name(card, "nvidia,model"); diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c index dbfb492..d4a4a2b 100644 --- a/sound/soc/tegra/tegra_wm8903.c +++ b/sound/soc/tegra/tegra_wm8903.c @@ -252,7 +252,6 @@ static int tegra_wm8903_driver_probe(struct platform_device *pdev) return -ENOMEM; card->dev = &pdev->dev; - platform_set_drvdata(pdev, card); snd_soc_card_set_drvdata(card, machine); machine->gpio_spkr_en = of_get_named_gpio(np, "nvidia,spkr-en-gpios", diff --git a/sound/soc/tegra/tegra_wm9712.c b/sound/soc/tegra/tegra_wm9712.c index c9cd224..864a334 100644 --- a/sound/soc/tegra/tegra_wm9712.c +++ b/sound/soc/tegra/tegra_wm9712.c @@ -81,7 +81,6 @@ static int tegra_wm9712_driver_probe(struct platform_device *pdev) return -ENOMEM; card->dev = &pdev->dev; - platform_set_drvdata(pdev, card); snd_soc_card_set_drvdata(card, machine); machine->codec = platform_device_alloc("wm9712-codec", -1); diff --git a/sound/soc/tegra/trimslice.c b/sound/soc/tegra/trimslice.c index c9dcad9..99bcdd9 100644 --- a/sound/soc/tegra/trimslice.c +++ b/sound/soc/tegra/trimslice.c @@ -127,7 +127,6 @@ static int tegra_snd_trimslice_probe(struct platform_device *pdev) return -ENOMEM; card->dev = &pdev->dev; - platform_set_drvdata(pdev, card); snd_soc_card_set_drvdata(card, trimslice); trimslice_tlv320aic23_dai.codec_of_node = of_parse_phandle(np, -- 1.9.1

2 1