Signed-off-by: Sven Schnelle svens@stackframe.org --- src/ec/lenovo/pmh7/chip.h | 9 +++++++++ src/ec/lenovo/pmh7/pmh7.c | 12 ++++++++++++ src/ec/lenovo/pmh7/pmh7.h | 1 + src/mainboard/lenovo/x60/devicetree.cb | 1 + src/mainboard/lenovo/x60/mainboard.c | 7 ------- 5 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 src/ec/lenovo/pmh7/chip.h
diff --git a/src/ec/lenovo/pmh7/chip.h b/src/ec/lenovo/pmh7/chip.h new file mode 100644 index 0000000..e11b772 --- /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 a46e179..ba37866 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 a4a61cc..a85d710 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 f47fdae..d5ba7d9 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 15ed808..b9416b5 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);