diff options
author | Pali Rohár <pali.rohar@gmail.com> | 2016-02-21 06:28:22 -0500 |
---|---|---|
committer | Sebastian Reichel <sre@kernel.org> | 2016-02-21 14:26:00 -0500 |
commit | 7df3a7468fffc79ed057115eb455048672f49f4e (patch) | |
tree | 6dedb5f77ee5f8f6cf921e1a5cdf1991cb1a8854 /drivers/power | |
parent | 523e5501411dadf9593fa850344b801e95095720 (diff) |
power_supply: bq27xxx_battery: Add of modalias and match table when CONFIG_OF is enabled
Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power')
-rw-r--r-- | drivers/power/bq27xxx_battery.c | 12 | ||||
-rw-r--r-- | drivers/power/bq27xxx_battery_i2c.c | 24 |
2 files changed, 36 insertions, 0 deletions
diff --git a/drivers/power/bq27xxx_battery.c b/drivers/power/bq27xxx_battery.c index 6b027a418943..45f6ebf88df6 100644 --- a/drivers/power/bq27xxx_battery.c +++ b/drivers/power/bq27xxx_battery.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include <linux/platform_device.h> | 46 | #include <linux/platform_device.h> |
47 | #include <linux/power_supply.h> | 47 | #include <linux/power_supply.h> |
48 | #include <linux/slab.h> | 48 | #include <linux/slab.h> |
49 | #include <linux/of.h> | ||
49 | 50 | ||
50 | #include <linux/power/bq27xxx_battery.h> | 51 | #include <linux/power/bq27xxx_battery.h> |
51 | 52 | ||
@@ -1090,16 +1091,27 @@ static const struct platform_device_id bq27xxx_battery_platform_id_table[] = { | |||
1090 | }; | 1091 | }; |
1091 | MODULE_DEVICE_TABLE(platform, bq27xxx_battery_platform_id_table); | 1092 | MODULE_DEVICE_TABLE(platform, bq27xxx_battery_platform_id_table); |
1092 | 1093 | ||
1094 | #ifdef CONFIG_OF | ||
1095 | static const struct of_device_id bq27xxx_battery_platform_of_match_table[] = { | ||
1096 | { .compatible = "ti,bq27000" }, | ||
1097 | {}, | ||
1098 | }; | ||
1099 | MODULE_DEVICE_TABLE(of, bq27xxx_battery_platform_of_match_table); | ||
1100 | #endif | ||
1101 | |||
1093 | static struct platform_driver bq27xxx_battery_platform_driver = { | 1102 | static struct platform_driver bq27xxx_battery_platform_driver = { |
1094 | .probe = bq27xxx_battery_platform_probe, | 1103 | .probe = bq27xxx_battery_platform_probe, |
1095 | .remove = bq27xxx_battery_platform_remove, | 1104 | .remove = bq27xxx_battery_platform_remove, |
1096 | .driver = { | 1105 | .driver = { |
1097 | .name = "bq27000-battery", | 1106 | .name = "bq27000-battery", |
1107 | .of_match_table = of_match_ptr(bq27xxx_battery_platform_of_match_table), | ||
1098 | }, | 1108 | }, |
1099 | .id_table = bq27xxx_battery_platform_id_table, | 1109 | .id_table = bq27xxx_battery_platform_id_table, |
1100 | }; | 1110 | }; |
1101 | module_platform_driver(bq27xxx_battery_platform_driver); | 1111 | module_platform_driver(bq27xxx_battery_platform_driver); |
1102 | 1112 | ||
1113 | MODULE_ALIAS("platform:bq27000-battery"); | ||
1114 | |||
1103 | MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>"); | 1115 | MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>"); |
1104 | MODULE_DESCRIPTION("BQ27xxx battery monitor driver"); | 1116 | MODULE_DESCRIPTION("BQ27xxx battery monitor driver"); |
1105 | MODULE_LICENSE("GPL"); | 1117 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/power/bq27xxx_battery_i2c.c b/drivers/power/bq27xxx_battery_i2c.c index 9429e66be096..b810e08cc08a 100644 --- a/drivers/power/bq27xxx_battery_i2c.c +++ b/drivers/power/bq27xxx_battery_i2c.c | |||
@@ -135,9 +135,33 @@ static const struct i2c_device_id bq27xxx_i2c_id_table[] = { | |||
135 | }; | 135 | }; |
136 | MODULE_DEVICE_TABLE(i2c, bq27xxx_i2c_id_table); | 136 | MODULE_DEVICE_TABLE(i2c, bq27xxx_i2c_id_table); |
137 | 137 | ||
138 | #ifdef CONFIG_OF | ||
139 | static const struct of_device_id bq27xxx_battery_i2c_of_match_table[] = { | ||
140 | { .compatible = "ti,bq27200" }, | ||
141 | { .compatible = "ti,bq27210" }, | ||
142 | { .compatible = "ti,bq27500" }, | ||
143 | { .compatible = "ti,bq27510" }, | ||
144 | { .compatible = "ti,bq27520" }, | ||
145 | { .compatible = "ti,bq27530" }, | ||
146 | { .compatible = "ti,bq27531" }, | ||
147 | { .compatible = "ti,bq27541" }, | ||
148 | { .compatible = "ti,bq27542" }, | ||
149 | { .compatible = "ti,bq27546" }, | ||
150 | { .compatible = "ti,bq27742" }, | ||
151 | { .compatible = "ti,bq27545" }, | ||
152 | { .compatible = "ti,bq27421" }, | ||
153 | { .compatible = "ti,bq27425" }, | ||
154 | { .compatible = "ti,bq27441" }, | ||
155 | { .compatible = "ti,bq27621" }, | ||
156 | {}, | ||
157 | }; | ||
158 | MODULE_DEVICE_TABLE(of, bq27xxx_battery_i2c_of_match_table); | ||
159 | #endif | ||
160 | |||
138 | static struct i2c_driver bq27xxx_battery_i2c_driver = { | 161 | static struct i2c_driver bq27xxx_battery_i2c_driver = { |
139 | .driver = { | 162 | .driver = { |
140 | .name = "bq27xxx-battery", | 163 | .name = "bq27xxx-battery", |
164 | .of_match_table = of_match_ptr(bq27xxx_battery_i2c_of_match_table), | ||
141 | }, | 165 | }, |
142 | .probe = bq27xxx_battery_i2c_probe, | 166 | .probe = bq27xxx_battery_i2c_probe, |
143 | .remove = bq27xxx_battery_i2c_remove, | 167 | .remove = bq27xxx_battery_i2c_remove, |