From 8eb99d052429b139ec328c7418fbe9c5070064fb Mon Sep 17 00:00:00 2001 From: huang lin Date: Thu, 12 Mar 2015 19:29:12 -0700 Subject: rockchip/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: I19e488c7d3f1fe5cb91f8a93fae6b848f58b36b7 Signed-off-by: Patrick Georgi Original-Commit-Id: cb594ce612e1cedeabced4531fbd954f3698da98 Original-Change-Id: Ib0dac7c48bce7d0b28ec287b32d8c5bad575893f Original-Signed-off-by: huang lin Original-Reviewed-on: https://chromium-review.googlesource.com/259900 Original-Reviewed-by: Julius Werner Reviewed-on: http://review.coreboot.org/9864 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/mainboard/google/veyron_danger/board.h | 2 +- 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_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 ++++---- 9 files changed, 21 insertions(+), 21 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/google/veyron_danger/board.h b/src/mainboard/google/veyron_danger/board.h index 4d0e8bec3406..10bcf459b2c6 100644 --- a/src/mainboard/google/veyron_danger/board.h +++ b/src/mainboard/google/veyron_danger/board.h @@ -23,7 +23,7 @@ #include #include -#define GPIO_BACKLIGHT GPIO(7, A, 3) +#define GPIO_BACKLIGHT GPIO(7, A, 3) #define GPIO_RESET GPIO(0, B, 5) void setup_chromeos_gpios(void); diff --git a/src/mainboard/google/veyron_jerry/board.h b/src/mainboard/google/veyron_jerry/board.h index 2f8a341d4fa2..bf00b1b3e50b 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 6fb3a8f6eab3..2b9ec662b1bd 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 2ca1a4139256..32310549e93f 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 5c417544eaf7..09a90543a358 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_pinky/board.h b/src/mainboard/google/veyron_pinky/board.h index 45590e7a5777..72c1e0c2d8eb 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 ef14c2d6b1e5..b57314a26880 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 f98854e168ad..9a2170065ae6 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 5c417544eaf7..09a90543a358 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; } } -- cgit v1.2.3