summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ec/lenovo/h8/Kconfig7
-rw-r--r--src/ec/lenovo/h8/acpi/thinkpad.asl2
-rw-r--r--src/mainboard/lenovo/t420/Kconfig3
-rw-r--r--src/mainboard/lenovo/t430/Kconfig3
-rw-r--r--src/mainboard/lenovo/t440p/Kconfig3
-rw-r--r--src/mainboard/lenovo/t520/Kconfig3
-rw-r--r--src/mainboard/lenovo/t530/Kconfig3
-rw-r--r--src/mainboard/lenovo/x230/Kconfig3
8 files changed, 26 insertions, 1 deletions
diff --git a/src/ec/lenovo/h8/Kconfig b/src/ec/lenovo/h8/Kconfig
index 6bd290f50e..2ea4faa9e2 100644
--- a/src/ec/lenovo/h8/Kconfig
+++ b/src/ec/lenovo/h8/Kconfig
@@ -44,4 +44,11 @@ config H8_HAS_PRIMARY_FN_KEYS
bool
default n
+config THINKPADEC_HKEY_EISAID
+ string
+ default "IBM0068"
+ help
+ Motherboards of newer thinkpad models can override the default to match
+ vendor drivers and quirks.
+
endif # EC_LENOVO_H8
diff --git a/src/ec/lenovo/h8/acpi/thinkpad.asl b/src/ec/lenovo/h8/acpi/thinkpad.asl
index 0b8ca15eb2..eca0d4471d 100644
--- a/src/ec/lenovo/h8/acpi/thinkpad.asl
+++ b/src/ec/lenovo/h8/acpi/thinkpad.asl
@@ -8,7 +8,7 @@ Device (HKEY)
External (\HKBL, IntObj)
External (\HUWB, IntObj)
- Name (_HID, EisaId ("IBM0068"))
+ Name (_HID, EisaId (CONFIG_THINKPADEC_HKEY_EISAID))
Name (BTN, 0)
diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig
index dfc8ed1d61..182ca46d58 100644
--- a/src/mainboard/lenovo/t420/Kconfig
+++ b/src/mainboard/lenovo/t420/Kconfig
@@ -81,4 +81,7 @@ config PS2K_EISAID
config PS2M_EISAID
default "LEN0015"
+config THINKPADEC_HKEY_EISAID
+ default "LEN0068"
+
endif # BOARD_LENOVO_T420
diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig
index 45c7ae307a..6139452e86 100644
--- a/src/mainboard/lenovo/t430/Kconfig
+++ b/src/mainboard/lenovo/t430/Kconfig
@@ -75,4 +75,7 @@ config PS2K_EISAID
config PS2M_EISAID
default "LEN0015"
+config THINKPADEC_HKEY_EISAID
+ default "LEN0068"
+
endif
diff --git a/src/mainboard/lenovo/t440p/Kconfig b/src/mainboard/lenovo/t440p/Kconfig
index e6785488df..7310dc106b 100644
--- a/src/mainboard/lenovo/t440p/Kconfig
+++ b/src/mainboard/lenovo/t440p/Kconfig
@@ -76,4 +76,7 @@ config PS2K_EISAID
config PS2M_EISAID
default "LEN0036"
+config THINKPADEC_HKEY_EISAID
+ default "LEN0068"
+
endif
diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig
index aebb2dee46..3529367d3f 100644
--- a/src/mainboard/lenovo/t520/Kconfig
+++ b/src/mainboard/lenovo/t520/Kconfig
@@ -90,4 +90,7 @@ config PS2K_EISAID
config PS2M_EISAID
default "LEN0015"
+config THINKPADEC_HKEY_EISAID
+ default "LEN0068"
+
endif
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig
index 2a0e3ea039..4dc77e9266 100644
--- a/src/mainboard/lenovo/t530/Kconfig
+++ b/src/mainboard/lenovo/t530/Kconfig
@@ -91,4 +91,7 @@ config PS2K_EISAID
config PS2M_EISAID
default "LEN0015"
+config THINKPADEC_HKEY_EISAID
+ default "LEN0068"
+
endif
diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig
index 37b264dab2..f134bc863c 100644
--- a/src/mainboard/lenovo/x230/Kconfig
+++ b/src/mainboard/lenovo/x230/Kconfig
@@ -89,4 +89,7 @@ config PS2K_EISAID
config PS2M_EISAID
default "LEN0020"
+config THINKPADEC_HKEY_EISAID
+ default "LEN0068"
+
endif # BOARD_LENOVO_X230 || BOARD_LENOVO_X230T