Unverified Commit 7e0bdbae authored by Nicola Lunghi's avatar Nicola Lunghi Committed by Mark Brown
Browse files

ASoC: wm8960: Add ACPI support 

HID made of either Wolfson/CirrusLogic PCI ID + 8960 identifier

This helps enumerate the Waveshare WM8960 WM8960 Hi-Fi Sound
Card HAT on the Up2 platform.

The scripts at https://github.com/thesofproject/acpi-scripts


can be used to add the ACPI initrd overlay.

This commit is similar to the commit:
960cdd50 ("ASoC: wm8804: Add ACPI support")

Signed-off-by: default avatarNicola Lunghi <nick83ola@gmail.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220427212916.40145-1-nick83ola@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c61711c1

sound/soc/codecs/wm8960.c

+14 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/pm.h>

#include <linux/clk.h>

#include <linux/i2c.h>

#include <linux/acpi.h>

#include <linux/slab.h>

#include <sound/core.h>

#include <sound/pcm.h>
@@ -1498,16 +1499,28 @@ static const struct i2c_device_id wm8960_i2c_id[] = { 
};

MODULE_DEVICE_TABLE(i2c, wm8960_i2c_id);



#if defined(CONFIG_OF)

static const struct of_device_id wm8960_of_match[] = {

       { .compatible = "wlf,wm8960", },

       { }

};

MODULE_DEVICE_TABLE(of, wm8960_of_match);

#endif



#if defined(CONFIG_ACPI)

static const struct acpi_device_id wm8960_acpi_match[] = {

	{ "1AEC8960", 0 }, /* Wolfson PCI ID + part ID */

	{ "10138960", 0 }, /* Cirrus Logic PCI ID + part ID */

	{ },

};

MODULE_DEVICE_TABLE(acpi, wm8960_acpi_match);

#endif



static struct i2c_driver wm8960_i2c_driver = {

	.driver = {

		.name = "wm8960",

		.of_match_table = wm8960_of_match,

		.of_match_table = of_match_ptr(wm8960_of_match),

		.acpi_match_table = ACPI_PTR(wm8960_acpi_match),

	},

	.probe =    wm8960_i2c_probe,

	.remove =   wm8960_i2c_remove,