#define HCI_KBD_ILLUMINATION           0x0095
 #define HCI_ECO_MODE                   0x0097
 #define HCI_ACCELEROMETER2             0x00a6
+#define HCI_BATTERY_CHARGE_MODE                0x00ba
 #define HCI_SYSTEM_INFO                        0xc000
 #define SCI_PANEL_POWER_ON             0x010d
 #define SCI_ILLUMINATION               0x014e
        unsigned int usb_three_supported:1;
        unsigned int wwan_supported:1;
        unsigned int cooling_method_supported:1;
+       unsigned int battery_charge_mode_supported:1;
        unsigned int sysfs_created:1;
        unsigned int special_functions;
 
        return (result == TOS_SUCCESS || result == TOS_SUCCESS2) ? 0 : -EIO;
 }
 
+/* Battery charge control */
+static void toshiba_battery_charge_mode_available(struct toshiba_acpi_dev *dev)
+{
+       u32 in[TCI_WORDS] = { HCI_GET, HCI_BATTERY_CHARGE_MODE, 0, 0, 0, 0 };
+       u32 out[TCI_WORDS];
+       acpi_status status;
+
+       dev->battery_charge_mode_supported = 0;
+
+       status = tci_raw(dev, in, out);
+       if (ACPI_FAILURE(status)) {
+               pr_err("ACPI call to get Battery Charge Mode failed\n");
+               return;
+       }
+
+       if (out[0] != TOS_SUCCESS && out[0] != TOS_SUCCESS2)
+               return;
+
+       dev->battery_charge_mode_supported = 1;
+}
+
+static int toshiba_battery_charge_mode_get(struct toshiba_acpi_dev *dev, u32 *state)
+{
+       u32 in[TCI_WORDS] = { HCI_GET, HCI_BATTERY_CHARGE_MODE, 0, 0, 0, 0x1 };
+       u32 out[TCI_WORDS];
+       int retries = 3;
+
+       do {
+               acpi_status status = tci_raw(dev, in, out);
+
+               if (ACPI_FAILURE(status))
+                       pr_err("ACPI call to get Battery Charge Mode failed\n");
+               switch (out[0]) {
+               case TOS_SUCCESS:
+               case TOS_SUCCESS2:
+                       *state = out[2];
+                       return 0;
+               case TOS_NOT_SUPPORTED:
+                       return -ENODEV;
+               case TOS_DATA_NOT_AVAILABLE:
+                       retries--;
+                       break;
+               default:
+                       return -EIO;
+               }
+       } while (retries);
+
+       return -EIO;
+}
+
+static int toshiba_battery_charge_mode_set(struct toshiba_acpi_dev *dev, u32 state)
+{
+       u32 result = hci_write(dev, HCI_BATTERY_CHARGE_MODE, state);
+
+       if (result == TOS_FAILURE)
+               pr_err("ACPI call to set Battery Charge Mode failed\n");
+
+       if (result == TOS_NOT_SUPPORTED)
+               return -ENODEV;
+
+       return (result == TOS_SUCCESS || result == TOS_SUCCESS2) ? 0 : -EIO;
+}
+
 /* Transflective Backlight */
 static int get_tr_backlight_status(struct toshiba_acpi_dev *dev, u32 *status)
 {
                pr_cont(" wwan");
        if (dev->cooling_method_supported)
                pr_cont(" cooling-method");
+       if (dev->battery_charge_mode_supported)
+               pr_cont(" battery-charge-mode");
 
        pr_cont("\n");
 }
 
        toshiba_cooling_method_available(dev);
 
+       toshiba_battery_charge_mode_available(dev);
+
        print_supported_features(dev);
 
        ret = sysfs_create_group(&dev->acpi_dev->dev.kobj,