diff options
| author | Joey Lin <linjoey@google.com> | 2023-01-10 16:46:22 +0000 |
|---|---|---|
| committer | Joey Lin <linjoey@google.com> | 2023-01-10 16:46:22 +0000 |
| commit | 0d2b139ff9751a500e39f7f9fc7d6c539aff834f (patch) | |
| tree | 3e2d05526bea56323bf2cdc8b639f73557f83270 | |
| parent | 240c7039e381b9fb6402be99445a62d85c956c5b (diff) | |
| parent | 0e83cb068c4ee4153d7fa7ce1929746a97819ba3 (diff) | |
| download | display-0d2b139ff9751a500e39f7f9fc7d6c539aff834f.tar.gz | |
Merge "Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr3" into android13-gs-pixel-5.10-tm-qpr3
| -rw-r--r-- | samsung/panel/panel-samsung-drv.c | 6 | ||||
| -rw-r--r-- | samsung/panel/panel-samsung-drv.h | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/samsung/panel/panel-samsung-drv.c b/samsung/panel/panel-samsung-drv.c index 80eb6f2..78c08f0 100644 --- a/samsung/panel/panel-samsung-drv.c +++ b/samsung/panel/panel-samsung-drv.c @@ -595,7 +595,11 @@ static int exynos_panel_parse_dt(struct exynos_panel *ctx) if (ret) goto err; - ret = exynos_panel_parse_regulators(ctx); + if (ctx->desc && ctx->desc->exynos_panel_func && + ctx->desc->exynos_panel_func->parse_regulators) + ret = ctx->desc->exynos_panel_func->parse_regulators(ctx); + else + ret = exynos_panel_parse_regulators(ctx); if (ret) goto err; diff --git a/samsung/panel/panel-samsung-drv.h b/samsung/panel/panel-samsung-drv.h index f42d586..4e2688e 100644 --- a/samsung/panel/panel-samsung-drv.h +++ b/samsung/panel/panel-samsung-drv.h @@ -424,6 +424,13 @@ struct exynos_panel_funcs { * List supported OSC2 clock for panel. */ ssize_t (*list_osc2_clk_khz)(struct exynos_panel *exynos_panel, char *buf); + + /** + * @parse_regulators + * + * Parse regulators for panel. + */ + int (*parse_regulators)(struct exynos_panel *ctx); }; /** |