diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2021-10-11 12:09:07 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-10-11 12:09:08 +0200 |
| commit | 24e18b0f45c7830a74400aa599e4e3d67155ae1c (patch) | |
| tree | fd2ba4e3f5f581cdbe8d265babc0053b637ed64b /drivers/gpu/drm | |
| parent | Merge tag 'memory-controller-drv-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/drivers (diff) | |
| parent | drm/mediatek: mtk_dsi: Reset the dsi0 hardware (diff) | |
| download | wireguard-linux-24e18b0f45c7830a74400aa599e4e3d67155ae1c.tar.xz wireguard-linux-24e18b0f45c7830a74400aa599e4e3d67155ae1c.zip | |
Merge tag 'v5.15-next-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/drivers
- mt8192: add mutex support
- mmsys:
add more components
add routing table for mt8192
add reset controller support
* tag 'v5.15-next-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
drm/mediatek: mtk_dsi: Reset the dsi0 hardware
soc: mediatek: mmsys: Add reset controller support
soc: mediatek: add mtk mutex support for MT8192
soc: mediatek: mmsys: Add mt8192 mmsys routing table
soc: mediatek: mmsys: add comp OVL_2L2/POSTMASK/RDMA4
Link: https://lore.kernel.org/r/b1d364d0-f2ae-488b-b3f7-c694049c20d3@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/mediatek/mtk_dsi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index 93b40c245f00..5d90d2eb0019 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -11,6 +11,7 @@ #include <linux/of_platform.h> #include <linux/phy/phy.h> #include <linux/platform_device.h> +#include <linux/reset.h> #include <video/mipi_display.h> #include <video/videomode.h> @@ -980,8 +981,10 @@ static int mtk_dsi_bind(struct device *dev, struct device *master, void *data) struct mtk_dsi *dsi = dev_get_drvdata(dev); ret = mtk_dsi_encoder_init(drm, dsi); + if (ret) + return ret; - return ret; + return device_reset_optional(dev); } static void mtk_dsi_unbind(struct device *dev, struct device *master, |