HiFiBerry Amp driver missing in 4.9

[ghost]

It seems that the HiFiBerry Amp driver sound/soc_bcm/hifiberry_amp got lost in the 4.9 tree. It is still included in 4.8.
Can you merge the module to 4.9?

[popcornmix]

It is currently reverted due to upstream API changes stopping it building.
Ping @hifiberry, @HiassofT for suggestions on a fix to get this enabled again.

Error:

sound/soc/codecs/tas5713.c:235:2: error: unknown field 'controls' specified in initializer
  .controls = tas5713_snd_controls,
  ^
sound/soc/codecs/tas5713.c:235:2: warning: initialization from incompatible pointer type
sound/soc/codecs/tas5713.c:235:2: warning: (near initialization for 'soc_codec_dev_tas5713.suspend')
sound/soc/codecs/tas5713.c:236:2: error: unknown field 'num_controls' specified in initializer
  .num_controls = ARRAY_SIZE(tas5713_snd_controls),
  ^
sound/soc/codecs/tas5713.c:236:101: warning: initialization makes pointer from integer without a cast
  .num_controls = ARRAY_SIZE(tas5713_snd_controls),
                                                                                                     ^
sound/soc/codecs/tas5713.c:236:101: warning: (near initialization for 'soc_codec_dev_tas5713.resume')
scripts/Makefile.build:293: recipe for target 'sound/soc/codecs/tas5713.o' failed

presumably due to this: https://patchwork.kernel.org/patch/9269067/

[HiassofT]

With the ASoC component refactoring the .control etc fields were moved from snd_soc_codec_driver to snd_soc_component_driver. The codec driver needs to be changed (put .controls etc inside the .component_driver struct), like eg this one: d25f113

@hifiberry could you do a functional test with this change?

[HiassofT]

With this patch tas5713 compiles again, but I can't test myself as I don't have such a card

--- a/sound/soc/codecs/tas5713.c
+++ b/sound/soc/codecs/tas5713.c
@@ -232,8 +232,10 @@ static int tas5713_probe(struct snd_soc_codec *codec)
 static struct snd_soc_codec_driver soc_codec_dev_tas5713 = {
        .probe = tas5713_probe,
        .remove = tas5713_remove,
-       .controls = tas5713_snd_controls,
-       .num_controls = ARRAY_SIZE(tas5713_snd_controls),
+       .component_driver = {
+               .controls = tas5713_snd_controls,
+               .num_controls = ARRAY_SIZE(tas5713_snd_controls),
+       },
 };

[popcornmix]

@usul27 are you able to test @HiassofT's suggested patch?
You should drop 57d1640
If you confirm it works I can add it to tree.

[hifiberry]

I will look into this in the next days.

[hifiberry]

Tried the first time to compile the kernel directly on the Raspberry Pi ;-) After some hours (had to compile it multiple times), I can confirm now that the patch from @HiassofT works.

@popcornmix Can you please integrate this into the 4.9 tree ?

[pelwell]

Done.

[ckarrie]

Awesome, thank you!

[popcornmix]

Fix is already in 4.10 tree.
@usul27 okay to close?

[ghost]

Yes, please close this. Thanks to everyone who worked on this.

[cjbrigato]

- Colin J. βrigato - ¥ngénieur Σystème & Δirecteur de Projet ✆ 06 43 19 33 49 On 9 January 2017 at 21:40:28, popcornmix ([email protected]) wrote: Closed #1775 <#1775>. — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#1775 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AApgcUNDDjwik4LWtM2Sual2YFnyij9wks5rQps8gaJpZM4LY5z_> .