diff options
| author | CrossR <r.cross@lancaster.ac.uk> | 2020-08-29 22:54:43 +0100 |
|---|---|---|
| committer | CrossR <r.cross@lancaster.ac.uk> | 2020-08-29 22:54:43 +0100 |
| commit | 6be07b5b243d62fd6c531c4c8d6e81e61147eac6 (patch) | |
| tree | eeb2c72432cd1071893e154a39ae8136be215d80 /app/boards/arm/nrfmicro/pinmux.c | |
| parent | 7abcae6949834a4dd9d4fdb41ebc68acb36d3db7 (diff) | |
| parent | 86c3dac153b9f748ce3e4863c620e5a9c08c67be (diff) | |
Merge branch 'main' into CrossR/Sofle
Diffstat (limited to 'app/boards/arm/nrfmicro/pinmux.c')
| -rw-r--r-- | app/boards/arm/nrfmicro/pinmux.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/boards/arm/nrfmicro/pinmux.c b/app/boards/arm/nrfmicro/pinmux.c index c02ca92..3792b59 100644 --- a/app/boards/arm/nrfmicro/pinmux.c +++ b/app/boards/arm/nrfmicro/pinmux.c @@ -23,10 +23,14 @@ static int pinmux_nrfmicro_init(struct device *port) gpio_pin_configure(p1, 9, GPIO_OUTPUT); gpio_pin_set(p1, 9, 0); - // enable charger (nRFMicro 1.3 only) +#if CONFIG_BOARD_NRFMICRO_CHARGER gpio_pin_configure(p0, 5, GPIO_OUTPUT); gpio_pin_set(p0, 5, 0); #else + gpio_pin_configure(p0, 5, GPIO_INPUT); +#endif + +#else // enable EXT_VCC (use 0 for nRFMicro 1.3, use 1 for nRFMicro 1.1) gpio_pin_configure(p1, 9, GPIO_OUTPUT); gpio_pin_set(p1, 9, 1); |