diff options
| author | Victor Liu <victorliu@google.com> | 2022-11-18 00:27:45 +0000 |
|---|---|---|
| committer | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-11-28 17:44:28 +0000 |
| commit | 45390e817f1bb673bf993522be9d49ca892a15cf (patch) | |
| tree | 82a3961ec7093b09a5dd63d8bed6669b62a7a988 | |
| parent | dc4cc2d95005ffde0de389e76890f1c8c66788a8 (diff) | |
| download | uwb-45390e817f1bb673bf993522be9d49ca892a15cf.tar.gz | |
Revert "Modify dw3000 driver to insulate UWB from Aoc"android-t-qpr2-beta-2_r0.4
Revert submission 2311369-b/240205717
Reason for revert: b/259450077 - This change is causing CCC not to work but the change should be unrelated. The thought is that this change is changing timing and the qorvo hal isn't handling this correctly. Plan is to back out this change until we root cause the issue.
Reverted Changes:
I723e8af9a:Modify dw3000 driver to insulate UWB from Aoc
I10ed786d3:Change device tree for P22 to insulate UWB from Ao...
Signed-off-by: Victor Liu <victorliu@google.com>
Change-Id: I210845387316f1c3053bbc7a0703daee30cd9022
| -rw-r--r-- | kernel/drivers/net/ieee802154/dw3000_core.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/kernel/drivers/net/ieee802154/dw3000_core.c b/kernel/drivers/net/ieee802154/dw3000_core.c index 932f0db..9f96363 100644 --- a/kernel/drivers/net/ieee802154/dw3000_core.c +++ b/kernel/drivers/net/ieee802154/dw3000_core.c @@ -1867,7 +1867,6 @@ static int dw3000_power_supply(struct dw3000 *dw, int onoff) static int dw3000_reset_assert(struct dw3000 *dw, bool reset) { int rc; - int value; if (!gpio_is_valid(dw->reset_gpio)) { dev_err(dw->dev, "invalid reset gpio\n"); @@ -1883,22 +1882,10 @@ static int dw3000_reset_assert(struct dw3000 *dw, bool reset) } else { /* Release RESET GPIO. * Reset should be open drain, or switched to input whenever not driven - * low. It should not be driven high during chip cold boot process. */ + * low. It should not be driven high. */ rc = gpio_direction_input(dw->reset_gpio); - if (rc) { - dev_err(dw->dev, "Could not set reset gpio as input\n"); - return rc; - } - /* check if dw3000 finishes cold boot */ - value = gpio_get_value(dw->reset_gpio); - if (!value) { - return -EPROBE_DEFER; - } - - /* set pin to output and drive high */ - rc = gpio_direction_output(dw->reset_gpio, 1); if (rc) - dev_err(dw->dev, "Could not set reset gpio as output\n"); + dev_err(dw->dev, "Could not set reset gpio as input\n"); } return rc; } |