File tree Expand file tree Collapse file tree 1 file changed +14
-1
lines changed Expand file tree Collapse file tree 1 file changed +14
-1
lines changed Original file line number Diff line number Diff line change 14
14
#include <linux/pm.h>
15
15
#include <linux/clk.h>
16
16
#include <linux/i2c.h>
17
+ #include <linux/acpi.h>
17
18
#include <linux/slab.h>
18
19
#include <sound/core.h>
19
20
#include <sound/pcm.h>
@@ -1498,16 +1499,28 @@ static const struct i2c_device_id wm8960_i2c_id[] = {
1498
1499
};
1499
1500
MODULE_DEVICE_TABLE (i2c , wm8960_i2c_id );
1500
1501
1502
+ #if defined(CONFIG_OF )
1501
1503
static const struct of_device_id wm8960_of_match [] = {
1502
1504
{ .compatible = "wlf,wm8960" , },
1503
1505
{ }
1504
1506
};
1505
1507
MODULE_DEVICE_TABLE (of , wm8960_of_match );
1508
+ #endif
1509
+
1510
+ #if defined(CONFIG_ACPI )
1511
+ static const struct acpi_device_id wm8960_acpi_match [] = {
1512
+ { "1AEC8960" , 0 }, /* Wolfson PCI ID + part ID */
1513
+ { "10138960" , 0 }, /* Cirrus Logic PCI ID + part ID */
1514
+ { },
1515
+ };
1516
+ MODULE_DEVICE_TABLE (acpi , wm8960_acpi_match );
1517
+ #endif
1506
1518
1507
1519
static struct i2c_driver wm8960_i2c_driver = {
1508
1520
.driver = {
1509
1521
.name = "wm8960" ,
1510
- .of_match_table = wm8960_of_match ,
1522
+ .of_match_table = of_match_ptr (wm8960_of_match ),
1523
+ .acpi_match_table = ACPI_PTR (wm8960_acpi_match ),
1511
1524
},
1512
1525
.probe = wm8960_i2c_probe ,
1513
1526
.remove = wm8960_i2c_remove ,
You can’t perform that action at this time.
0 commit comments