From dc81c724eca33d03064c7752695621d745ac9f16 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 18 Sep 2020 14:44:33 -0600 Subject: [PATCH] addw1 --- src/board/system76/addw1/board.c | 84 ++++++ src/board/system76/addw1/board.mk | 58 ++++ src/board/system76/addw1/gpio.c | 276 ++++++++++++++++++ src/board/system76/addw1/include/board/gpio.h | 61 ++++ .../system76/addw1/include/board/keymap.h | 53 ++++ src/board/system76/addw1/kbled.c | 36 +++ src/board/system76/addw1/keymap/default.c | 24 ++ src/board/system76/addw1/keymap/jeremy.c | 24 ++ src/board/system76/addw2/gpio.c | 21 +- 9 files changed, 630 insertions(+), 7 deletions(-) create mode 100644 src/board/system76/addw1/board.c create mode 100644 src/board/system76/addw1/board.mk create mode 100644 src/board/system76/addw1/gpio.c create mode 100644 src/board/system76/addw1/include/board/gpio.h create mode 100644 src/board/system76/addw1/include/board/keymap.h create mode 100644 src/board/system76/addw1/kbled.c create mode 100644 src/board/system76/addw1/keymap/default.c create mode 100644 src/board/system76/addw1/keymap/jeremy.c diff --git a/src/board/system76/addw1/board.c b/src/board/system76/addw1/board.c new file mode 100644 index 0000000..d26c734 --- /dev/null +++ b/src/board/system76/addw1/board.c @@ -0,0 +1,84 @@ +// SPDX-License-Identifier: GPL-3.0-only + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +extern uint8_t main_cycle; + +void board_init(void) { + // Allow CPU to boot + gpio_set(&SB_KBCRST_N, true); + // Allow backlight to be turned on + gpio_set(&BKL_EN, true); + // Enable camera + gpio_set(&CCD_EN, true); + // Enable wireless + gpio_set(&BT_EN, true); + gpio_set(&WLAN_EN, true); + gpio_set(&WLAN_PWR_EN, true); + // Enable right USB port + gpio_set(&USB_PWR_EN_N, false); + // Assert SMI#, SCI#, and SWI# + gpio_set(&SCI_N, true); + gpio_set(&SMI_N, true); + gpio_set(&SWI_N, true); +} + +// Set PL4 using PECI +static int set_power_limit(uint8_t watts) { + return peci_wr_pkg_config( + 60, // index + 0, // param + ((uint32_t)watts) * 8 + ); +} + +void board_on_ac(bool ac) { + uint8_t power_limit = ac ? POWER_LIMIT_AC : POWER_LIMIT_DC; + // Retry, timeout errors happen occasionally + for (int i = 0; i < 16; i++) { + int res = set_power_limit(power_limit); + DEBUG("set_power_limit %d = %d\n", power_limit, res); + if (res == 0x40) { + break; + } else if (res < 0) { + ERROR("set_power_limit failed: 0x%02X\n", -res); + } else { + ERROR("set_power_limit unknown response: 0x%02X\n", res); + } + } +} + +void board_event(void) { + bool ac = !gpio_get(&ACIN_N); + + static bool last_power_limit_ac = true; + // We don't use power_state because the latency needs to be low + if (gpio_get(&BUF_PLT_RST_N)) { + if (last_power_limit_ac != ac) { + board_on_ac(ac); + last_power_limit_ac = ac; + } + } else { + last_power_limit_ac = true; + } + + if (main_cycle == 0) { + // Set keyboard LEDs + static uint8_t last_kbc_leds = 0; + if (kbc_leds != last_kbc_leds) { + gpio_set(&LED_SCROLL_N, (kbc_leds & 1) == 0); + gpio_set(&LED_NUM_N, (kbc_leds & 2) == 0); + gpio_set(&LED_CAP_N, (kbc_leds & 4) == 0); + last_kbc_leds = kbc_leds; + } + } +} diff --git a/src/board/system76/addw1/board.mk b/src/board/system76/addw1/board.mk new file mode 100644 index 0000000..2115a0e --- /dev/null +++ b/src/board/system76/addw1/board.mk @@ -0,0 +1,58 @@ +# SPDX-License-Identifier: GPL-3.0-only + +EC=it8587e + +# Add keymap to src +KEYMAP?=default +SRC+=$(BOARD_DIR)/keymap/$(KEYMAP).c + +# Set discrete GPU I2C bus +CFLAGS+=-DI2C_DGPU=I2C_1 + +# Set battery I2C bus +CFLAGS+=-DI2C_SMBUS=I2C_0 + +# Set touchpad PS2 bus +CFLAGS+=-DPS2_TOUCHPAD=PS2_3 + +# Set smart charger parameters +CFLAGS+=\ + -DCHARGER_CHARGE_CURRENT=1536 \ + -DCHARGER_CHARGE_VOLTAGE=12600 \ + -DCHARGER_INPUT_CURRENT=11800 + +# Set battery charging thresholds +CFLAGS+=\ + -DBATTERY_START_THRESHOLD=0 \ + -DBATTERY_END_THRESHOLD=100 + +# Set CPU power limits in watts +CFLAGS+=\ + -DPOWER_LIMIT_AC=180 \ + -DPOWER_LIMIT_DC=28 + +# Custom fan curve +CFLAGS+=-DBOARD_HEATUP=5 +CFLAGS+=-DBOARD_COOLDOWN=20 +CFLAGS+=-DBOARD_FAN_POINTS="\ + FAN_POINT(60, 40), \ + FAN_POINT(65, 60), \ + FAN_POINT(70, 75), \ + FAN_POINT(75, 90), \ + FAN_POINT(80, 100) \ +" + +# Enable DGPU support +CFLAGS+=-DHAVE_DGPU=1 +CFLAGS+=-DBOARD_DGPU_HEATUP=5 +CFLAGS+=-DBOARD_DGPU_COOLDOWN=20 +CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\ + FAN_POINT(60, 40), \ + FAN_POINT(65, 60), \ + FAN_POINT(70, 75), \ + FAN_POINT(75, 90), \ + FAN_POINT(80, 100) \ +" + +# Add system76 common code +include src/board/system76/common/common.mk diff --git a/src/board/system76/addw1/gpio.c b/src/board/system76/addw1/gpio.c new file mode 100644 index 0000000..8597b36 --- /dev/null +++ b/src/board/system76/addw1/gpio.c @@ -0,0 +1,276 @@ +// SPDX-License-Identifier: GPL-3.0-only + +#include +#include + +struct Gpio __code ACIN_N = GPIO(B, 6); +struct Gpio __code AC_PRESENT = GPIO(E, 7); +struct Gpio __code ALL_SYS_PWRGD = GPIO(C, 0); +struct Gpio __code BKL_EN = GPIO(H, 2); +struct Gpio __code BT_EN = GPIO(F, 3); +struct Gpio __code BUF_PLT_RST_N = GPIO(D, 2); +struct Gpio __code CCD_EN = GPIO(G, 0); +struct Gpio __code DD_ON = GPIO(E, 4); +struct Gpio __code DGPU_PWR_EN = GPIO(E, 3); +struct Gpio __code EC_EN = GPIO(B, 5); // renamed to SUSBC_EN +struct Gpio __code EC_RSMRST_N = GPIO(E, 5); +struct Gpio __code GC6_FB_EN = GPIO(G, 1); +struct Gpio __code LAN_WAKEUP_N = GPIO(B, 2); +struct Gpio __code LED_ACIN = GPIO(C, 7); +struct Gpio __code LED_AIRPLANE_N = GPIO(G, 6); +struct Gpio __code LED_CAP_N = GPIO(J, 5); +struct Gpio __code LED_BAT_CHG = GPIO(H, 3); +struct Gpio __code LED_BAT_FULL = GPIO(H, 4); +struct Gpio __code LED_NUM_N = GPIO(J, 4); +struct Gpio __code LED_PWR = GPIO(H, 5); +struct Gpio __code LED_SCROLL_N = GPIO(J, 3); +struct Gpio __code LID_SW_N = GPIO(D, 1); +struct Gpio __code PM_CLKRUN_N = GPIO(H, 0); // renamed to ECCLKRUN# +struct Gpio __code PM_PWROK = GPIO(C, 6); +struct Gpio __code PWR_BTN_N = GPIO(D, 5); +struct Gpio __code PWR_SW_N = GPIO(D, 0); +struct Gpio __code SB_KBCRST_N = GPIO(E, 6); +struct Gpio __code SCI_N = GPIO(D, 4); +struct Gpio __code SMI_N = GPIO(D, 3); +struct Gpio __code SUSB_N_PCH = GPIO(H, 6); +struct Gpio __code SUSC_N_PCH = GPIO(H, 1); +struct Gpio __code SWI_N = GPIO(E, 0); +struct Gpio __code USB_PWR_EN_N = GPIO(F, 7); +struct Gpio __code VA_EC_EN = GPIO(J, 0); // renamed to SLP_SUS_EC# +struct Gpio __code WLAN_EN = GPIO(J, 2); +struct Gpio __code WLAN_PWR_EN = GPIO(B, 0); + +void gpio_init() { + // Enable LPC reset on GPD2 + GCR = 0x04; + + // Set GPIO data + // SYS_FAN + GPDRA = (1 << 3); + GPDRB = 0x00; + GPDRC = 0x00; + // PWR_BTN#, SCI#, SMI# + GPDRD = (1 << 5) | (1 << 4) | (1 << 3); + GPDRE = 0x00; + // H_PECI + GPDRF = (1 << 6); + // AIRPLAN_LED# + GPDRG = (1 << 6); + GPDRH = 0x00; + GPDRI = 0x00; + // LED_CAP#, LED_NUM#, LED_SCROLL# + GPDRJ = (1 << 5) | (1 << 4) | (1 << 3); + + // Set GPIO control + // EC_PWM_LEDKB_P + GPCRA0 = GPIO_ALT; + // KBC_BEEP + GPCRA1 = GPIO_ALT; + // CPU_FAN + GPCRA2 = GPIO_ALT; + // SYS_FAN TODO + GPCRA3 = GPIO_OUT | GPIO_UP; + // VGA_FAN + GPCRA4 = GPIO_ALT; + // EC_PWM_LEDKB_R + GPCRA5 = GPIO_ALT; + // EC_PWM_LEDKB_G + GPCRA6 = GPIO_ALT; + // EC_PWM_LEDKB_B + GPCRA7 = GPIO_ALT; + // WLAN_PWR_EN + GPCRB0 = GPIO_OUT | GPIO_UP; + // H_PROCHOT_EC + GPCRB1 = GPIO_OUT | GPIO_UP; + // LAN_WAKEUP# + GPCRB2 = GPIO_IN | GPIO_UP; + // SMC_BAT + GPCRB3 = GPIO_ALT; + // SMD_BAT + GPCRB4 = GPIO_ALT; + // SUSBC_EN# + GPCRB5 = GPIO_OUT | GPIO_UP; + // AC_IN# + GPCRB6 = GPIO_IN | GPIO_UP; + // PERKB-DET# + GPCRB7 = GPIO_IN | GPIO_UP; + // ALL_SYS_PWRGD + GPCRC0 = GPIO_IN; + // SMC_VGA_THERM + GPCRC1 = GPIO_OUT; + // SMD_VGA_THERM + GPCRC2 = GPIO_OUT; + // KB-SO16 + GPCRC3 = GPIO_IN | GPIO_UP; + // CNVI_DET#_EC + GPCRC4 = GPIO_IN | GPIO_UP; + // KB-SO17 + GPCRC5 = GPIO_IN | GPIO_UP; + // PM_PWROK + GPCRC6 = GPIO_OUT; + // LED_ACIN + GPCRC7 = GPIO_OUT | GPIO_UP; + // PWR_SW# + GPCRD0 = GPIO_IN | GPIO_UP; + // LID_SW# + GPCRD1 = GPIO_IN | GPIO_UP; + // BUF_PLT_RST# + GPCRD2 = GPIO_ALT; + // SMI# + GPCRD3 = GPIO_IN; + // SCI# + GPCRD4 = GPIO_IN; + // PWR_BTN# + GPCRD5 = GPIO_OUT | GPIO_UP; + // CPU_FANSEN + GPCRD6 = GPIO_ALT; + // ALL_FANSEN + GPCRD7 = GPIO_ALT; + // SWI# + GPCRE0 = GPIO_OUT | GPIO_UP; + // OVERT# + GPCRE1 = GPIO_IN; + // RGBKB-DET# + GPCRE2 = GPIO_IN | GPIO_UP; + // DGPU_PWR_EN + GPCRE3 = GPIO_IN; + // DD_ON + GPCRE4 = GPIO_OUT | GPIO_DOWN; + // EC_RSMRST# + GPCRE5 = GPIO_OUT; + // SB_KBCRST# + GPCRE6 = GPIO_OUT | GPIO_UP; + // AC_PRESENT + GPCRE7 = GPIO_OUT | GPIO_UP; + // 80CLK + GPCRF0 = GPIO_IN; + // USB_CHARGE_EN + GPCRF1 = GPIO_OUT | GPIO_UP; + // 3IN1 + GPCRF2 = GPIO_IN | GPIO_UP; + // BT_EN + GPCRF3 = GPIO_OUT | GPIO_UP; + // TP_CLK + GPCRF4 = GPIO_ALT; + // TP_DATA + GPCRF5 = GPIO_ALT; + // H_PECI + GPCRF6 = GPIO_ALT; + // USB_PWR_EN# + GPCRF7 = GPIO_OUT | GPIO_UP; + // CCD_EN + GPCRG0 = GPIO_OUT | GPIO_UP; + // GC6_FB_EN_PCH + GPCRG1 = GPIO_IN; + // AUTO_LOAD + GPCRG2 = GPIO_OUT; + // ALSPI_CE# + GPCRG3 = GPIO_ALT; + // ALSPI_MSI + GPCRG4 = GPIO_ALT; + // ALSPI_MSO + GPCRG5 = GPIO_ALT; + // AIRPLAN_LED# + GPCRG6 = GPIO_OUT | GPIO_UP; + // ALSPI_SCLK + GPCRG7 = GPIO_ALT; + // ECCLKRUN# + GPCRH0 = GPIO_IN; + // SUSC#_PCH + GPCRH1 = GPIO_IN; + // BKL_EN + GPCRH2 = GPIO_OUT | GPIO_UP; + // LED_BAT_CHG + GPCRH3 = GPIO_OUT | GPIO_UP; + // LED_BAT_FULL + GPCRH4 = GPIO_OUT | GPIO_UP; + // LED_PWR + GPCRH5 = GPIO_OUT | GPIO_UP; + // SUSB#_PCH + GPCRH6 = GPIO_IN; + // TODO + GPCRH7 = GPIO_IN; + // BAT_DET + GPCRI0 = GPIO_ALT; + // BAT_VOLT + GPCRI1 = GPIO_ALT; + // ME_WE + GPCRI2 = GPIO_OUT; + // THERM_VOLT + GPCRI3 = GPIO_ALT; + // TOTAL_CUR + GPCRI4 = GPIO_ALT; + // MPS_ID + GPCRI5 = GPIO_IN; + // FANSEN_SEL (L:VGA H:SYS) + GPCRI6 = GPIO_OUT; + // MODEL_ID + GPCRI7 = GPIO_IN; + // SLP_SUS_EC# + GPCRJ0 = GPIO_OUT; + // KBC_MUTE# + GPCRJ1 = GPIO_IN; + // WLAN_EN + GPCRJ2 = GPIO_OUT | GPIO_UP; + // LED_SCROLL# + GPCRJ3 = GPIO_OUT | GPIO_UP; + // LED_NUM# + GPCRJ4 = GPIO_OUT | GPIO_UP; + // LED_CAP# + GPCRJ5 = GPIO_OUT | GPIO_UP; + // POWER_IC_EN + GPCRJ6 = GPIO_OUT | GPIO_UP; + // VBATT_BOOST# + GPCRJ7 = GPIO_OUT; + // LPC_AD0 + GPCRM0 = GPIO_ALT; + // LPC_AD1 + GPCRM1 = GPIO_ALT; + // LPC_AD2 + GPCRM2 = GPIO_ALT; + // LPC_AD3 + GPCRM3 = GPIO_ALT; + // PCLK_KBC + GPCRM4 = GPIO_ALT; + // LPC_FRAME# + GPCRM5 = GPIO_ALT; + // SERIRQ + GPCRM6 = GPIO_ALT; +} + +#if GPIO_DEBUG +void gpio_debug_bank( + char * bank, + uint8_t data, + uint8_t mirror, + uint8_t pot, + volatile uint8_t * control +) { + for(char i = 0; i < 8; i++) { + DEBUG( + "%s%d:\n\tdata %d\n\tmirror %d\n\tpot %d\n\tcontrol %02X\n", + bank, + i, + (data >> i) & 1, + (mirror >> i) & 1, + (pot >> i) & 1, + *(control + i) + ); + } +} + +void gpio_debug(void) { + #define bank(BANK) gpio_debug_bank(#BANK, GPDR ## BANK, GPDMR ## BANK, GPOT ## BANK, &GPCR ## BANK ## 0) + bank(A); + bank(B); + bank(C); + bank(D); + bank(E); + bank(F); + bank(G); + bank(H); + bank(I); + bank(J); + #undef bank +} +#endif diff --git a/src/board/system76/addw1/include/board/gpio.h b/src/board/system76/addw1/include/board/gpio.h new file mode 100644 index 0000000..209c60c --- /dev/null +++ b/src/board/system76/addw1/include/board/gpio.h @@ -0,0 +1,61 @@ +// SPDX-License-Identifier: GPL-3.0-only + +#ifndef _BOARD_GPIO_H +#define _BOARD_GPIO_H + +#include + +#define GPIO_ALT 0x00 +#define GPIO_IN 0x80 +#define GPIO_OUT 0x40 +#define GPIO_UP 0x04 +#define GPIO_DOWN 0x02 + +void gpio_init(void); +void gpio_debug(void); + +extern struct Gpio __code ACIN_N; +extern struct Gpio __code AC_PRESENT; +extern struct Gpio __code ALL_SYS_PWRGD; +extern struct Gpio __code BKL_EN; +extern struct Gpio __code BT_EN; +extern struct Gpio __code BUF_PLT_RST_N; +extern struct Gpio __code CCD_EN; +extern struct Gpio __code DD_ON; +extern struct Gpio __code DGPU_PWR_EN; +extern struct Gpio __code EC_EN; +extern struct Gpio __code EC_RSMRST_N; +extern struct Gpio __code GC6_FB_EN; +extern struct Gpio __code LAN_WAKEUP_N; +extern struct Gpio __code LED_ACIN; +extern struct Gpio __code LED_AIRPLANE_N; +extern struct Gpio __code LED_CAP_N; +extern struct Gpio __code LED_BAT_CHG; +extern struct Gpio __code LED_BAT_FULL; +extern struct Gpio __code LED_NUM_N; +extern struct Gpio __code LED_PWR; +extern struct Gpio __code LED_SCROLL_N; +extern struct Gpio __code LID_SW_N; +#define HAVE_PCH_DPWROK_EC 0 +#define HAVE_PCH_PWROK_EC 0 +extern struct Gpio __code PM_CLKRUN_N; +extern struct Gpio __code PM_PWROK; +extern struct Gpio __code PWR_BTN_N; +extern struct Gpio __code PWR_SW_N; +extern struct Gpio __code SB_KBCRST_N; +extern struct Gpio __code SCI_N; +#define HAVE_SLP_SUS_N 0 +extern struct Gpio __code SMI_N; +extern struct Gpio __code SUSB_N_PCH; +extern struct Gpio __code SUSC_N_PCH; +#define HAVE_SUSWARN_N 0 +#define HAVE_SUS_PWR_ACK 0 +extern struct Gpio __code SWI_N; +extern struct Gpio __code USB_PWR_EN_N; +extern struct Gpio __code VA_EC_EN; +#define HAVE_VR_ON 0 +extern struct Gpio __code WLAN_EN; +extern struct Gpio __code WLAN_PWR_EN; +#define HAVE_XLP_OUT 0 + +#endif // _BOARD_GPIO_H diff --git a/src/board/system76/addw1/include/board/keymap.h b/src/board/system76/addw1/include/board/keymap.h new file mode 100644 index 0000000..412144d --- /dev/null +++ b/src/board/system76/addw1/include/board/keymap.h @@ -0,0 +1,53 @@ +// SPDX-License-Identifier: GPL-3.0-only + +#ifndef _BOARD_KEYMAP_H +#define _BOARD_KEYMAP_H + +// Keymap layers (normal, Fn) +#define KM_LAY 2 +// Keymap output pins +#define KM_OUT 18 +// Keymap input pins +#define KM_IN 8 + +// common/keymap.h requires KM_LAY, KM_OUT, and KM_IN definitions +#include + +// Conversion of physical layout to keyboard matrix +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \ + K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G, \ + K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C \ +) { \ + { ___, ___, ___, ___, ___, ___, K50, K57 }, \ + { ___, ___, ___, ___, ___, ___, K53, K55 }, \ + { ___, ___, ___, ___, ___, ___, K40, K4B }, \ + { K52, ___, ___, ___, ___, ___, ___, K54 }, \ + { K41, K1H, ___, K2F, K4E, ___, ___, ___ }, \ + { K0I, K22, ___, ___, K1E, K3D, K3F, K30 }, \ + { K0J, K1B, K23, K39, ___, ___, K47, ___ }, \ + { K38, K26, K1A, K24, ___, K3A, K20, K00 }, \ + { K5B, K37, K2C, K19, K25, K07, K18, K01 }, \ + { K5C, K34, K36, K02, ___, K4G, K3B, K45 }, \ + { K1F, K48, ___, K2B, K32, K08, K06, K12 }, \ + { K1G, K49, K17, K33, ___, ___, K11, K2A }, \ + { K2D, ___, K31, K4A, ___, K03, K28, K16 }, \ + { ___, K44, K0D, K09, K46, K29, K15, K05 }, \ + { K21, K0A, K2E, K04, K3E, K0E, K0F, K14 }, \ + { K56, K42, K3C, K2H, K27, K2G, K13, K1D }, \ + { K0H, K0G, K43, K4C, K59, K10, K0B, K0C }, \ + { K35, K1C, K4F, K51, K4D, K58, K5A, ___ } \ +} + +// Position of physical Esc key in the matrix +#define MATRIX_ESC_INPUT 7 +#define MATRIX_ESC_OUTPUT 7 + +// Position of physical Fn key in the matrix +#define MATRIX_FN_INPUT 3 +#define MATRIX_FN_OUTPUT 17 + +#endif // _BOARD_KEYMAP_H diff --git a/src/board/system76/addw1/kbled.c b/src/board/system76/addw1/kbled.c new file mode 100644 index 0000000..0f262e4 --- /dev/null +++ b/src/board/system76/addw1/kbled.c @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-3.0-only + +#include +#include + +void kbled_init(void) { + //TODO: enable PWMs + kbled_reset(); +} + +void kbled_reset(void) { + // Set brightness and color + kbled_set_color(0xFFFFFF); + kbled_set(0x00); +} + +uint8_t kbled_get(void) { + // Get PWM for power + return DCR0; +} + +void kbled_set(uint8_t level) { + // Set PWM for power + DCR0 = level; +} + +void kbled_set_color(uint32_t color) { + // Set PWM for blue component + DCR7 = (uint8_t)(color); + + // Set PWM for green component + DCR6 = (uint8_t)(color >> 8); + + // Set PWM for red component + DCR5 = (uint8_t)(color >> 16); +} diff --git a/src/board/system76/addw1/keymap/default.c b/src/board/system76/addw1/keymap/default.c new file mode 100644 index 0000000..a8b9fa8 --- /dev/null +++ b/src/board/system76/addw1/keymap/default.c @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-3.0-only + +// Default layout + +#include + +uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { +LAYOUT( + K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, + K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_NUM_SLASH, K_NUM_ASTERISK, K_NUM_MINUS, + K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_NUM_PLUS, + K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, + K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, + K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_APP, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD +), +LAYOUT( + K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_F4, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, + K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_KBD_COLOR, K_KBD_TOGGLE, K_KBD_DOWN, + K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_KBD_UP, + K_CAPS, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, + K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, + K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, K_RIGHT_ALT, K_APP, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD +) +}; diff --git a/src/board/system76/addw1/keymap/jeremy.c b/src/board/system76/addw1/keymap/jeremy.c new file mode 100644 index 0000000..257fe36 --- /dev/null +++ b/src/board/system76/addw1/keymap/jeremy.c @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-3.0-only + +// Default layout + +#include + +uint16_t __code KEYMAP[KM_LAY][KM_OUT][KM_IN] = { +LAYOUT( + K_ESC, K_F1, K_F2, K_F3, K_F4, K_F5, K_F6, K_F7, K_F8, K_F9, K_F10, K_F11, K_F12, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, + K_TICK, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_BKSP, K_NUM_LOCK, K_NUM_SLASH, K_NUM_ASTERISK, K_NUM_MINUS, + K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_NUM_PLUS, + KT_FN, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, + K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, + K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_SPACE, KT_FN, K_RIGHT_ALT, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD +), +LAYOUT( + K_ESC, K_TOUCHPAD, K_DISPLAY_TOGGLE, K_MUTE, K_F4, K_VOLUME_DOWN, K_VOLUME_UP, K_DISPLAY_MODE, K_BRIGHTNESS_DOWN, K_BRIGHTNESS_UP, K_CAMERA_TOGGLE, K_AIRPLANE_MODE, K_SUSPEND, K_PRINT_SCREEN, K_INSERT, K_DEL, K_HOME, K_END, K_PGUP, K_PGDN, + K_PLAY_PAUSE, K_FAN_TOGGLE, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9, K_0, K_MINUS, K_EQUALS, K_DEL, K_NUM_LOCK, K_KBD_COLOR, K_KBD_TOGGLE, K_KBD_DOWN, + K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_PGUP, K_HOME, K_PGDN, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_NUM_7, K_NUM_8, K_NUM_9, K_KBD_UP, + KT_FN, K_A, K_S, K_D, K_F, K_G, K_LEFT, K_DOWN, K_UP, K_RIGHT, K_BKSP, K_DEL, K_ENTER, K_NUM_4, K_NUM_5, K_NUM_6, + K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_END, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_NUM_1, K_NUM_2, K_NUM_3, K_NUM_ENTER, + K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_ESC, KT_FN, K_RIGHT_ALT, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT, K_NUM_0, K_NUM_PERIOD +) +}; diff --git a/src/board/system76/addw2/gpio.c b/src/board/system76/addw2/gpio.c index 17320eb..2a913c6 100644 --- a/src/board/system76/addw2/gpio.c +++ b/src/board/system76/addw2/gpio.c @@ -48,15 +48,22 @@ void gpio_init() { // Set GPIO data GPDRA = 0x00; - GPDRB = 0x18; + // XLP_OUT, PWR_SW# + GPDRB = (1 << 4) | (1 << 3); GPDRC = 0x00; - GPDRD = 0x38; - GPDRE = 0x40; - GPDRF = 0x40; - GPDRG = 0x41; - GPDRH = 0x80; + // PWR_BTN#, SCI#, SMI# + GPDRD = (1 << 5) | (1 << 4) | (1 << 3); + // PLVDD_RST_EC + GPDRE = (1 << 6); + // EC_PECI + GPDRF = (1 << 6); + // H_PROCHOT#_EC, LED_NUM# + GPDRG = (1 << 6) | (1 << 0); + // AIRPLAN_LED# + GPDRH = 0x80; // (1 << 7) GPDRI = 0x00; - GPDRJ = 0x0C; + // LED_SCROLL#, LED_CAP# + GPDRJ = (1 << 3) | (1 << 2); // Set GPIO control // EC_PWM_LEDKB_P