1 // SPDX-License-Identifier: GPL-2.0-only 1 // SPDX-License-Identifier: GPL-2.0-only
2 /* 2 /*
3 * wm8804-i2c.c -- WM8804 S/PDIF transceiver 3 * wm8804-i2c.c -- WM8804 S/PDIF transceiver driver - I2C
4 * 4 *
5 * Copyright 2015 Cirrus Logic Inc 5 * Copyright 2015 Cirrus Logic Inc
6 * 6 *
7 * Author: Charles Keepax <ckeepax@opensource. 7 * Author: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
8 */ 8 */
9 9
10 #include <linux/init.h> 10 #include <linux/init.h>
11 #include <linux/module.h> 11 #include <linux/module.h>
12 #include <linux/i2c.h> 12 #include <linux/i2c.h>
13 #include <linux/acpi.h> 13 #include <linux/acpi.h>
14 14
15 #include "wm8804.h" 15 #include "wm8804.h"
16 16
17 static int wm8804_i2c_probe(struct i2c_client 17 static int wm8804_i2c_probe(struct i2c_client *i2c)
18 { 18 {
19 struct regmap *regmap; 19 struct regmap *regmap;
20 20
21 regmap = devm_regmap_init_i2c(i2c, &wm 21 regmap = devm_regmap_init_i2c(i2c, &wm8804_regmap_config);
22 if (IS_ERR(regmap)) 22 if (IS_ERR(regmap))
23 return PTR_ERR(regmap); 23 return PTR_ERR(regmap);
24 24
25 return wm8804_probe(&i2c->dev, regmap) 25 return wm8804_probe(&i2c->dev, regmap);
26 } 26 }
27 27
28 static void wm8804_i2c_remove(struct i2c_clien !! 28 static int wm8804_i2c_remove(struct i2c_client *i2c)
29 { 29 {
30 wm8804_remove(&i2c->dev); 30 wm8804_remove(&i2c->dev);
>> 31 return 0;
31 } 32 }
32 33
33 static const struct i2c_device_id wm8804_i2c_i 34 static const struct i2c_device_id wm8804_i2c_id[] = {
34 { "wm8804" }, !! 35 { "wm8804", 0 },
35 { } 36 { }
36 }; 37 };
37 MODULE_DEVICE_TABLE(i2c, wm8804_i2c_id); 38 MODULE_DEVICE_TABLE(i2c, wm8804_i2c_id);
38 39
39 #if defined(CONFIG_OF) 40 #if defined(CONFIG_OF)
40 static const struct of_device_id wm8804_of_mat 41 static const struct of_device_id wm8804_of_match[] = {
41 { .compatible = "wlf,wm8804", }, 42 { .compatible = "wlf,wm8804", },
42 { } 43 { }
43 }; 44 };
44 MODULE_DEVICE_TABLE(of, wm8804_of_match); 45 MODULE_DEVICE_TABLE(of, wm8804_of_match);
45 #endif 46 #endif
46 47
47 #ifdef CONFIG_ACPI 48 #ifdef CONFIG_ACPI
48 static const struct acpi_device_id wm8804_acpi 49 static const struct acpi_device_id wm8804_acpi_match[] = {
49 { "1AEC8804", 0 }, /* Wolfson PCI ID + 50 { "1AEC8804", 0 }, /* Wolfson PCI ID + part ID */
50 { "10138804", 0 }, /* Cirrus Logic PCI 51 { "10138804", 0 }, /* Cirrus Logic PCI ID + part ID */
51 { }, 52 { },
52 }; 53 };
53 MODULE_DEVICE_TABLE(acpi, wm8804_acpi_match); 54 MODULE_DEVICE_TABLE(acpi, wm8804_acpi_match);
54 #endif 55 #endif
55 56
56 static struct i2c_driver wm8804_i2c_driver = { 57 static struct i2c_driver wm8804_i2c_driver = {
57 .driver = { 58 .driver = {
58 .name = "wm8804", 59 .name = "wm8804",
59 .pm = &wm8804_pm, 60 .pm = &wm8804_pm,
60 .of_match_table = of_match_ptr 61 .of_match_table = of_match_ptr(wm8804_of_match),
61 .acpi_match_table = ACPI_PTR(w 62 .acpi_match_table = ACPI_PTR(wm8804_acpi_match),
62 }, 63 },
63 .probe = wm8804_i2c_probe, !! 64 .probe_new = wm8804_i2c_probe,
64 .remove = wm8804_i2c_remove, 65 .remove = wm8804_i2c_remove,
65 .id_table = wm8804_i2c_id 66 .id_table = wm8804_i2c_id
66 }; 67 };
67 68
68 module_i2c_driver(wm8804_i2c_driver); 69 module_i2c_driver(wm8804_i2c_driver);
69 70
70 MODULE_DESCRIPTION("ASoC WM8804 driver - I2C") 71 MODULE_DESCRIPTION("ASoC WM8804 driver - I2C");
71 MODULE_AUTHOR("Charles Keepax <ckeepax@opensou 72 MODULE_AUTHOR("Charles Keepax <ckeepax@opensource.wolfsonmicro.com>");
72 MODULE_LICENSE("GPL"); 73 MODULE_LICENSE("GPL");
73 74
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.