diff options
author | Matt DeVillier <matt.devillier@gmail.com> | 2019-12-19 01:03:05 -0600 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2020-05-11 09:31:35 +0000 |
commit | 75476ec3038497871741519c59ee2bfe3463e14b (patch) | |
tree | 1e911e6d3dd1d85cda009de5250a56540b7ec37c | |
parent | d6b682cf921b79752810b5df059c54659475a17c (diff) | |
download | coreboot-75476ec3038497871741519c59ee2bfe3463e14b.tar.gz coreboot-75476ec3038497871741519c59ee2bfe3463e14b.tar.bz2 coreboot-75476ec3038497871741519c59ee2bfe3463e14b.zip |
mb/google/cyan/*: fixup GPIOs
Commit 73b723d [google/cyan: Switch Touchpad and Touchscreen...]
in additon to changing the touchpad/touchscreen interrupts from
edge to level triggered, also marked them as maskable.
This was partially reverted in a86bbea0 [google/cyan: set
touchscreen GPIO to non_maskable], but did not resolve all of the
issues. Additionally, 73b723d also accidentally changed the pad
interrupt select from L3 to L1 for all touchscreen GPIOs.
Clean up this mess by setting all touchpad/touchscreen GPIOs
back to maskable, and set the pad level to L3 for all touchscreen
GPIOs.
Tested on several cyan variants
Change-Id: I70e8e2d4ff317c3b9b4108ed6c5bc80e9b0bbc75
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41176
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-rw-r--r-- | src/mainboard/google/cyan/variants/banon/gpio.c | 4 | ||||
-rw-r--r-- | src/mainboard/google/cyan/variants/cyan/gpio.c | 2 | ||||
-rw-r--r-- | src/mainboard/google/cyan/variants/edgar/gpio.c | 2 | ||||
-rw-r--r-- | src/mainboard/google/cyan/variants/kefka/gpio.c | 4 | ||||
-rw-r--r-- | src/mainboard/google/cyan/variants/reks/gpio.c | 4 | ||||
-rw-r--r-- | src/mainboard/google/cyan/variants/relm/gpio.c | 4 | ||||
-rw-r--r-- | src/mainboard/google/cyan/variants/setzer/gpio.c | 4 | ||||
-rw-r--r-- | src/mainboard/google/cyan/variants/terra/gpio.c | 2 | ||||
-rw-r--r-- | src/mainboard/google/cyan/variants/ultima/gpio.c | 4 | ||||
-rw-r--r-- | src/mainboard/google/cyan/variants/wizpig/gpio.c | 4 |
10 files changed, 17 insertions, 17 deletions
diff --git a/src/mainboard/google/cyan/variants/banon/gpio.c b/src/mainboard/google/cyan/variants/banon/gpio.c index fa1ef880f0ff..5b4854eb644b 100644 --- a/src/mainboard/google/cyan/variants/banon/gpio.c +++ b/src/mainboard/google/cyan/variants/banon/gpio.c @@ -147,9 +147,9 @@ static const struct soc_gpio_map gpn_gpio_map[] = { GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), /* 17 GPIO_SUS3 */ - GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA), - /* 18 GPIO_SUS7 */ GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA), + /* 18 GPIO_SUS7 */ + GPI(trig_level_low, L3, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA), /* 19 GPIO_SUS1 */ GPIO_NC, /* 20 GPIO_SUS5 */ GPIO_NC, /* 21 SEC_GPIO_SUS11 */ diff --git a/src/mainboard/google/cyan/variants/cyan/gpio.c b/src/mainboard/google/cyan/variants/cyan/gpio.c index c9cd2867192f..9c8a87f5fbc1 100644 --- a/src/mainboard/google/cyan/variants/cyan/gpio.c +++ b/src/mainboard/google/cyan/variants/cyan/gpio.c @@ -150,7 +150,7 @@ static const struct soc_gpio_map gpn_gpio_map[] = { GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), /* 17 GPIO_SUS3 */ - GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA), + GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA), /* 18 GPIO_SUS7 */ GPI(trig_level_low, L3, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA), /* 19 GPIO_SUS1 */ diff --git a/src/mainboard/google/cyan/variants/edgar/gpio.c b/src/mainboard/google/cyan/variants/edgar/gpio.c index f90ca79be245..342199d76977 100644 --- a/src/mainboard/google/cyan/variants/edgar/gpio.c +++ b/src/mainboard/google/cyan/variants/edgar/gpio.c @@ -147,7 +147,7 @@ static const struct soc_gpio_map gpn_gpio_map[] = { GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), /* 17 GPIO_SUS3 */ - GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA), + GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA), /* 18 GPIO_SUS7 */ GPIO_NC, /* 19 GPIO_SUS1 */ GPIO_NC, /* 20 GPIO_SUS5 */ diff --git a/src/mainboard/google/cyan/variants/kefka/gpio.c b/src/mainboard/google/cyan/variants/kefka/gpio.c index ccff0821e6c1..492b2076907b 100644 --- a/src/mainboard/google/cyan/variants/kefka/gpio.c +++ b/src/mainboard/google/cyan/variants/kefka/gpio.c @@ -146,9 +146,9 @@ static const struct soc_gpio_map gpn_gpio_map[] = { GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), /* 17 GPIO_SUS3 */ - GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA), - /* 18 GPIO_SUS7 */ GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA), + /* 18 GPIO_SUS7 */ + GPI(trig_level_low, L3, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA), /* 19 GPIO_SUS1 */ GPIO_NC, /* 20 GPIO_SUS5 */ GPIO_NC, /* 21 SEC_GPIO_SUS11 */ diff --git a/src/mainboard/google/cyan/variants/reks/gpio.c b/src/mainboard/google/cyan/variants/reks/gpio.c index 6d8cb509ac02..d9112d70dc56 100644 --- a/src/mainboard/google/cyan/variants/reks/gpio.c +++ b/src/mainboard/google/cyan/variants/reks/gpio.c @@ -149,9 +149,9 @@ static const struct soc_gpio_map gpn_gpio_map[] = { GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), /* 17 GPIO_SUS3 */ - GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA), - /* 18 GPIO_SUS7 */ GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA), + /* 18 GPIO_SUS7 */ + GPI(trig_level_low, L3, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA), /* 19 GPIO_SUS1 */ GPIO_NC, /* 20 GPIO_SUS5 */ GPIO_NC, /* 21 SEC_GPIO_SUS11 */ diff --git a/src/mainboard/google/cyan/variants/relm/gpio.c b/src/mainboard/google/cyan/variants/relm/gpio.c index 61ede38d8a87..8b788346ad3d 100644 --- a/src/mainboard/google/cyan/variants/relm/gpio.c +++ b/src/mainboard/google/cyan/variants/relm/gpio.c @@ -149,9 +149,9 @@ static const struct soc_gpio_map gpn_gpio_map[] = { GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), /* 17 GPIO_SUS3 */ - GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA), - /* 18 GPIO_SUS7 */ GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA), + /* 18 GPIO_SUS7 */ + GPI(trig_level_low, L3, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA), /* 19 GPIO_SUS1 */ GPIO_NC, /* 20 GPIO_SUS5 */ GPIO_NC, /* 21 SEC_GPIO_SUS11 */ diff --git a/src/mainboard/google/cyan/variants/setzer/gpio.c b/src/mainboard/google/cyan/variants/setzer/gpio.c index c2acb2b3f728..31fb71e32421 100644 --- a/src/mainboard/google/cyan/variants/setzer/gpio.c +++ b/src/mainboard/google/cyan/variants/setzer/gpio.c @@ -147,9 +147,9 @@ static const struct soc_gpio_map gpn_gpio_map[] = { GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), /* 17 GPIO_SUS3 */ - GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA), - /* 18 GPIO_SUS7 */ GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA), + /* 18 GPIO_SUS7 */ + GPI(trig_level_low, L3, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA), /* 19 GPIO_SUS1 */ GPIO_NC, /* 20 GPIO_SUS5 */ GPIO_NC, /* 21 SEC_GPIO_SUS11 */ diff --git a/src/mainboard/google/cyan/variants/terra/gpio.c b/src/mainboard/google/cyan/variants/terra/gpio.c index 2e16bb88c8ce..d39da3376e90 100644 --- a/src/mainboard/google/cyan/variants/terra/gpio.c +++ b/src/mainboard/google/cyan/variants/terra/gpio.c @@ -146,7 +146,7 @@ static const struct soc_gpio_map gpn_gpio_map[] = { GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), /* 17 GPIO_SUS3 */ - GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA), + GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA), /* 18 GPIO_SUS7 */ GPIO_NC, /* 19 GPIO_SUS1 */ GPIO_NC, /* 20 GPIO_SUS5 */ diff --git a/src/mainboard/google/cyan/variants/ultima/gpio.c b/src/mainboard/google/cyan/variants/ultima/gpio.c index fc8776a334be..2f4d5af4a2be 100644 --- a/src/mainboard/google/cyan/variants/ultima/gpio.c +++ b/src/mainboard/google/cyan/variants/ultima/gpio.c @@ -149,9 +149,9 @@ static const struct soc_gpio_map gpn_gpio_map[] = { GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), /* 17 GPIO_SUS3 */ - GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA), - /* 18 GPIO_SUS7 */ GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA), + /* 18 GPIO_SUS7 */ + GPI(trig_level_low, L3, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA), /* 19 GPIO_SUS1 */ GPIO_NC, /* 20 GPIO_SUS5 */ GPIO_NC, /* 21 SEC_GPIO_SUS11 */ diff --git a/src/mainboard/google/cyan/variants/wizpig/gpio.c b/src/mainboard/google/cyan/variants/wizpig/gpio.c index 603e91d965a8..207409999148 100644 --- a/src/mainboard/google/cyan/variants/wizpig/gpio.c +++ b/src/mainboard/google/cyan/variants/wizpig/gpio.c @@ -148,9 +148,9 @@ static const struct soc_gpio_map gpn_gpio_map[] = { GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), /* 17 GPIO_SUS3 */ - GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA), - /* 18 GPIO_SUS7 */ GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA), + /* 18 GPIO_SUS7 */ + GPI(trig_level_low, L3, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA), /* 19 GPIO_SUS1 */ GPIO_NC, /* 20 GPIO_SUS5 */ GPIO_INPUT_NO_PULL, /* 21 SEC_GPIO_SUS11 */ |