Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 960cdd50 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: wm8804: Add ACPI support 

HID made of either Wolfson/CirrusLogic PCI ID + 8804 identifier.

This helps enumerate the HifiBerry Digi+ HAT boards on the Up2 platform.

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

 can be
used to add the ACPI initrd overlays.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 75094877

sound/soc/codecs/wm8804-i2c.c

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

#include <linux/module.h>

#include <linux/i2c.h>

#include <linux/acpi.h>



#include "wm8804.h"
@@ -40,17 +41,29 @@ static const struct i2c_device_id wm8804_i2c_id[] = { 
};

MODULE_DEVICE_TABLE(i2c, wm8804_i2c_id);



#if defined(CONFIG_OF)

static const struct of_device_id wm8804_of_match[] = {

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

	{ }

};

MODULE_DEVICE_TABLE(of, wm8804_of_match);

#endif



#ifdef CONFIG_ACPI

static const struct acpi_device_id wm8804_acpi_match[] = {

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

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

	{ },

};

MODULE_DEVICE_TABLE(acpi, wm8804_acpi_match);

#endif



static struct i2c_driver wm8804_i2c_driver = {

	.driver = {

		.name = "wm8804",

		.pm = &wm8804_pm,

		.of_match_table = wm8804_of_match,

		.of_match_table = of_match_ptr(wm8804_of_match),

		.acpi_match_table = ACPI_PTR(wm8804_acpi_match),

	},

	.probe = wm8804_i2c_probe,

	.remove = wm8804_i2c_remove,