summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ec/lenovo/pmh7/pmh7.c5
-rw-r--r--src/mainboard/lenovo/t60/mainboard.c7
2 files changed, 5 insertions, 7 deletions
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 <stdlib.h>
#include "pmh7.h"
#include "chip.h"
+#include <pc80/mc146818rtc.h>
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 = {
diff --git a/src/mainboard/lenovo/t60/mainboard.c b/src/mainboard/lenovo/t60/mainboard.c
index d2ee2fab4e..775145314e 100644
--- a/src/mainboard/lenovo/t60/mainboard.c
+++ b/src/mainboard/lenovo/t60/mainboard.c
@@ -34,12 +34,10 @@
#include <ec/acpi/ec.h>
#include <ec/lenovo/h8/h8.h>
#include <northbridge/intel/i945/i945.h>
-#include <pc80/mc146818rtc.h>
static void mainboard_enable(device_t dev)
{
device_t dev0, idedev;
- u8 touchpad;
/* enable Audio */
h8_set_audio_mute(0);
@@ -49,11 +47,6 @@ static void mainboard_enable(device_t dev)
if (dev0 && pci_read_config32(dev0, SKPAD) == 0xcafed00d)
ec_write(0x0c, 0xc7);
- if (get_option(&touchpad, "touchpad") < 0)
- touchpad = 1;
-
- pmh7_touchpad_enable(touchpad);
-
idedev = dev_find_slot(0, PCI_DEVFN(0x1f,1));
if (idedev && idedev->chip_info && h8_ultrabay_device_present()) {
struct southbridge_intel_i82801gx_config *config = idedev->chip_info;