diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-01-08 18:55:04 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2023-01-08 18:55:05 -0800 |
| commit | 0e83cb068c4ee4153d7fa7ce1929746a97819ba3 (patch) | |
| tree | b535860ed269ead11f3cfea9d049b53f31f804ba | |
| parent | 0aa5f9e85f1eae017e325f62dcc2d8384be4a1c1 (diff) | |
| parent | 21ced81d0c17a13a91c1fba4c8f9d5a269ca67c6 (diff) | |
| download | display-0e83cb068c4ee4153d7fa7ce1929746a97819ba3.tar.gz | |
Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr3
SBMerger: 478053055
Change-Id: Id9c7f210bc2be9e580b3b0890ec4b299d54e5e6d
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -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); }; /** |