From 51e1bc3a7b15dd635e2afb9d4d2ee1807fa057d5 Mon Sep 17 00:00:00 2001 From: Sven Schnelle Date: Sun, 5 Jun 2011 21:32:51 +0200 Subject: T60/PMH7: move 'touchpad' option to pmh7 This option is PMH7 specific, and should be moved there, so all Notebook utilizing a PMH7 have this option. For Thinkpads without Touchpad (like the X60), simply don't add 'touchpad' to cmos.layout. Change-Id: Icdd0093670d565f1b16e2483aa286f4d63ccc52a Signed-off-by: Sven Schnelle Reviewed-on: http://review.coreboot.org/6 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/ec/lenovo/pmh7/pmh7.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/ec') diff --git a/src/ec/lenovo/pmh7/pmh7.c b/src/ec/lenovo/pmh7/pmh7.c index 0ac8fa18de..30460c9021 100644 --- a/src/ec/lenovo/pmh7/pmh7.c +++ b/src/ec/lenovo/pmh7/pmh7.c @@ -24,6 +24,7 @@ #include #include "pmh7.h" #include "chip.h" +#include void pmh7_backlight_enable(int onoff) { @@ -94,6 +95,7 @@ static void enable_dev(device_t dev) { struct ec_lenovo_pmh7_config *conf = dev->chip_info; struct resource *resource; + u8 val; resource = new_resource(dev, EC_LENOVO_PMH7_INDEX); resource->flags = IORESOURCE_IO | IORESOURCE_FIXED; @@ -104,6 +106,9 @@ static void enable_dev(device_t dev) pmh7_backlight_enable(conf->backlight_enable); pmh7_dock_event_enable(conf->dock_event_enable); + + if (!get_option(&val, "touchpad")) + pmh7_touchpad_enable(val); } struct chip_operations ec_lenovo_pmh7_ops = { -- cgit v1.2.3