From f15b332c62b41f7998649c9593c03e78e7d88dd1 Mon Sep 17 00:00:00 2001 From: huang lin Date: Thu, 12 Mar 2015 19:29:12 -0700 Subject: [PATCH] rk3288: use bl_en instead lcd_bl to fill_lb_gpio in depthcharge we will use "backlight" gpio which in lb_gpio table to control backlight, we use lcd_bl before, but it will not meet the backlight power sequence, so we change it to bl_en. BUG=chrome-os-partner:37348 TEST=Boot from speedy, and backlight work well BRANCH=None Change-Id: Ib0dac7c48bce7d0b28ec287b32d8c5bad575893f Signed-off-by: huang lin Reviewed-on: https://chromium-review.googlesource.com/259900 Reviewed-by: Julius Werner (cherry picked from commit cb594ce612e1cedeabced4531fbd954f3698da98) Signed-off-by: huang lin Reviewed-on: https://chromium-review.googlesource.com/259901 Tested-by: Jiazi Yang Commit-Queue: Julius Werner Tested-by: Julius Werner --- src/mainboard/google/veyron_gus/board.h | 2 +- src/mainboard/google/veyron_gus/mainboard.c | 4 ++-- src/mainboard/google/veyron_jaq/board.h | 2 +- src/mainboard/google/veyron_jaq/mainboard.c | 4 ++-- src/mainboard/google/veyron_jerry/board.h | 2 +- src/mainboard/google/veyron_jerry/mainboard.c | 8 ++++---- src/mainboard/google/veyron_mighty/board.h | 2 +- src/mainboard/google/veyron_mighty/mainboard.c | 8 ++++---- src/mainboard/google/veyron_minnie/board.h | 2 +- src/mainboard/google/veyron_minnie/mainboard.c | 4 ++-- src/mainboard/google/veyron_pinky/board.h | 2 +- src/mainboard/google/veyron_pinky/mainboard.c | 8 ++++---- src/mainboard/google/veyron_speedy/board.h | 2 +- src/mainboard/google/veyron_speedy/mainboard.c | 8 ++++---- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/mainboard/google/veyron_gus/board.h b/src/mainboard/google/veyron_gus/board.h index fa40d60353..29b2b9b23d 100644 --- a/src/mainboard/google/veyron_gus/board.h +++ b/src/mainboard/google/veyron_gus/board.h @@ -23,7 +23,7 @@ #include #include -#define GPIO_BACKLIGHT GPIO(7, A, 0) +#define GPIO_BACKLIGHT GPIO(7, A, 2) #define GPIO_RESET GPIO(0, B, 5) void setup_chromeos_gpios(void); diff --git a/src/mainboard/google/veyron_gus/mainboard.c b/src/mainboard/google/veyron_gus/mainboard.c index 0a0c06b051..f762eb3515 100644 --- a/src/mainboard/google/veyron_gus/mainboard.c +++ b/src/mainboard/google/veyron_gus/mainboard.c @@ -142,7 +142,7 @@ void mainboard_power_on_backlight(void) { gpio_output(GPIO(2, B, 4), 1); /* BL_PWR_EN */ mdelay(20); - gpio_output(GPIO_BACKLIGHT, 1); /* LCD_BL */ + gpio_output(GPIO(7, A, 0), 1); /* LCD_BL */ mdelay(10); - gpio_output(GPIO(7, A, 2), 1); /* BL_EN */ + gpio_output(GPIO_BACKLIGHT, 1); /* BL_EN */ } diff --git a/src/mainboard/google/veyron_jaq/board.h b/src/mainboard/google/veyron_jaq/board.h index a8667ba6d0..7920746069 100644 --- a/src/mainboard/google/veyron_jaq/board.h +++ b/src/mainboard/google/veyron_jaq/board.h @@ -23,7 +23,7 @@ #include #include -#define GPIO_BACKLIGHT GPIO(7, A, 0) +#define GPIO_BACKLIGHT GPIO(7, A, 2) #define GPIO_RESET GPIO(0, B, 5) void setup_chromeos_gpios(void); diff --git a/src/mainboard/google/veyron_jaq/mainboard.c b/src/mainboard/google/veyron_jaq/mainboard.c index 0a0c06b051..f762eb3515 100644 --- a/src/mainboard/google/veyron_jaq/mainboard.c +++ b/src/mainboard/google/veyron_jaq/mainboard.c @@ -142,7 +142,7 @@ void mainboard_power_on_backlight(void) { gpio_output(GPIO(2, B, 4), 1); /* BL_PWR_EN */ mdelay(20); - gpio_output(GPIO_BACKLIGHT, 1); /* LCD_BL */ + gpio_output(GPIO(7, A, 0), 1); /* LCD_BL */ mdelay(10); - gpio_output(GPIO(7, A, 2), 1); /* BL_EN */ + gpio_output(GPIO_BACKLIGHT, 1); /* BL_EN */ } diff --git a/src/mainboard/google/veyron_jerry/board.h b/src/mainboard/google/veyron_jerry/board.h index 2f8a341d4f..bf00b1b3e5 100644 --- a/src/mainboard/google/veyron_jerry/board.h +++ b/src/mainboard/google/veyron_jerry/board.h @@ -23,7 +23,7 @@ #include #include -#define GPIO_BACKLIGHT GPIO(7, A, 0) +#define GPIO_BACKLIGHT GPIO(7, A, 2) #define GPIO_RESET GPIO(0, B, 5) void setup_chromeos_gpios(void); diff --git a/src/mainboard/google/veyron_jerry/mainboard.c b/src/mainboard/google/veyron_jerry/mainboard.c index 1fc823c5fe..04ea739862 100644 --- a/src/mainboard/google/veyron_jerry/mainboard.c +++ b/src/mainboard/google/veyron_jerry/mainboard.c @@ -151,17 +151,17 @@ void mainboard_power_on_backlight(void) { switch (board_id()) { case 2: - gpio_output(GPIO_BACKLIGHT, 0); /* BL_EN */ + gpio_output(GPIO(7, A, 0), 0); /* BL_EN */ gpio_output(GPIO(7, A, 2), 1); /* LCD_BL */ mdelay(10); - gpio_output(GPIO_BACKLIGHT, 1); /* BL_EN */ + gpio_output(GPIO(7, A, 0), 1); /* BL_EN */ break; default: gpio_output(GPIO(2, B, 4), 1); /* BL_PWR_EN */ mdelay(20); - gpio_output(GPIO_BACKLIGHT, 1); /* LCD_BL */ + gpio_output(GPIO(7, A, 0), 1); /* LCD_BL */ mdelay(10); - gpio_output(GPIO(7, A, 2), 1); /* BL_EN */ + gpio_output(GPIO_BACKLIGHT, 1); /* BL_EN */ break; } } diff --git a/src/mainboard/google/veyron_mighty/board.h b/src/mainboard/google/veyron_mighty/board.h index 2ca1a41392..32310549e9 100644 --- a/src/mainboard/google/veyron_mighty/board.h +++ b/src/mainboard/google/veyron_mighty/board.h @@ -23,7 +23,7 @@ #include #include -#define GPIO_BACKLIGHT GPIO(7, A, 0) +#define GPIO_BACKLIGHT GPIO(7, A, 2) #define GPIO_RESET GPIO(0, B, 5) void setup_chromeos_gpios(void); diff --git a/src/mainboard/google/veyron_mighty/mainboard.c b/src/mainboard/google/veyron_mighty/mainboard.c index fb1d8fa69e..8f10beeb1a 100644 --- a/src/mainboard/google/veyron_mighty/mainboard.c +++ b/src/mainboard/google/veyron_mighty/mainboard.c @@ -151,17 +151,17 @@ void mainboard_power_on_backlight(void) { switch (board_id()) { case 0: - gpio_output(GPIO_BACKLIGHT, 0); /* BL_EN */ + gpio_output(GPIO(7, A, 0), 0); /* BL_EN */ gpio_output(GPIO(7, A, 2), 1); /* LCD_BL */ mdelay(10); - gpio_output(GPIO_BACKLIGHT, 1); /* BL_EN */ + gpio_output(GPIO(7, A, 0), 1); /* BL_EN */ break; default: gpio_output(GPIO(2, B, 4), 1); /* BL_PWR_EN */ mdelay(20); - gpio_output(GPIO_BACKLIGHT, 1); /* LCD_BL */ + gpio_output(GPIO(7, A, 0), 1); /* LCD_BL */ mdelay(10); - gpio_output(GPIO(7, A, 2), 1); /* BL_EN */ + gpio_output(GPIO_BACKLIGHT, 1); /* BL_EN */ break; } } diff --git a/src/mainboard/google/veyron_minnie/board.h b/src/mainboard/google/veyron_minnie/board.h index 6c51b42d6e..7944bcd51c 100644 --- a/src/mainboard/google/veyron_minnie/board.h +++ b/src/mainboard/google/veyron_minnie/board.h @@ -23,7 +23,7 @@ #include #include -#define GPIO_BACKLIGHT GPIO(7, A, 0) +#define GPIO_BACKLIGHT GPIO(7, A, 2) #define GPIO_RESET GPIO(0, B, 5) void setup_chromeos_gpios(void); diff --git a/src/mainboard/google/veyron_minnie/mainboard.c b/src/mainboard/google/veyron_minnie/mainboard.c index 0a0c06b051..f762eb3515 100644 --- a/src/mainboard/google/veyron_minnie/mainboard.c +++ b/src/mainboard/google/veyron_minnie/mainboard.c @@ -142,7 +142,7 @@ void mainboard_power_on_backlight(void) { gpio_output(GPIO(2, B, 4), 1); /* BL_PWR_EN */ mdelay(20); - gpio_output(GPIO_BACKLIGHT, 1); /* LCD_BL */ + gpio_output(GPIO(7, A, 0), 1); /* LCD_BL */ mdelay(10); - gpio_output(GPIO(7, A, 2), 1); /* BL_EN */ + gpio_output(GPIO_BACKLIGHT, 1); /* BL_EN */ } diff --git a/src/mainboard/google/veyron_pinky/board.h b/src/mainboard/google/veyron_pinky/board.h index 45590e7a57..72c1e0c2d8 100644 --- a/src/mainboard/google/veyron_pinky/board.h +++ b/src/mainboard/google/veyron_pinky/board.h @@ -23,7 +23,7 @@ #include #include -#define GPIO_BACKLIGHT GPIO(7, A, 0) +#define GPIO_BACKLIGHT GPIO(7, A, 2) #define GPIO_RESET (board_id() > 0 ? GPIO(0, B, 5) : GPIO(0, B, 2)) void setup_chromeos_gpios(void); diff --git a/src/mainboard/google/veyron_pinky/mainboard.c b/src/mainboard/google/veyron_pinky/mainboard.c index e3e5b290a9..841815a534 100644 --- a/src/mainboard/google/veyron_pinky/mainboard.c +++ b/src/mainboard/google/veyron_pinky/mainboard.c @@ -197,17 +197,17 @@ void mainboard_power_on_backlight(void) case 0: case 1: case 2: - gpio_output(GPIO_BACKLIGHT, 0); /* BL_EN */ + gpio_output(GPIO(7, A, 0), 0); /* BL_EN */ gpio_output(GPIO(7, A, 2), 1); /* LCD_BL */ mdelay(10); - gpio_output(GPIO_BACKLIGHT, 1); /* BL_EN */ + gpio_output(GPIO(7, A, 0), 1); /* BL_EN */ break; default: gpio_output(GPIO(2, B, 4), 1); /* BL_PWR_EN */ mdelay(20); - gpio_output(GPIO_BACKLIGHT, 1); /* LCD_BL */ + gpio_output(GPIO(7, A, 0), 1); /* LCD_BL */ mdelay(10); - gpio_output(GPIO(7, A, 2), 1); /* BL_EN */ + gpio_output(GPIO_BACKLIGHT, 1); /* BL_EN */ break; } } diff --git a/src/mainboard/google/veyron_speedy/board.h b/src/mainboard/google/veyron_speedy/board.h index f98854e168..9a2170065a 100644 --- a/src/mainboard/google/veyron_speedy/board.h +++ b/src/mainboard/google/veyron_speedy/board.h @@ -23,7 +23,7 @@ #include #include -#define GPIO_BACKLIGHT GPIO(7, A, 0) +#define GPIO_BACKLIGHT GPIO(7, A, 2) #define GPIO_RESET GPIO(0, B, 5) void setup_chromeos_gpios(void); diff --git a/src/mainboard/google/veyron_speedy/mainboard.c b/src/mainboard/google/veyron_speedy/mainboard.c index fb1d8fa69e..8f10beeb1a 100644 --- a/src/mainboard/google/veyron_speedy/mainboard.c +++ b/src/mainboard/google/veyron_speedy/mainboard.c @@ -151,17 +151,17 @@ void mainboard_power_on_backlight(void) { switch (board_id()) { case 0: - gpio_output(GPIO_BACKLIGHT, 0); /* BL_EN */ + gpio_output(GPIO(7, A, 0), 0); /* BL_EN */ gpio_output(GPIO(7, A, 2), 1); /* LCD_BL */ mdelay(10); - gpio_output(GPIO_BACKLIGHT, 1); /* BL_EN */ + gpio_output(GPIO(7, A, 0), 1); /* BL_EN */ break; default: gpio_output(GPIO(2, B, 4), 1); /* BL_PWR_EN */ mdelay(20); - gpio_output(GPIO_BACKLIGHT, 1); /* LCD_BL */ + gpio_output(GPIO(7, A, 0), 1); /* LCD_BL */ mdelay(10); - gpio_output(GPIO(7, A, 2), 1); /* BL_EN */ + gpio_output(GPIO_BACKLIGHT, 1); /* BL_EN */ break; } }