summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/lenovo/t400/Kconfig9
-rw-r--r--src/mainboard/lenovo/t400/Kconfig.name4
-rw-r--r--src/mainboard/lenovo/t400/devicetree.cb7
-rw-r--r--src/mainboard/lenovo/t400/dock.h4
-rw-r--r--src/mainboard/lenovo/t400/mainboard.c1
5 files changed, 9 insertions, 16 deletions
diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig
index 7bae12d56e..e410f20038 100644
--- a/src/mainboard/lenovo/t400/Kconfig
+++ b/src/mainboard/lenovo/t400/Kconfig
@@ -1,4 +1,4 @@
-if BOARD_LENOVO_X200
+if BOARD_LENOVO_T400
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
@@ -22,15 +22,14 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
select INTEL_INT15
select SUPERIO_NSC_PC87382
- select DRIVERS_LENOVO_WACOM
config MAINBOARD_DIR
string
- default lenovo/x200
+ default lenovo/t400
config MAINBOARD_PART_NUMBER
string
- default "ThinkPad X200"
+ default "ThinkPad T400"
config MMCONF_BASE_ADDRESS
hex
@@ -48,4 +47,4 @@ config CBFS_SIZE
hex
default 0x200000
-endif # BOARD_LENOVO_X200
+endif # BOARD_LENOVO_T400
diff --git a/src/mainboard/lenovo/t400/Kconfig.name b/src/mainboard/lenovo/t400/Kconfig.name
index 8e1dd430b1..56a575e317 100644
--- a/src/mainboard/lenovo/t400/Kconfig.name
+++ b/src/mainboard/lenovo/t400/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_LENOVO_X200
- bool "ThinkPad X200 / X200t"
+config BOARD_LENOVO_T400
+ bool "ThinkPad T400"
diff --git a/src/mainboard/lenovo/t400/devicetree.cb b/src/mainboard/lenovo/t400/devicetree.cb
index cb4a021135..c3fffe863d 100644
--- a/src/mainboard/lenovo/t400/devicetree.cb
+++ b/src/mainboard/lenovo/t400/devicetree.cb
@@ -181,12 +181,7 @@ chip northbridge/intel/gm45
end
chip superio/nsc/pc87382
- device pnp 164e.3 on # Digitizer
- io 0x60 = 0x200
- irq 0x29 = 0xb0
- irq 0x70 = 0x5
- irq 0xf0 = 0x82
- end
+ device pnp 164e.3 off end
# IR, not connected
device pnp 164e.2 off end
# GPIO, not connected
diff --git a/src/mainboard/lenovo/t400/dock.h b/src/mainboard/lenovo/t400/dock.h
index a5029e1d60..0b97531265 100644
--- a/src/mainboard/lenovo/t400/dock.h
+++ b/src/mainboard/lenovo/t400/dock.h
@@ -17,8 +17,8 @@
* Foundation, Inc.
*/
-#ifndef THINKPAD_X200_DOCK_H
-#define THINKPAD_X200_DOCK_H
+#ifndef THINKPAD_T400_DOCK_H
+#define THINKPAD_T400_DOCK_H
extern void dock_connect(void);
extern void dock_disconnect(void);
diff --git a/src/mainboard/lenovo/t400/mainboard.c b/src/mainboard/lenovo/t400/mainboard.c
index 3ec615fe00..c8bc10b029 100644
--- a/src/mainboard/lenovo/t400/mainboard.c
+++ b/src/mainboard/lenovo/t400/mainboard.c
@@ -34,7 +34,6 @@
static void fill_ssdt(void)
{
- drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 0);
}
static void mainboard_enable(device_t dev)