diff options
| author | Tom Rini <trini@konsulko.com> | 2024-03-30 14:07:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-03-30 14:07:37 -0400 |
| commit | 425dc46a2c8ebe6d1a5a7d2d7ac5506aa7783409 (patch) | |
| tree | 9afc8cefa3f28efdaecfcc4cea378c87d88b6e2c /board/solidrun | |
| parent | 9468bf3a69b05bda05adb06f954b089ace301afc (diff) | |
| parent | fc07cac02adebc87b69cd82f6ca6f0283d11cd5a (diff) | |
Merge tag 'u-boot-imx-master-20240330' of https://gitlab.denx.de/u-boot/custodians/u-boot-imxmaster
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/20122
- Fix reset regression on mx6cuboxi and warp7.
- Fix Fix board revision detection on mx6cuboxi.
Diffstat (limited to 'board/solidrun')
| -rw-r--r-- | board/solidrun/mx6cuboxi/mx6cuboxi.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c index 8edabf4404..7dffb96f0a 100644 --- a/board/solidrun/mx6cuboxi/mx6cuboxi.c +++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c @@ -336,20 +336,17 @@ static enum board_type board_type(void) * HB 1 1 x */ - gpio_direction_input(IMX_GPIO_NR(2, 8)); - val3 = gpio_get_value(IMX_GPIO_NR(2, 8)); + val3 = !!dm_gpio_get_value(&board_detect_desc[0]); if (val3 == 0) return HUMMINGBOARD2; - gpio_direction_input(IMX_GPIO_NR(3, 4)); - val2 = gpio_get_value(IMX_GPIO_NR(3, 4)); + val2 = !!dm_gpio_get_value(&board_detect_desc[1]); if (val2 == 0) return HUMMINGBOARD; - gpio_direction_input(IMX_GPIO_NR(4, 9)); - val1 = gpio_get_value(IMX_GPIO_NR(4, 9)); + val1 = !!dm_gpio_get_value(&board_detect_desc[2]); if (val1 == 0) { return CUBOXI; @@ -363,8 +360,8 @@ static bool is_rev_15_som(void) int val1, val2; SETUP_IOMUX_PADS(som_rev_detect); - val1 = gpio_get_value(IMX_GPIO_NR(6, 0)); - val2 = gpio_get_value(IMX_GPIO_NR(6, 4)); + val1 = !!dm_gpio_get_value(&board_detect_desc[3]); + val2 = !!dm_gpio_get_value(&board_detect_desc[4]); if (val1 == 1 && val2 == 0) return true; |