karo: tx48: fix U-Boot heartbeat LED

Add missing call to gpio_request_array(stk5_gpios) that has been lost
somehow. Also call to gpio_request_array() before calling
tx48_set_pin_mux() to prevent glitches when reconfiguring pin
functions.

diff --git a/board/karo/tx48/tx48.c b/board/karo/tx48/tx48.c
index f44452eb60b81258b12a5a790d53f75a5177f1dc..7929edc3669eb8e8e9ff8ce535956fcef31714a4 100644 (file)
--- a/board/karo/tx48/tx48.c
+++ b/board/karo/tx48/tx48.c
@@ -335,6 +335,10 @@ static const struct pin_mux stk5_pads[] = {
        { OFFSET(mcasp0_aclkx), MODE(7) | PULLUDEN, },
 };
 
+static const struct gpio stk5_gpios[] = {
+       { AM33XX_GPIO_NR(1, 26), GPIOF_OUTPUT_INIT_LOW, "HEARTBEAT LED", },
+};
+
 static const struct pin_mux stk5_lcd_pads[] = {
        /* LCD data bus */
        { OFFSET(lcd_data0), MODE(0) | PULLUDEN, },
@@ -360,10 +364,6 @@ static const struct pin_mux stk5_lcd_pads[] = {
        { OFFSET(lcd_ac_bias_en), MODE(0) | PULLUDEN, },
 };
 
-static const struct gpio stk5_gpios[] = {
-       { AM33XX_GPIO_NR(1, 26), GPIOF_OUTPUT_INIT_LOW, "HEARTBEAT LED", },
-};
-
 static const struct gpio stk5_lcd_gpios[] = {
        { AM33XX_GPIO_NR(1, 19), GPIOF_OUTPUT_INIT_LOW, "LCD RESET", },
        { AM33XX_GPIO_NR(1, 22), GPIOF_OUTPUT_INIT_LOW, "LCD POWER", },
@@ -787,6 +787,7 @@ void lcd_ctrl_init(void *lcdbase)
 
 static void stk5_board_init(void)
 {
+       gpio_request_array(stk5_gpios, ARRAY_SIZE(stk5_gpios));
        tx48_set_pin_mux(stk5_pads, ARRAY_SIZE(stk5_pads));
 }
 
@@ -798,8 +799,9 @@ static void stk5v3_board_init(void)
 static void stk5v5_board_init(void)
 {
        stk5_board_init();
-       tx48_set_pin_mux(stk5v5_pads, ARRAY_SIZE(stk5v5_pads));
+
        gpio_request_array(stk5v5_gpios, ARRAY_SIZE(stk5v5_gpios));
+       tx48_set_pin_mux(stk5v5_pads, ARRAY_SIZE(stk5v5_pads));
 }
 
 /* called with default environment! */