aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Schnelle <svens@stackframe.org>2011-04-11 19:43:50 +0000
committerSven Schnelle <svens@stackframe.org>2011-04-11 19:43:50 +0000
commit1fa61ebb3344105ae633ed7eb1be05cc574b666c (patch)
tree488647227ebb4363a9d75ff57161d37e982df38b
parentffcd1439f36ec27388139b9d5a379dd4294417b8 (diff)
downloadcoreboot-1fa61ebb3344105ae633ed7eb1be05cc574b666c.tar.gz
coreboot-1fa61ebb3344105ae633ed7eb1be05cc574b666c.tar.xz
coreboot-1fa61ebb3344105ae633ed7eb1be05cc574b666c.zip
PMH7: Add chip config
Signed-off-by: Sven Schnelle <svens@stackframe.org> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6486 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/ec/lenovo/pmh7/chip.h9
-rw-r--r--src/ec/lenovo/pmh7/pmh7.c12
-rw-r--r--src/ec/lenovo/pmh7/pmh7.h1
-rw-r--r--src/mainboard/lenovo/x60/devicetree.cb1
-rw-r--r--src/mainboard/lenovo/x60/mainboard.c7
5 files changed, 23 insertions, 7 deletions
diff --git a/src/ec/lenovo/pmh7/chip.h b/src/ec/lenovo/pmh7/chip.h
new file mode 100644
index 000000000..e11b77269
--- /dev/null
+++ b/src/ec/lenovo/pmh7/chip.h
@@ -0,0 +1,9 @@
+#ifndef EC_LENOVO_PMH7_CHIP_H
+#define EC_LENOVO_PMH7_CHIP_H
+
+extern struct chip_operations ec_lenovo_pmh7_ops;
+
+struct ec_lenovo_pmh7_config {
+ int backlight_enable:1;
+};
+#endif
diff --git a/src/ec/lenovo/pmh7/pmh7.c b/src/ec/lenovo/pmh7/pmh7.c
index a46e179f8..ba378666a 100644
--- a/src/ec/lenovo/pmh7/pmh7.c
+++ b/src/ec/lenovo/pmh7/pmh7.c
@@ -23,6 +23,15 @@
#include <device/pnp.h>
#include <stdlib.h>
#include "pmh7.h"
+#include "chip.h"
+
+void pmh7_backlight_enable(int onoff)
+{
+ if (onoff)
+ pmh7_register_set_bit(0x50, 5);
+ else
+ pmh7_register_clear_bit(0x50, 5);
+}
void pmh7_register_set_bit(int reg, int bit)
{
@@ -58,6 +67,7 @@ void pmh7_register_write(int reg, int val)
static void enable_dev(device_t dev)
{
+ struct ec_lenovo_pmh7_config *conf = dev->chip_info;
struct resource *resource;
resource = new_resource(dev, EC_LENOVO_PMH7_INDEX);
@@ -66,6 +76,8 @@ static void enable_dev(device_t dev)
resource->size = 16;
resource->align = 5;
resource->gran = 5;
+
+ pmh7_backlight_enable(conf->backlight_enable);
}
struct chip_operations ec_lenovo_pmh7_ops = {
diff --git a/src/ec/lenovo/pmh7/pmh7.h b/src/ec/lenovo/pmh7/pmh7.h
index a4a61cc2a..a85d71068 100644
--- a/src/ec/lenovo/pmh7/pmh7.h
+++ b/src/ec/lenovo/pmh7/pmh7.h
@@ -31,4 +31,5 @@ void pmh7_register_clear_bit(int reg, int bit);
char pmh7_register_read(int reg);
void pmh7_register_write(int reg, int val);
+void pmh7_backlight_enable(int onoff);
#endif
diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb
index f47fdaeab..d5ba7d979 100644
--- a/src/mainboard/lenovo/x60/devicetree.cb
+++ b/src/mainboard/lenovo/x60/devicetree.cb
@@ -85,6 +85,7 @@ chip northbridge/intel/i945
chip ec/lenovo/pmh7
device pnp ff.1 on # dummy
end
+ register "backlight_enable" = "0x01"
end
chip ec/lenovo/h8
device pnp ff.2 on # dummy
diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c
index 15ed80861..b9416b5c2 100644
--- a/src/mainboard/lenovo/x60/mainboard.c
+++ b/src/mainboard/lenovo/x60/mainboard.c
@@ -35,17 +35,10 @@
#include <ec/lenovo/h8/h8.h>
#include <northbridge/intel/i945/i945.h>
-static void backlight_enable(void)
-{
- pmh7_register_set_bit(0x50, 5);
-}
-
static void mainboard_enable(device_t dev)
{
device_t dev0;
- backlight_enable();
-
/* enable Audio */
h8_set_audio_mute(0);