Sync addw2 and gaze15 with oryp6

This commit is contained in:
Jeremy Soller
2020-07-01 12:47:04 -06:00
parent ab8546a7b7
commit 47aed0733e
4 changed files with 46 additions and 21 deletions

View File

@ -2,6 +2,7 @@
#include <board/battery.h> #include <board/battery.h>
#include <board/board.h> #include <board/board.h>
#include <board/dgpu.h> #include <board/dgpu.h>
#include <board/gctrl.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/kbc.h> #include <board/kbc.h>
#include <board/peci.h> #include <board/peci.h>
@ -22,6 +23,9 @@ void board_init(void) {
gpio_set(&SCI_N, true); gpio_set(&SCI_N, true);
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);
// Enable POST codes
SPCTRL1 |= 0xC8;
} }
// Set PL4 using PECI // Set PL4 using PECI
@ -63,6 +67,15 @@ void board_event(void) {
last_power_limit_ac = true; last_power_limit_ac = true;
} }
// Read POST codes
while (P80H81HS & 1) {
uint8_t p80h = P80HD;
uint8_t p81h = P81HD;
P80H81HS |= 1;
DEBUG("POST %02X%02X\n", p81h, p80h);
}
if (main_cycle == 0) { if (main_cycle == 0) {
// Set keyboard LEDs // Set keyboard LEDs
static uint8_t last_kbc_leds = 0; static uint8_t last_kbc_leds = 0;
@ -72,6 +85,5 @@ void board_event(void) {
gpio_set(&LED_CAP_N, (kbc_leds & 4) == 0); gpio_set(&LED_CAP_N, (kbc_leds & 4) == 0);
last_kbc_leds = kbc_leds; last_kbc_leds = kbc_leds;
} }
} }
} }

View File

@ -29,11 +29,11 @@ CFLAGS+=-DPS2_TOUCHPAD=PS2_3
CLFAGS+=-DBOARD_HEATUP=5 CLFAGS+=-DBOARD_HEATUP=5
CFLAGS+=-DBOARD_COOLDOWN=20 CFLAGS+=-DBOARD_COOLDOWN=20
CFLAGS+=-DBOARD_FAN_POINTS="\ CFLAGS+=-DBOARD_FAN_POINTS="\
FAN_POINT(65, 40), \ FAN_POINT(60, 40), \
FAN_POINT(70, 60), \ FAN_POINT(65, 60), \
FAN_POINT(75, 75), \ FAN_POINT(70, 75), \
FAN_POINT(80, 90), \ FAN_POINT(75, 90), \
FAN_POINT(85, 100) \ FAN_POINT(80, 100) \
" "
# Set smart charger parameters # Set smart charger parameters
@ -47,11 +47,11 @@ CFLAGS+=-DHAVE_DGPU=1
CLFAGS+=-DBOARD_DGPU_HEATUP=5 CLFAGS+=-DBOARD_DGPU_HEATUP=5
CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
FAN_POINT(65, 40), \ FAN_POINT(60, 40), \
FAN_POINT(70, 60), \ FAN_POINT(65, 60), \
FAN_POINT(75, 75), \ FAN_POINT(70, 75), \
FAN_POINT(80, 90), \ FAN_POINT(75, 90), \
FAN_POINT(85, 100) \ FAN_POINT(80, 100) \
" "
# Set CPU power limits in watts # Set CPU power limits in watts

View File

@ -2,6 +2,7 @@
#include <board/battery.h> #include <board/battery.h>
#include <board/board.h> #include <board/board.h>
#include <board/dgpu.h> #include <board/dgpu.h>
#include <board/gctrl.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/kbc.h> #include <board/kbc.h>
#include <board/peci.h> #include <board/peci.h>
@ -23,6 +24,9 @@ void board_init(void) {
gpio_set(&SCI_N, true); gpio_set(&SCI_N, true);
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);
// Enable POST codes
SPCTRL1 |= 0xC8;
} }
// Set PL4 using PECI // Set PL4 using PECI
@ -63,4 +67,13 @@ void board_event(void) {
} else { } else {
last_power_limit_ac = true; last_power_limit_ac = true;
} }
// Read POST codes
while (P80H81HS & 1) {
uint8_t p80h = P80HD;
uint8_t p81h = P81HD;
P80H81HS |= 1;
DEBUG("POST %02X%02X\n", p81h, p80h);
}
} }

View File

@ -29,11 +29,11 @@ CFLAGS+=-DPS2_TOUCHPAD=PS2_3
CLFAGS+=-DBOARD_HEATUP=5 CLFAGS+=-DBOARD_HEATUP=5
CFLAGS+=-DBOARD_COOLDOWN=20 CFLAGS+=-DBOARD_COOLDOWN=20
CFLAGS+=-DBOARD_FAN_POINTS="\ CFLAGS+=-DBOARD_FAN_POINTS="\
FAN_POINT(65, 40), \ FAN_POINT(60, 40), \
FAN_POINT(70, 60), \ FAN_POINT(65, 60), \
FAN_POINT(75, 75), \ FAN_POINT(70, 75), \
FAN_POINT(80, 90), \ FAN_POINT(75, 90), \
FAN_POINT(85, 100) \ FAN_POINT(80, 100) \
" "
# Set smart charger parameters # Set smart charger parameters
@ -47,11 +47,11 @@ CFLAGS+=-DHAVE_DGPU=1
CLFAGS+=-DBOARD_DGPU_HEATUP=5 CLFAGS+=-DBOARD_DGPU_HEATUP=5
CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
FAN_POINT(65, 40), \ FAN_POINT(60, 40), \
FAN_POINT(70, 60), \ FAN_POINT(65, 60), \
FAN_POINT(75, 75), \ FAN_POINT(70, 75), \
FAN_POINT(80, 90), \ FAN_POINT(75, 90), \
FAN_POINT(85, 100) \ FAN_POINT(80, 100) \
" "
# Set CPU power limits in watts # Set CPU power limits in watts