From b3b2a312b76f248fd4da668f67d0d60e5cf7eb35 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Wed, 2 Jun 2021 21:02:45 -0600 Subject: [PATCH] Define GPCRn values in EC header --- src/board/system76/addw1/include/board/gpio.h | 6 ------ src/board/system76/addw2/include/board/gpio.h | 6 ------ src/board/system76/bonw14/include/board/gpio.h | 6 ------ src/board/system76/darp5/include/board/gpio.h | 6 ------ src/board/system76/darp7/include/board/gpio.h | 6 ------ src/board/system76/galp3-c/include/board/gpio.h | 6 ------ src/board/system76/galp5/include/board/gpio.h | 6 ------ src/board/system76/gaze15/include/board/gpio.h | 6 ------ src/board/system76/lemp10/include/board/gpio.h | 6 ------ src/board/system76/lemp9/include/board/gpio.h | 6 ------ src/board/system76/oryp5/include/board/gpio.h | 6 ------ src/board/system76/oryp6/include/board/gpio.h | 6 ------ src/board/system76/oryp7/include/board/gpio.h | 6 ------ src/ec/it5570e/include/ec/gpio.h | 6 ++++++ src/ec/it8587e/include/ec/gpio.h | 6 ++++++ 15 files changed, 12 insertions(+), 78 deletions(-) diff --git a/src/board/system76/addw1/include/board/gpio.h b/src/board/system76/addw1/include/board/gpio.h index 209c60c..ea0af63 100644 --- a/src/board/system76/addw1/include/board/gpio.h +++ b/src/board/system76/addw1/include/board/gpio.h @@ -5,12 +5,6 @@ #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); diff --git a/src/board/system76/addw2/include/board/gpio.h b/src/board/system76/addw2/include/board/gpio.h index 4aae0b4..b877d13 100644 --- a/src/board/system76/addw2/include/board/gpio.h +++ b/src/board/system76/addw2/include/board/gpio.h @@ -5,12 +5,6 @@ #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); diff --git a/src/board/system76/bonw14/include/board/gpio.h b/src/board/system76/bonw14/include/board/gpio.h index 1f43e73..46312e9 100644 --- a/src/board/system76/bonw14/include/board/gpio.h +++ b/src/board/system76/bonw14/include/board/gpio.h @@ -5,12 +5,6 @@ #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); diff --git a/src/board/system76/darp5/include/board/gpio.h b/src/board/system76/darp5/include/board/gpio.h index 1d42285..41d8507 100644 --- a/src/board/system76/darp5/include/board/gpio.h +++ b/src/board/system76/darp5/include/board/gpio.h @@ -5,12 +5,6 @@ #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); diff --git a/src/board/system76/darp7/include/board/gpio.h b/src/board/system76/darp7/include/board/gpio.h index d25dfa5..02230b3 100644 --- a/src/board/system76/darp7/include/board/gpio.h +++ b/src/board/system76/darp7/include/board/gpio.h @@ -5,12 +5,6 @@ #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); diff --git a/src/board/system76/galp3-c/include/board/gpio.h b/src/board/system76/galp3-c/include/board/gpio.h index 1d42285..41d8507 100644 --- a/src/board/system76/galp3-c/include/board/gpio.h +++ b/src/board/system76/galp3-c/include/board/gpio.h @@ -5,12 +5,6 @@ #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); diff --git a/src/board/system76/galp5/include/board/gpio.h b/src/board/system76/galp5/include/board/gpio.h index 0a8d0c2..454e2f6 100644 --- a/src/board/system76/galp5/include/board/gpio.h +++ b/src/board/system76/galp5/include/board/gpio.h @@ -5,12 +5,6 @@ #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); diff --git a/src/board/system76/gaze15/include/board/gpio.h b/src/board/system76/gaze15/include/board/gpio.h index 980aee6..02589c2 100644 --- a/src/board/system76/gaze15/include/board/gpio.h +++ b/src/board/system76/gaze15/include/board/gpio.h @@ -5,12 +5,6 @@ #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); diff --git a/src/board/system76/lemp10/include/board/gpio.h b/src/board/system76/lemp10/include/board/gpio.h index d165e6c..f7b36fa 100644 --- a/src/board/system76/lemp10/include/board/gpio.h +++ b/src/board/system76/lemp10/include/board/gpio.h @@ -5,12 +5,6 @@ #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); diff --git a/src/board/system76/lemp9/include/board/gpio.h b/src/board/system76/lemp9/include/board/gpio.h index fbc923e..9367b06 100644 --- a/src/board/system76/lemp9/include/board/gpio.h +++ b/src/board/system76/lemp9/include/board/gpio.h @@ -5,12 +5,6 @@ #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); diff --git a/src/board/system76/oryp5/include/board/gpio.h b/src/board/system76/oryp5/include/board/gpio.h index 66d5a1a..b1e9a0f 100644 --- a/src/board/system76/oryp5/include/board/gpio.h +++ b/src/board/system76/oryp5/include/board/gpio.h @@ -5,12 +5,6 @@ #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); diff --git a/src/board/system76/oryp6/include/board/gpio.h b/src/board/system76/oryp6/include/board/gpio.h index a4249e6..b9a13ff 100644 --- a/src/board/system76/oryp6/include/board/gpio.h +++ b/src/board/system76/oryp6/include/board/gpio.h @@ -5,12 +5,6 @@ #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); diff --git a/src/board/system76/oryp7/include/board/gpio.h b/src/board/system76/oryp7/include/board/gpio.h index e8cd7f8..0b01627 100644 --- a/src/board/system76/oryp7/include/board/gpio.h +++ b/src/board/system76/oryp7/include/board/gpio.h @@ -5,12 +5,6 @@ #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); diff --git a/src/ec/it5570e/include/ec/gpio.h b/src/ec/it5570e/include/ec/gpio.h index a362cb2..6fbb9af 100644 --- a/src/ec/it5570e/include/ec/gpio.h +++ b/src/ec/it5570e/include/ec/gpio.h @@ -8,6 +8,12 @@ #include #include +#define GPIO_ALT (0b00U << 6) +#define GPIO_IN (0b10U << 6) +#define GPIO_OUT (0b01U << 6) +#define GPIO_UP BIT(2) +#define GPIO_DOWN BIT(1) + struct Gpio { volatile uint8_t __xdata * data; volatile uint8_t __xdata * mirror; diff --git a/src/ec/it8587e/include/ec/gpio.h b/src/ec/it8587e/include/ec/gpio.h index 5f4b6e7..b0eee8e 100644 --- a/src/ec/it8587e/include/ec/gpio.h +++ b/src/ec/it8587e/include/ec/gpio.h @@ -8,6 +8,12 @@ #include #include +#define GPIO_ALT (0b00U << 6) +#define GPIO_IN (0b10U << 6) +#define GPIO_OUT (0b01U << 6) +#define GPIO_UP BIT(2) +#define GPIO_DOWN BIT(1) + struct Gpio { volatile uint8_t __xdata * data; volatile uint8_t __xdata * mirror;