Merge branch 'mtk_mipicsi' into HEAD
Change-Id: I321f82d28a80e8fd98b249906e694dba98a9bea4
diff --git a/arch/arm64/boot/dts/mediatek/mt8167-coral-display-overlay.dts b/arch/arm64/boot/dts/mediatek/mt8167-coral-display-overlay.dts
index fc1ddca..82e7824 100644
--- a/arch/arm64/boot/dts/mediatek/mt8167-coral-display-overlay.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8167-coral-display-overlay.dts
@@ -38,8 +38,7 @@
target = <&backlight>;
__overlay__ {
status = "okay";
- pwms = <&pwm 0 1000000>;
- enable-gpios = <&pio 25 0>;
+ pwms = <&pwm 1 1000000>;
brightness-levels = <0 4 8 16 32 64 128 255>;
default-brightness-level = <6>;
};
diff --git a/drivers/gpu/drm/panel/panel-startek-ili9488.c b/drivers/gpu/drm/panel/panel-startek-ili9488.c
index 8304529..dd6b753 100644
--- a/drivers/gpu/drm/panel/panel-startek-ili9488.c
+++ b/drivers/gpu/drm/panel/panel-startek-ili9488.c
@@ -285,20 +285,32 @@
static int startek_panel_enable(struct drm_panel *panel)
{
+ int ret;
struct startek_panel *startek =
container_of(panel, struct startek_panel, panel);
+ struct mipi_dsi_device *dsi = startek->dsi;
- backlight_enable(startek->backlight);
+ ret = backlight_enable(startek->backlight);
+ if (ret < 0) {
+ dev_err(&dsi->dev, "failed to enable backlight: %d", ret);
+ return ret;
+ }
return 0;
}
static int startek_panel_disable(struct drm_panel *panel)
{
+ int ret;
struct startek_panel *startek =
container_of(panel, struct startek_panel, panel);
+ struct mipi_dsi_device *dsi = startek->dsi;
- backlight_disable(startek->backlight);
+ ret = backlight_disable(startek->backlight);
+ if (ret < 0) {
+ dev_err(&dsi->dev, "failed to disable backlight: %d", ret);
+ return ret;
+ }
return 0;
}
