sravan/system76-embedded-controller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

galp6: Fix USB power

Browse Source 
The schematics incorrectly show the pin as `USB_PWR_EN#`. There is a
comment on the port side clarifying that it is actually active high.

Signed-off-by: Tim Crawford <tcrawford@system76.com>
This commit is contained in:
Tim Crawford
2022-08-02 09:29:01 -06:00
committed by Tim Crawford
parent 371f6d3047
commit cd86c1e7d7
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/board/system76/galp6/board.c
View File

@ -16,8 +16,6 @@ void board_init(void) {
// Enable wireless // Enable wireless
gpio_set(&WLAN_EN, true); gpio_set(&WLAN_EN, true);
gpio_set(&WLAN_PWR_EN, true); gpio_set(&WLAN_PWR_EN, true);
// Enable USB power
gpio_set(&USB_PWR_EN_N, false);
// Assert SMI# and SWI# // Assert SMI# and SWI#
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);

9
src/board/system76/galp6/gpio.c
View File

@ -34,7 +34,6 @@ struct Gpio __code SMI_N = GPIO(D, 4);
struct Gpio __code SUSB_N_PCH = GPIO(H, 6); struct Gpio __code SUSB_N_PCH = GPIO(H, 6);
struct Gpio __code SUSC_N_PCH = GPIO(H, 1); struct Gpio __code SUSC_N_PCH = GPIO(H, 1);
struct Gpio __code SWI_N = GPIO(B, 5); struct Gpio __code SWI_N = GPIO(B, 5);
struct Gpio __code USB_PWR_EN_N = GPIO(E, 3);
struct Gpio __code VA_EC_EN = GPIO(J, 4); struct Gpio __code VA_EC_EN = GPIO(J, 4);
struct Gpio __code WLAN_EN = GPIO(G, 1); struct Gpio __code WLAN_EN = GPIO(G, 1);
struct Gpio __code WLAN_PWR_EN = GPIO(A, 3); struct Gpio __code WLAN_PWR_EN = GPIO(A, 3);
@ -71,8 +70,8 @@ void gpio_init(void) {
GPDRC = BIT(5); GPDRC = BIT(5);
// PWR_BTN#, SMI# // PWR_BTN#, SMI#
GPDRD = BIT(5) | BIT(4); GPDRD = BIT(5) | BIT(4);
// SMD_BAT, SMC_BAT // USB_PWR_EN
GPDRE = BIT(7) | BIT(0); GPDRE = BIT(3);
// H_PECI // H_PECI
GPDRF = BIT(6); GPDRF = BIT(6);
// H_PROCHOT_EC // H_PROCHOT_EC
@ -154,8 +153,8 @@ void gpio_init(void) {
GPCRE1 = GPIO_OUT; GPCRE1 = GPIO_OUT;
// KB-DET // KB-DET
GPCRE2 = GPIO_IN | GPIO_UP; GPCRE2 = GPIO_IN | GPIO_UP;
// USB_PWR_EN# // USB_PWR_EN# (Actually active high)
GPCRE3 = GPIO_OUT | GPIO_UP; GPCRE3 = GPIO_OUT;
// DD_ON // DD_ON
GPCRE4 = GPIO_OUT; GPCRE4 = GPIO_OUT;
// EC_RSMRST# // EC_RSMRST#

1
src/board/system76/galp6/include/board/gpio.h
View File

@ -42,7 +42,6 @@ extern struct Gpio __code SUSC_N_PCH;
#define HAVE_SUSWARN_N 0 #define HAVE_SUSWARN_N 0
#define HAVE_SUS_PWR_ACK 0 #define HAVE_SUS_PWR_ACK 0
extern struct Gpio __code SWI_N; extern struct Gpio __code SWI_N;
extern struct Gpio __code USB_PWR_EN_N;
extern struct Gpio __code VA_EC_EN; extern struct Gpio __code VA_EC_EN;
extern struct Gpio __code WLAN_EN; extern struct Gpio __code WLAN_EN;
extern struct Gpio __code WLAN_PWR_EN; extern struct Gpio __code WLAN_PWR_EN;