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

Merge tag 'asoc-fix-v6.5-rc1' of... 

Merge tag 'asoc-fix-v6.5-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.5

A lot of fixes here for the Qualcomm CODEC drivers, there was quite a
bit of fragility with the SoundWire probe due to the combined DT and
hotplug approach that the bus has which Johan Hovold fixed along with a
bunch of other issues that came up in the process.  Srivinvas Kandagatla
also fixed some separate issues that have been lurking for a while in
the Qualcomm AP side, and there's a good set of AMD fixes from Vijendar
Mukunda too.
parents 69ea4c9d e8bf1741

Documentation/devicetree/bindings/sound/audio-graph-card2.yaml

+1 −19
Original line number Diff line number Diff line
@@ -39,22 +39,4 @@ required: 


additionalProperties: false



examples:

  - |

    sound {

        compatible = "audio-graph-card2";



        links = <&cpu_port>;

    };



    cpu {

        compatible = "cpu-driver";



        cpu_port: port { cpu_ep: endpoint { remote-endpoint = <&codec_ep>; }; };

    };



    codec {

        compatible = "codec-driver";



        port { codec_ep: endpoint { remote-endpoint = <&cpu_ep>; }; };

    };
 
...

Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Google SC7180-Trogdor ASoC sound card driver



maintainers:

  - Rohit kumar <rohitkr@codeaurora.org>

  - Rohit kumar <quic_rohkumar@quicinc.com>

  - Cheng-Yi Chiang <cychiang@chromium.org>



description:

Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ title: Qualcomm Technologies Inc. LPASS CPU dai driver 


maintainers:

  - Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

  - Rohit kumar <rohitkr@codeaurora.org>

  - Rohit kumar <quic_rohkumar@quicinc.com>



description: |

  Qualcomm Technologies Inc. SOC Low-Power Audio SubSystem (LPASS) that consist

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -1865,9 +1865,11 @@ M: Martin Povišer <povik+lin@cutebit.org> 
L:	asahi@lists.linux.dev

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

S:	Maintained

F:	Documentation/devicetree/bindings/sound/adi,ssm3515.yaml

F:	Documentation/devicetree/bindings/sound/apple,*

F:	sound/soc/apple/*

F:	sound/soc/codecs/cs42l83-i2c.c

F:	sound/soc/codecs/ssm3515.c









ARM/APPLE MACHINE SUPPORT









M:	Hector Martin <marcan@marcan.st>
































sound/soc/amd/acp/amd.h



+4
−3






























Original line number
Diff line number
Diff line







@@ -173,7 +173,7 @@ int snd_amd_acp_find_config(struct pci_dev *pci);

















static inline u64 acp_get_byte_count(struct acp_dev_data *adata, int dai_id, int direction)









{









	u64 byte_count, low = 0, high = 0;









	u64 byte_count = 0, low = 0, high = 0;



















	if (direction == SNDRV_PCM_STREAM_PLAYBACK) {









		switch (dai_id) {








@@ -191,7 +191,7 @@ static inline u64 acp_get_byte_count(struct acp_dev_data *adata, int dai_id, int







			break;









		default:









			dev_err(adata->dev, "Invalid dai id %x\n", dai_id);









			return -EINVAL;









			goto POINTER_RETURN_BYTES;









		}









	} else {









		switch (dai_id) {








@@ -213,12 +213,13 @@ static inline u64 acp_get_byte_count(struct acp_dev_data *adata, int dai_id, int







			break;









		default:









			dev_err(adata->dev, "Invalid dai id %x\n", dai_id);









			return -EINVAL;









			goto POINTER_RETURN_BYTES;









		}









	}









	/* Get 64 bit value from two 32 bit registers */









	byte_count = (high << 32) | low;



















POINTER_RETURN_BYTES:









	return byte_count;









}