summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorYu Ning <yu.ning@intel.com>2016-03-01 23:46:10 +0000
committerSebastian Reichel <sre@kernel.org>2016-03-03 13:55:36 +0100
commitfdb2f37a54470473c6b7c9d680c4c114dd9bc434 (patch)
tree8be0aa886cd6f719e2311f4daafa4e177a8ff3d7 /drivers/power
parent65d687a7b7d6f27e4306fe8cc8a1ca66a1a760f6 (diff)
downloadblackbird-op-linux-fdb2f37a54470473c6b7c9d680c4c114dd9bc434.tar.gz
blackbird-op-linux-fdb2f37a54470473c6b7c9d680c4c114dd9bc434.zip
goldfish: Enable ACPI-based enumeration for goldfish battery
Add the ACPI bindings to the goldfish battery driver. Signed-off-by: Yu Ning <yu.ning@intel.com> Signed-off-by: Jin Qian <jinqian@android.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/goldfish_battery.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/power/goldfish_battery.c b/drivers/power/goldfish_battery.c
index 7510796e190c..f5c525e4482a 100644
--- a/drivers/power/goldfish_battery.c
+++ b/drivers/power/goldfish_battery.c
@@ -24,6 +24,7 @@
#include <linux/pci.h>
#include <linux/interrupt.h>
#include <linux/io.h>
+#include <linux/acpi.h>
struct goldfish_battery_data {
void __iomem *reg_base;
@@ -233,12 +234,19 @@ static const struct of_device_id goldfish_battery_of_match[] = {
};
MODULE_DEVICE_TABLE(of, goldfish_battery_of_match);
+static const struct acpi_device_id goldfish_battery_acpi_match[] = {
+ { "GFSH0001", 0 },
+ { },
+};
+MODULE_DEVICE_TABLE(acpi, goldfish_battery_acpi_match);
+
static struct platform_driver goldfish_battery_device = {
.probe = goldfish_battery_probe,
.remove = goldfish_battery_remove,
.driver = {
.name = "goldfish-battery",
.of_match_table = goldfish_battery_of_match,
+ .acpi_match_table = ACPI_PTR(goldfish_battery_acpi_match),
}
};
module_platform_driver(goldfish_battery_device);
OpenPOWER on IntegriCloud