1 files changed, 20 insertions, 4 deletions

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index c3d11fabc46f..3b8ceee7c5cb 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -196,6 +196,7 @@ enum tpacpi_hkey_event_t {
         /* Key-related user-interface events */
         TP_HKEY_EV_KEY_NUMLOCK          = 0x6000, /* NumLock key pressed */
         TP_HKEY_EV_KEY_FN               = 0x6005, /* Fn key pressed? E420 */
+        TP_HKEY_EV_KEY_FN_ESC           = 0x6060, /* Fn+Esc key pressed X240 */
 
         /* Thermal events */
         TP_HKEY_EV_ALARM_BAT_HOT        = 0x6011, /* battery too hot */
@@ -3456,7 +3457,7 @@ enum ADAPTIVE_KEY_MODE {
         LAYFLAT_MODE
 };
 
-const int adaptive_keyboard_modes[] = {
+static const int adaptive_keyboard_modes[] = {
         HOME_MODE,
 /*      WEB_BROWSER_MODE = 2,
         WEB_CONFERENCE_MODE = 3, */
@@ -3712,6 +3713,7 @@ static bool hotkey_notify_6xxx(const u32 hkey,
 
         case TP_HKEY_EV_KEY_NUMLOCK:
         case TP_HKEY_EV_KEY_FN:
+        case TP_HKEY_EV_KEY_FN_ESC:
                 /* key press events, we just ignore them as long as the EC
                  * is still reporting them in the normal keyboard stream */
                 *send_acpi_ev = false;
@@ -8883,17 +8885,31 @@ static bool __pure __init tpacpi_is_fw_digit(const char c)
         return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z');
 }
 
-/* Most models: xxyTkkWW (#.##c); Ancient 570/600 and -SL lacks (#.##c) */
 static bool __pure __init tpacpi_is_valid_fw_id(const char * const s,
                                                 const char t)
 {
-        return s && strlen(s) >= 8 &&
+        /*
+         * Most models: xxyTkkWW (#.##c)
+         * Ancient 570/600 and -SL lacks (#.##c)
+         */
+        if (s && strlen(s) >= 8 &&
                 tpacpi_is_fw_digit(s[0]) &&
                 tpacpi_is_fw_digit(s[1]) &&
                 s[2] == t &&
                 (s[3] == 'T' || s[3] == 'N') &&
                 tpacpi_is_fw_digit(s[4]) &&
-                tpacpi_is_fw_digit(s[5]);
+                tpacpi_is_fw_digit(s[5]))
+                return true;
+
+        /* New models: xxxyTkkW (#.##c); T550 and some others */
+        return s && strlen(s) >= 8 &&
+                tpacpi_is_fw_digit(s[0]) &&
+                tpacpi_is_fw_digit(s[1]) &&
+                tpacpi_is_fw_digit(s[2]) &&
+                s[3] == t &&
+                (s[4] == 'T' || s[4] == 'N') &&
+                tpacpi_is_fw_digit(s[5]) &&
+                tpacpi_is_fw_digit(s[6]);
 }
 
 /* returns 0 - probe ok, or < 0 - probe error.