Commit d3bbc28b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v5.8-rc5' of... 

Merge tag 'asoc-fix-v5.8-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v5.8

An awful lot of mostly small fixes here, mainly for x86 based platforms
and the CODEC drivers mainly used on them.  For the most part this is
either minor device specific stuff which seems to come from detailed
testing or robustness against errors which comes from people having done
some fuzzing runs aginst the topology code.
parents 60379ba0 fe0a5304

Documentation/devicetree/bindings/sound/simple-card.yaml

+13 −4
Original line number Diff line number Diff line
@@ -380,6 +380,8 @@ examples: 
  - |

    sound {

        compatible = "simple-audio-card";

        #address-cells = <1>;

        #size-cells = <0>;



        simple-audio-card,name = "rsnd-ak4643";

        simple-audio-card,format = "left_j";
@@ -393,10 +395,12 @@ examples: 
                                    "ak4642 Playback", "DAI1 Playback";



        dpcmcpu: simple-audio-card,cpu@0 {

            reg = <0>;

            sound-dai = <&rcar_sound 0>;

        };



        simple-audio-card,cpu@1 {

            reg = <1>;

            sound-dai = <&rcar_sound 1>;

        };
@@ -420,6 +424,8 @@ examples: 
  - |

    sound {

        compatible = "simple-audio-card";

        #address-cells = <1>;

        #size-cells = <0>;



        simple-audio-card,routing =

            "pcm3168a Playback", "DAI1 Playback",
@@ -428,6 +434,7 @@ examples: 
            "pcm3168a Playback", "DAI4 Playback";



        simple-audio-card,dai-link@0 {

            reg = <0>;

            format = "left_j";

            bitclock-master = <&sndcpu0>;

            frame-master = <&sndcpu0>;
@@ -441,22 +448,23 @@ examples: 
        };



        simple-audio-card,dai-link@1 {

            reg = <1>;

            format = "i2s";

            bitclock-master = <&sndcpu1>;

            frame-master = <&sndcpu1>;



            convert-channels = <8>; /* TDM Split */



            sndcpu1: cpu@0 {

            sndcpu1: cpu0 {

                sound-dai = <&rcar_sound 1>;

            };

            cpu@1 {

            cpu1 {

                sound-dai = <&rcar_sound 2>;

            };

            cpu@2 {

            cpu2 {

                sound-dai = <&rcar_sound 3>;

            };

            cpu@3 {

            cpu3 {

                sound-dai = <&rcar_sound 4>;

            };

            codec {
@@ -468,6 +476,7 @@ examples: 
        };



        simple-audio-card,dai-link@2 {

            reg = <2>;

            format = "i2s";

            bitclock-master = <&sndcpu2>;

            frame-master = <&sndcpu2>;

MAINTAINERS

+4 −3
Original line number Diff line number Diff line
@@ -6876,6 +6876,7 @@ M: Timur Tabi <timur@kernel.org> 
M:	Nicolin Chen <nicoleotsuka@gmail.com>

M:	Xiubo Li <Xiubo.Lee@gmail.com>

R:	Fabio Estevam <festevam@gmail.com>

R:	Shengjiu Wang <shengjiu.wang@gmail.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

L:	linuxppc-dev@lists.ozlabs.org

S:	Maintained
@@ -11183,17 +11184,17 @@ F: drivers/iio/adc/at91-sama5d2_adc.c 
F:	include/dt-bindings/iio/adc/at91-sama5d2_adc.h















MICROCHIP SAMA5D2-COMPATIBLE SHUTDOWN CONTROLLER













M:	Nicolas Ferre <nicolas.ferre@microchip.com>













M:	Claudiu Beznea <claudiu.beznea@microchip.com>















S:	Supported















F:	drivers/power/reset/at91-sama5d2_shdwc.c





























MICROCHIP SPI DRIVER













M:	Nicolas Ferre <nicolas.ferre@microchip.com>













M:	Tudor Ambarus <tudor.ambarus@microchip.com>















S:	Supported















F:	drivers/spi/spi-atmel.*





























MICROCHIP SSC DRIVER













M:	Nicolas Ferre <nicolas.ferre@microchip.com>













M:	Codrin Ciubotariu <codrin.ciubotariu@microchip.com>















L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)















S:	Supported















F:	drivers/misc/atmel-ssc.c

































include/sound/rt5670.h



+1
−0






























Original line number
Diff line number
Diff line








@@ -12,6 +12,7 @@ struct rt5670_platform_data {













	int jd_mode;















	bool in2_diff;















	bool dev_gpio;













	bool gpio1_is_ext_spk_en;































	bool dmic_en;















	unsigned int dmic1_data_pin;

































include/sound/soc-dai.h



+1
−0






























Original line number
Diff line number
Diff line








@@ -161,6 +161,7 @@ void snd_soc_dai_resume(struct snd_soc_dai *dai);













int snd_soc_dai_compress_new(struct snd_soc_dai *dai,















			     struct snd_soc_pcm_runtime *rtd, int num);















bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream);













void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link);















void snd_soc_dai_action(struct snd_soc_dai *dai,















			int stream, int action);















static inline void snd_soc_dai_activate(struct snd_soc_dai *dai,

































include/sound/soc.h



+2
−0






























Original line number
Diff line number
Diff line








@@ -444,6 +444,8 @@ int devm_snd_soc_register_component(struct device *dev,













			 const struct snd_soc_component_driver *component_driver,















			 struct snd_soc_dai_driver *dai_drv, int num_dai);















void snd_soc_unregister_component(struct device *dev);













void snd_soc_unregister_component_by_driver(struct device *dev,













			 const struct snd_soc_component_driver *component_driver);















struct snd_soc_component *snd_soc_lookup_component_nolocked(struct device *dev,















							    const char *driver_name);















struct snd_soc_component *snd_soc_lookup_component(struct device *dev,









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE