diff options
author | Corentin Chary <corentincj@iksaif.net> | 2011-11-26 05:00:06 -0500 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2012-03-20 12:02:09 -0400 |
commit | 3a75d378703495a90d6b2b49a3f5332c953879e2 (patch) | |
tree | 117bf7fca74286971205fca6387cbbefa2ab458e | |
parent | cb5b5c912ee8d97ea60c2d6c43d17ab6585947b8 (diff) |
samsung-laptop: add usb charge support
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
-rw-r--r-- | Documentation/ABI/testing/sysfs-driver-samsung-laptop | 8 | ||||
-rw-r--r-- | drivers/platform/x86/samsung-laptop.c | 82 |
2 files changed, 90 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-driver-samsung-laptop b/Documentation/ABI/testing/sysfs-driver-samsung-laptop index a6a56e11ebaf..f05b897805e5 100644 --- a/Documentation/ABI/testing/sysfs-driver-samsung-laptop +++ b/Documentation/ABI/testing/sysfs-driver-samsung-laptop | |||
@@ -27,3 +27,11 @@ Description: Max battery charge level can be modified, battery cycle | |||
27 | level. | 27 | level. |
28 | 0 means normal battery mode (100% charge) | 28 | 0 means normal battery mode (100% charge) |
29 | 1 means battery life extender mode (80% charge) | 29 | 1 means battery life extender mode (80% charge) |
30 | |||
31 | What: /sys/devices/platform/samsung/usb_charge | ||
32 | Date: December 1, 2011 | ||
33 | KernelVersion: 3.3 | ||
34 | Contact: Corentin Chary <corentin.chary@gmail.com> | ||
35 | Description: Use your USB ports to charge devices, even | ||
36 | when your laptop is powered off. | ||
37 | 1 means enabled, 0 means disabled. | ||
diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c index 918fa358c11e..b8d2145981e0 100644 --- a/drivers/platform/x86/samsung-laptop.c +++ b/drivers/platform/x86/samsung-laptop.c | |||
@@ -108,6 +108,10 @@ struct sabi_commands { | |||
108 | u16 get_battery_life_extender; | 108 | u16 get_battery_life_extender; |
109 | u16 set_battery_life_extender; | 109 | u16 set_battery_life_extender; |
110 | 110 | ||
111 | /* 0x80 is off, 0x81 is on */ | ||
112 | u16 get_usb_charge; | ||
113 | u16 set_usb_charge; | ||
114 | |||
111 | /* | 115 | /* |
112 | * Tell the BIOS that Linux is running on this machine. | 116 | * Tell the BIOS that Linux is running on this machine. |
113 | * 81 is on, 80 is off | 117 | * 81 is on, 80 is off |
@@ -164,6 +168,9 @@ static const struct sabi_config sabi_configs[] = { | |||
164 | .get_battery_life_extender = 0xFFFF, | 168 | .get_battery_life_extender = 0xFFFF, |
165 | .set_battery_life_extender = 0xFFFF, | 169 | .set_battery_life_extender = 0xFFFF, |
166 | 170 | ||
171 | .get_usb_charge = 0xFFFF, | ||
172 | .set_usb_charge = 0xFFFF, | ||
173 | |||
167 | .set_linux = 0x0a, | 174 | .set_linux = 0x0a, |
168 | }, | 175 | }, |
169 | 176 | ||
@@ -214,6 +221,9 @@ static const struct sabi_config sabi_configs[] = { | |||
214 | .get_battery_life_extender = 0x65, | 221 | .get_battery_life_extender = 0x65, |
215 | .set_battery_life_extender = 0x66, | 222 | .set_battery_life_extender = 0x66, |
216 | 223 | ||
224 | .get_usb_charge = 0x67, | ||
225 | .set_usb_charge = 0x68, | ||
226 | |||
217 | .set_linux = 0xff, | 227 | .set_linux = 0xff, |
218 | }, | 228 | }, |
219 | 229 | ||
@@ -622,9 +632,79 @@ static ssize_t set_battery_life_extender(struct device *dev, | |||
622 | static DEVICE_ATTR(battery_life_extender, S_IWUSR | S_IRUGO, | 632 | static DEVICE_ATTR(battery_life_extender, S_IWUSR | S_IRUGO, |
623 | get_battery_life_extender, set_battery_life_extender); | 633 | get_battery_life_extender, set_battery_life_extender); |
624 | 634 | ||
635 | static int read_usb_charge(struct samsung_laptop *samsung) | ||
636 | { | ||
637 | const struct sabi_commands *commands = &samsung->config->commands; | ||
638 | struct sabi_data data; | ||
639 | int retval; | ||
640 | |||
641 | if (commands->get_usb_charge == 0xFFFF) | ||
642 | return -ENODEV; | ||
643 | |||
644 | memset(&data, 0, sizeof(data)); | ||
645 | data.data[0] = 0x80; | ||
646 | retval = sabi_command(samsung, commands->get_usb_charge, | ||
647 | &data, &data); | ||
648 | |||
649 | if (retval) | ||
650 | return retval; | ||
651 | |||
652 | if (data.data[0] != 0 && data.data[0] != 1) | ||
653 | return -ENODEV; | ||
654 | |||
655 | return data.data[0]; | ||
656 | } | ||
657 | |||
658 | static int write_usb_charge(struct samsung_laptop *samsung, | ||
659 | int enabled) | ||
660 | { | ||
661 | const struct sabi_commands *commands = &samsung->config->commands; | ||
662 | struct sabi_data data; | ||
663 | |||
664 | memset(&data, 0, sizeof(data)); | ||
665 | data.data[0] = 0x80 | enabled; | ||
666 | return sabi_command(samsung, commands->set_usb_charge, | ||
667 | &data, NULL); | ||
668 | } | ||
669 | |||
670 | static ssize_t get_usb_charge(struct device *dev, | ||
671 | struct device_attribute *attr, | ||
672 | char *buf) | ||
673 | { | ||
674 | struct samsung_laptop *samsung = dev_get_drvdata(dev); | ||
675 | int ret; | ||
676 | |||
677 | ret = read_usb_charge(samsung); | ||
678 | if (ret < 0) | ||
679 | return ret; | ||
680 | |||
681 | return sprintf(buf, "%d\n", ret); | ||
682 | } | ||
683 | |||
684 | static ssize_t set_usb_charge(struct device *dev, | ||
685 | struct device_attribute *attr, | ||
686 | const char *buf, size_t count) | ||
687 | { | ||
688 | struct samsung_laptop *samsung = dev_get_drvdata(dev); | ||
689 | int ret, value; | ||
690 | |||
691 | if (!count || sscanf(buf, "%i", &value) != 1) | ||
692 | return -EINVAL; | ||
693 | |||
694 | ret = write_usb_charge(samsung, !!value); | ||
695 | if (ret < 0) | ||
696 | return ret; | ||
697 | |||
698 | return count; | ||
699 | } | ||
700 | |||
701 | static DEVICE_ATTR(usb_charge, S_IWUSR | S_IRUGO, | ||
702 | get_usb_charge, set_usb_charge); | ||
703 | |||
625 | static struct attribute *platform_attributes[] = { | 704 | static struct attribute *platform_attributes[] = { |
626 | &dev_attr_performance_level.attr, | 705 | &dev_attr_performance_level.attr, |
627 | &dev_attr_battery_life_extender.attr, | 706 | &dev_attr_battery_life_extender.attr, |
707 | &dev_attr_usb_charge.attr, | ||
628 | NULL | 708 | NULL |
629 | }; | 709 | }; |
630 | 710 | ||
@@ -725,6 +805,8 @@ static mode_t samsung_sysfs_is_visible(struct kobject *kobj, | |||
725 | ok = !!samsung->config->performance_levels[0].name; | 805 | ok = !!samsung->config->performance_levels[0].name; |
726 | if (attr == &dev_attr_battery_life_extender.attr) | 806 | if (attr == &dev_attr_battery_life_extender.attr) |
727 | ok = !!(read_battery_life_extender(samsung) >= 0); | 807 | ok = !!(read_battery_life_extender(samsung) >= 0); |
808 | if (attr == &dev_attr_usb_charge.attr) | ||
809 | ok = !!(read_usb_charge(samsung) >= 0); | ||
728 | 810 | ||
729 | return ok ? attr->mode : 0; | 811 | return ok ? attr->mode : 0; |
730 | } | 812 | } |