From 22fa2769ad088eecb2171a0119705c963c882f0e Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Thu, 30 Jun 2022 18:21:20 -0600 Subject: [PATCH] gaze17-3050: Update configs - Add to CI - Correct smart charger values - Enable WLAN power - Enable USB power - Disable mute Signed-off-by: Tim Crawford --- .github/workflows/ci.yml | 2 ++ src/board/system76/gaze17-3050/board.mk | 9 ++++++--- src/board/system76/gaze17-3050/gpio.c | 23 ++++++++++------------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc2ee11..6354cf6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,6 +66,8 @@ jobs: board: gaze16-3050 - vendor: system76 board: gaze16-3060 + - vendor: system76 + board: gaze17-3050 - vendor: system76 board: gaze17-3060-b - vendor: system76 diff --git a/src/board/system76/gaze17-3050/board.mk b/src/board/system76/gaze17-3050/board.mk index f168587..d153d37 100644 --- a/src/board/system76/gaze17-3050/board.mk +++ b/src/board/system76/gaze17-3050/board.mk @@ -21,12 +21,15 @@ CFLAGS+=-DI2C_SMBUS=I2C_4 CFLAGS+=-DPS2_TOUCHPAD=PS2_3 # Set smart charger parameters -#TODO: actually bq24800 +# TODO: actually bq24800 +# Adapter input current = 7.5A +# PRS1 = 0.010 ohm. Use exact adapter input current. +# PRS2 = 0.010 ohm. Use desired charge current. CHARGER=bq24780s CFLAGS+=\ - -DCHARGER_CHARGE_CURRENT=1536 \ + -DCHARGER_CHARGE_CURRENT=0xB80 \ -DCHARGER_CHARGE_VOLTAGE=17600 \ - -DCHARGER_INPUT_CURRENT=7500 + -DCHARGER_INPUT_CURRENT=0x1D00 # Set CPU power limits in watts CFLAGS+=\ diff --git a/src/board/system76/gaze17-3050/gpio.c b/src/board/system76/gaze17-3050/gpio.c index 8d8127e..cedd4ee 100644 --- a/src/board/system76/gaze17-3050/gpio.c +++ b/src/board/system76/gaze17-3050/gpio.c @@ -44,25 +44,22 @@ void gpio_init() { GCR20 = 0; // Set GPIO data - GPDRA = 0; + // WLAN_PWR_EN + GPDRA = BIT(3); // XLP_OUT GPDRB = BIT(4); GPDRC = 0; GPDRD = 0; - GPDRE = 0; - GPDRF = 0; - // H_PROCHOT#_EC - GPDRG = BIT(6); + // USB_PWR_EN + GPDRE = BIT(3); + // CC_EN + GPDRF = BIT(7); + // H_PROCHOT#_EC, WLAN_EN + GPDRG = BIT(6) | BIT(1); GPDRH = 0; GPDRI = 0; - GPDRJ = 0; - GPOTA = 0; - GPOTB = 0; - GPOTD = 0; - GPOTE = 0; - GPOTF = 0; - GPOTH = 0; - GPOTJ = 0; + // KBC_MUTE# + GPDRJ = BIT(1); // Set GPIO control // EC_PWM_PIN_24