Commit d52331d0 authored by Vasily Khoruzhick's avatar Vasily Khoruzhick
Browse files

plat/rockchip: initialize reset and poweroff GPIOs with known invalid value

And return NULL if we didn't get them in bl aux params otherwise reset and poweroff
will be broken on platforms that do not have reset and poweroff GPIOs.

Fixes: c1185ffd

 ("plat/rockchip: Switch to use new common BL aux parameter library")
Signed-off-by: default avatarVasily Khoruzhick <anarsoul@gmail.com>
Change-Id: Ic6cf6383d8f05d745e2c5d5e1b1df38514ea8429
parent 1d2b4161
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <limits.h>
#include <string.h> #include <string.h>
#include <lib/bl_aux_params/bl_aux_params.h> #include <lib/bl_aux_params/bl_aux_params.h>
...@@ -21,8 +22,8 @@ ...@@ -21,8 +22,8 @@
#include <plat_params.h> #include <plat_params.h>
#include <plat_private.h> #include <plat_private.h>
static struct bl_aux_gpio_info rst_gpio; static struct bl_aux_gpio_info rst_gpio = { .index = UINT_MAX } ;
static struct bl_aux_gpio_info poweroff_gpio; static struct bl_aux_gpio_info poweroff_gpio = { .index = UINT_MAX };
static struct bl_aux_gpio_info suspend_gpio[10]; static struct bl_aux_gpio_info suspend_gpio[10];
uint32_t suspend_gpio_cnt; uint32_t suspend_gpio_cnt;
static struct bl_aux_rk_apio_info suspend_apio; static struct bl_aux_rk_apio_info suspend_apio;
...@@ -174,11 +175,17 @@ uint32_t rockchip_get_uart_clock(void) ...@@ -174,11 +175,17 @@ uint32_t rockchip_get_uart_clock(void)
struct bl_aux_gpio_info *plat_get_rockchip_gpio_reset(void) struct bl_aux_gpio_info *plat_get_rockchip_gpio_reset(void)
{ {
if (rst_gpio.index == UINT_MAX)
return NULL;
return &rst_gpio; return &rst_gpio;
} }
struct bl_aux_gpio_info *plat_get_rockchip_gpio_poweroff(void) struct bl_aux_gpio_info *plat_get_rockchip_gpio_poweroff(void)
{ {
if (poweroff_gpio.index == UINT_MAX)
return NULL;
return &poweroff_gpio; return &poweroff_gpio;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment