Commit 1ebdc90e authored Jul 13, 2022 by Dave Airlie

Merge tag 'exynos-drm-next-for-v5.20' of...

Merge tag 'exynos-drm-next-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos

 into drm-next

Two cleanups
- Remove Joonyoung Shim from MAINTAINERS and relevant yaml files.
  He left from Samsung so his email address isn't valid anymore.

Fixup
- Fix resume function issue of exynos decon driver by calling
  clk_disable_unprepare() properly if clk_prepare_enable() failed.

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220712061008.199961-1-inki.dae@samsung.com

parents d9e019bb 48b92777

CREDITS

+4 −0

Original line number	Diff line number	Diff line
		@@ -3491,6 +3491,10 @@ D: wd33c93 SCSI driver (linux-m68k)
		S: San Jose, California
		S: USA

		N: Joonyoung Shim
		E: y0922.shim@samsung.com
		D: Samsung Exynos DRM drivers

		N: Robert Siemer
		E: Robert.Siemer@gmx.de
		P: 2048/C99A4289 2F DC 17 2E 56 62 01 C8 3D F2 AC 09 F2 E5 DD EE

Documentation/devicetree/bindings/display/samsung/samsung,exynos-hdmi-ddc.yaml

+0 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@ title: Samsung Exynos SoC HDMI DDC

		maintainers:
		- Inki Dae <inki.dae@samsung.com>
		- Joonyoung Shim <jy0922.shim@samsung.com>
		- Seung-Woo Kim <sw0312.kim@samsung.com>
		- Kyungmin Park <kyungmin.park@samsung.com>
		- Krzysztof Kozlowski <krzk@kernel.org>

Documentation/devicetree/bindings/display/samsung/samsung,exynos-hdmi.yaml

+0 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@ title: Samsung Exynos SoC HDMI

		maintainers:
		- Inki Dae <inki.dae@samsung.com>
		- Joonyoung Shim <jy0922.shim@samsung.com>
		- Seung-Woo Kim <sw0312.kim@samsung.com>
		- Kyungmin Park <kyungmin.park@samsung.com>
		- Krzysztof Kozlowski <krzk@kernel.org>

Documentation/devicetree/bindings/display/samsung/samsung,exynos-mixer.yaml

+0 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@ title: Samsung Exynos SoC Mixer

		maintainers:
		- Inki Dae <inki.dae@samsung.com>
		- Joonyoung Shim <jy0922.shim@samsung.com>
		- Seung-Woo Kim <sw0312.kim@samsung.com>
		- Kyungmin Park <kyungmin.park@samsung.com>
		- Krzysztof Kozlowski <krzk@kernel.org>

Documentation/devicetree/bindings/display/samsung/samsung,exynos5433-decon.yaml

+0 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@ title: Samsung Exynos5433 SoC Display and Enhancement Controller (DECON)

		maintainers:
		- Inki Dae <inki.dae@samsung.com>
		- Joonyoung Shim <jy0922.shim@samsung.com>
		- Seung-Woo Kim <sw0312.kim@samsung.com>
		- Kyungmin Park <kyungmin.park@samsung.com>
		- Krzysztof Kozlowski <krzk@kernel.org>