Commit 8c26c87b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-5.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into master 

Pull sound fixes from Takashi Iwai:
 "This became fairly large, containing mostly the collection of ASoC
  fixes that slipped from the previous request, so I sent now a bit
  earlier than usual. But all changes look small and mostly
  device-specific, hence nothing to worry too much.

  Majority of changes are for x86 based platforms and their CODEC
  drivers, in order to address some issues hit by their recent tests and
  fuzzing. The rest are other ASoC device-specific fixes (imx, qcom,
  wm8974, amd, rockchip) as well as a trivial fix for a kernel WARNING
  hit by syzkaller"

* tag 'sound-5.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (28 commits)
  ALSA: hda/realtek: Fixed ALC298 sound bug by adding quirk for Samsung Notebook Pen S
  ALSA: info: Drop WARN_ON() from buffer NULL sanity check
  ASoC: rt5682: Report the button event in the headset type only
  ASoC: Intel: bytcht_es8316: Add missed put_device()
  ASoC: rt5682: Enable Vref2 under using PLL2
  ASoC: rt286: fix unexpected interrupt happens
  ASoC: wm8974: remove unsupported clock mode
  ASoC: wm8974: fix Boost Mixer Aux Switch
  ASoC: SOF: core: fix null-ptr-deref bug during device removal
  ASoc: codecs: max98373: remove Idle_bias_on to let codec suspend
  ASoC: codecs: max98373: Removed superfluous volume control from chip default
  ASoC: topology: fix tlvs in error handling for widget_dmixer
  ASoC: topology: fix kernel oops on route addition error
  ASoC: SOF: imx: add min/max channels for SAI/ESAI on i.MX8/i.MX8M
  ASoC: Intel: bdw-rt5677: fix non BE conversion
  ASoC: soc-dai: set dai_link dpcm_ flags with a helper
  MAINTAINERS: Add Shengjiu to reviewer list of sound/soc/fsl
  ASoC: core: Remove only the registered component in devm functions
  MAINTAINERS: Change Maintainer for some at91 drivers
  ASoC: dt-bindings: simple-card: Fix 'make dt_binding_check' warnings
  ...
parents 4fa640dc 568e4e82

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

+13 −4
Original line number Diff line number Diff line
@@ -378,6 +378,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";
@@ -391,10 +393,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>;

        };
@@ -418,6 +422,8 @@ examples: 
  - |

    sound {

        compatible = "simple-audio-card";

        #address-cells = <1>;

        #size-cells = <0>;



        simple-audio-card,routing =

            "pcm3168a Playback", "DAI1 Playback",
@@ -426,6 +432,7 @@ examples: 
            "pcm3168a Playback", "DAI4 Playback";



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

            reg = <0>;

            format = "left_j";

            bitclock-master = <&sndcpu0>;

            frame-master = <&sndcpu0>;
@@ -439,22 +446,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 {
@@ -466,6 +474,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
@@ -6956,6 +6956,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
@@ -11333,17 +11334,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