From d3089a36d5b9c25ae2827aacfdc69c5ac5b49a11 Mon Sep 17 00:00:00 2001 From: Ruihai Zhou Date: Tue, 7 Nov 2023 16:29:50 +0800 Subject: mb/google/geralt: Move backlight-related functions to common panel.c These backlight related functions can be reused in other variants, move them out to the panel.c. Also the panel_geralt.c should be used for Geralt, enable it on Geralt board only. BUG=b:308968270 TEST=emerge-geralt coreboot BRANCH=None Change-Id: I5d4035d5f480551c428c450826e23bf77f2fe08a Signed-off-by: Ruihai Zhou Reviewed-on: https://review.coreboot.org/c/coreboot/+/78955 Reviewed-by: Yidi Lin Tested-by: build bot (Jenkins) Reviewed-by: cong yang --- src/mainboard/google/geralt/Makefile.inc | 2 +- src/mainboard/google/geralt/panel.c | 43 ++++++++++++++++++++++++++++++ src/mainboard/google/geralt/panel.h | 1 + src/mainboard/google/geralt/panel_geralt.c | 37 ------------------------- 4 files changed, 45 insertions(+), 38 deletions(-) diff --git a/src/mainboard/google/geralt/Makefile.inc b/src/mainboard/google/geralt/Makefile.inc index a0ac297468f2..2b1f313ec953 100644 --- a/src/mainboard/google/geralt/Makefile.inc +++ b/src/mainboard/google/geralt/Makefile.inc @@ -23,6 +23,6 @@ ramstage-y += chromeos.c ramstage-y += display.c ramstage-y += mainboard.c ramstage-y += panel.c -ramstage-y += panel_geralt.c ramstage-y += regulator.c ramstage-y += reset.c +ramstage-$(CONFIG_BOARD_GOOGLE_GERALT) += panel_geralt.c diff --git a/src/mainboard/google/geralt/panel.c b/src/mainboard/google/geralt/panel.c index 3174870050e5..e25b5cbedd46 100644 --- a/src/mainboard/google/geralt/panel.c +++ b/src/mainboard/google/geralt/panel.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -35,6 +36,13 @@ static void get_mipi_cmd_from_cbfs(struct panel_description *desc) printk(BIOS_ERR, "Missing %s in CBFS.\n", cbfs_name); } +struct panel_description __weak *get_panel_description(uint32_t panel_id) +{ + printk(BIOS_WARNING, "%s: %s: the panel configuration is not ready\n", + __func__, mainboard_part_number); + return NULL; +} + struct panel_description *get_active_panel(void) { uint32_t active_panel_id = panel_id(); @@ -66,3 +74,38 @@ struct panel_description *get_active_panel(void) } return panel; } + +void configure_mipi_pwm_backlight(void) +{ + gpio_output(GPIO_AP_DISP_BKLTEN, 0); + gpio_output(GPIO_MIPI_BL_PWM_1V8, 0); +} + +void fill_lp_backlight_gpios(struct lb_gpios *gpios) +{ + struct panel_description *panel = get_active_panel(); + if (!panel || panel->disp_path == DISP_PATH_NONE) + return; + + struct lb_gpio mipi_pwm_gpios[] = { + {GPIO_MIPI_BL_PWM_1V8.id, ACTIVE_HIGH, -1, "PWM control"}, + }; + + struct lb_gpio edp_pwm_gpios[] = { + {GPIO_EDP_BL_PWM_1V8.id, ACTIVE_HIGH, -1, "PWM control"}, + }; + + if (panel->pwm_ctrl_gpio) { + /* PWM control for typical eDP and MIPI panels */ + if (panel->disp_path == DISP_PATH_MIPI) + lb_add_gpios(gpios, mipi_pwm_gpios, ARRAY_SIZE(mipi_pwm_gpios)); + else + lb_add_gpios(gpios, edp_pwm_gpios, ARRAY_SIZE(edp_pwm_gpios)); + } + + struct lb_gpio backlight_gpios[] = { + {GPIO_AP_DISP_BKLTEN.id, ACTIVE_HIGH, -1, "backlight enable"}, + }; + + lb_add_gpios(gpios, backlight_gpios, ARRAY_SIZE(backlight_gpios)); +} diff --git a/src/mainboard/google/geralt/panel.h b/src/mainboard/google/geralt/panel.h index 11b7fb0918e2..71cecdf5e6a7 100644 --- a/src/mainboard/google/geralt/panel.h +++ b/src/mainboard/google/geralt/panel.h @@ -16,6 +16,7 @@ struct panel_description { bool pwm_ctrl_gpio; }; +void configure_mipi_pwm_backlight(void); void fill_lp_backlight_gpios(struct lb_gpios *gpios); uint32_t panel_id(void); struct panel_description *get_panel_description(uint32_t panel_id); diff --git a/src/mainboard/google/geralt/panel_geralt.c b/src/mainboard/google/geralt/panel_geralt.c index 455f7591fedf..2ca95bece5fa 100644 --- a/src/mainboard/google/geralt/panel_geralt.c +++ b/src/mainboard/google/geralt/panel_geralt.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include -#include #include #include #include @@ -12,18 +11,11 @@ #include #include -#include "display.h" #include "gpio.h" #include "panel.h" #define PMIC_TPS65132_I2C I2C3 -static void configure_mipi_pwm_backlight(void) -{ - gpio_output(GPIO_AP_DISP_BKLTEN, 0); - gpio_output(GPIO_MIPI_BL_PWM_1V8, 0); -} - static void power_on_mipi_boe_tv110c9m_ll0(void) { const struct tps65132s_reg_setting reg_settings[] = { @@ -76,32 +68,3 @@ struct panel_description *get_panel_description(uint32_t panel_id) return &panels[id]; } - -void fill_lp_backlight_gpios(struct lb_gpios *gpios) -{ - struct panel_description *panel = get_active_panel(); - if (!panel || panel->disp_path == DISP_PATH_NONE) - return; - - struct lb_gpio mipi_pwm_gpios[] = { - {GPIO_MIPI_BL_PWM_1V8.id, ACTIVE_HIGH, -1, "PWM control"}, - }; - - struct lb_gpio edp_pwm_gpios[] = { - {GPIO_EDP_BL_PWM_1V8.id, ACTIVE_HIGH, -1, "PWM control"}, - }; - - if (panel->pwm_ctrl_gpio) { - /* PWM control for typical eDP and MIPI panels */ - if (panel->disp_path == DISP_PATH_MIPI) - lb_add_gpios(gpios, mipi_pwm_gpios, ARRAY_SIZE(mipi_pwm_gpios)); - else - lb_add_gpios(gpios, edp_pwm_gpios, ARRAY_SIZE(edp_pwm_gpios)); - } - - struct lb_gpio backlight_gpios[] = { - {GPIO_AP_DISP_BKLTEN.id, ACTIVE_HIGH, -1, "backlight enable"}, - }; - - lb_add_gpios(gpios, backlight_gpios, ARRAY_SIZE(backlight_gpios)); -} -- cgit v1.2.3