Unverified Commit 309d4014 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Merge up 6.2 fixes 

To resolve a conflict and support further development.
parents 24b401f3 c1619ea2

Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ properties: 
  compatible:

    enum:

      - mediatek,mt8186-mt6366-rt1019-rt5682s-sound

      - mediatek,mt8186-mt6366-rt5682s-max98360-sound



  mediatek,platform:

    $ref: "/schemas/types.yaml#/definitions/phandle"

drivers/spi/spi-mt65xx.c

+5 −7
Original line number Diff line number Diff line
@@ -1253,6 +1253,11 @@ static int mtk_spi_probe(struct platform_device *pdev) 
		dev_notice(dev, "SPI dma_set_mask(%d) failed, ret:%d\n",

			   addr_bits, ret);



	ret = devm_request_irq(dev, irq, mtk_spi_interrupt,

			       IRQF_TRIGGER_NONE, dev_name(dev), master);

	if (ret)

		return dev_err_probe(dev, ret, "failed to register irq\n");



	pm_runtime_enable(dev);



	ret = devm_spi_register_master(dev, master);
@@ -1261,13 +1266,6 @@ static int mtk_spi_probe(struct platform_device *pdev) 
		return dev_err_probe(dev, ret, "failed to register master\n");

	}



	ret = devm_request_irq(dev, irq, mtk_spi_interrupt,

			       IRQF_TRIGGER_NONE, dev_name(dev), master);

	if (ret) {

		pm_runtime_disable(dev);

		return dev_err_probe(dev, ret, "failed to register irq\n");

	}



	return 0;

}

sound/soc/amd/acp-es8336.c

+4 −2
Original line number Diff line number Diff line
@@ -198,9 +198,11 @@ static int st_es8336_late_probe(struct snd_soc_card *card) 
	int ret;



	adev = acpi_dev_get_first_match_dev("ESSX8336", NULL, -1);

	if (adev)

		put_device(&adev->dev);

	if (!adev)

		return -ENODEV;



	codec_dev = acpi_get_first_physical_node(adev);

	acpi_dev_put(adev);

	if (!codec_dev)

		dev_err(card->dev, "can not find codec dev\n");

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

+28 −0
Original line number Diff line number Diff line
@@ -206,6 +206,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "UM5302TA"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "M5402RA"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {
@@ -220,6 +227,27 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Redmi Book Pro 14 2022"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "Razer"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Blade 14 (2022) - RZ09-0427"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "RB"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Swift SFA16-41"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "IRBIS"),

			DMI_MATCH(DMI_PRODUCT_NAME, "15NBC1011"),

		}

	},

	{}

};

sound/soc/codecs/rt9120.c

+12 −0
Original line number Diff line number Diff line
@@ -177,8 +177,20 @@ static int rt9120_codec_probe(struct snd_soc_component *comp) 
	return 0;

}



static int rt9120_codec_suspend(struct snd_soc_component *comp)

{

	return pm_runtime_force_suspend(comp->dev);

}



static int rt9120_codec_resume(struct snd_soc_component *comp)

{

	return pm_runtime_force_resume(comp->dev);

}



static const struct snd_soc_component_driver rt9120_component_driver = {

	.probe = rt9120_codec_probe,

	.suspend = rt9120_codec_suspend,

	.resume = rt9120_codec_resume,

	.controls = rt9120_snd_controls,

	.num_controls = ARRAY_SIZE(rt9120_snd_controls),

	.dapm_widgets = rt9120_dapm_widgets,