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

Merge tag 'asoc-fix-v6.14-rc7' of... 

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

ASoC: Fixes for v6.14

A couple of small fixes, plus some new device IDs - nothing super urgent
here.
parents 78f4ca3c 45ff65e3

Documentation/devicetree/bindings/sound/fsl,sai.yaml

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ properties: 
              - fsl,imx93-sai

              - fsl,imx95-sai

              - fsl,vf610-sai

      - items:

          - enum:

              - fsl,imx94-sai

          - const: fsl,imx95-sai



  reg:

    maxItems: 1

sound/soc/amd/yc/acp6x-mach.c

+7 −0
Original line number Diff line number Diff line
@@ -584,6 +584,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_VERSION, "pang13"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "Micro-Star International Co., Ltd."),

			DMI_MATCH(DMI_PRODUCT_NAME, "Bravo 15 C7UCX"),

		}

	},

	{}

};

sound/soc/generic/simple-card-utils.c

+5 −2
Original line number Diff line number Diff line
@@ -1077,6 +1077,7 @@ static int graph_get_dai_id(struct device_node *ep) 
int graph_util_parse_dai(struct device *dev, struct device_node *ep,

			 struct snd_soc_dai_link_component *dlc, int *is_single_link)

{

	struct device_node *node;

	struct of_phandle_args args = {};

	struct snd_soc_dai *dai;

	int ret;
@@ -1084,7 +1085,7 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep, 
	if (!ep)

		return 0;



	struct device_node *node __free(device_node) = of_graph_get_port_parent(ep);

	node = of_graph_get_port_parent(ep);



	/*

	 * Try to find from DAI node
@@ -1126,8 +1127,10 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep, 
	 *    if he unbinded CPU or Codec.

	 */

	ret = snd_soc_get_dlc(&args, dlc);

	if (ret < 0)

	if (ret < 0) {

		of_node_put(node);

		return ret;

	}



parse_dai_end:

	if (is_single_link)

sound/soc/ti/j721e-evm.c

+2 −0
Original line number Diff line number Diff line
@@ -182,6 +182,8 @@ static int j721e_configure_refclk(struct j721e_priv *priv, 
		clk_id = J721E_CLK_PARENT_48000;

	else if (!(rate % 11025) && priv->pll_rates[J721E_CLK_PARENT_44100])

		clk_id = J721E_CLK_PARENT_44100;

	else if (!(rate % 11025) && priv->pll_rates[J721E_CLK_PARENT_48000])

		clk_id = J721E_CLK_PARENT_48000;

	else

		return ret;