Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c344ee68 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'exynos-drm-next' of... 

Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next

Feature summary:
Add S3C64XX SoC series support - S3C64XX SoC series are previous version
chips of Exynos SoC series. With this patch set, KMS driver of Exynos drm
supports those chips also.

Update device tree support - This patch set corrects compatible strings,
and adds Exynos5420 SoC support for hdmi subsystem.

Consider CCF (Common Clock Framework) support - With reference to CCF
support, it uses clock_prepare_enable/clock_disable_unprepare instead of
clk_enable/clk_disable for hdmi subsystem.

Big cleanups - This patch just removes unnecessary all debug logs.

* 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos: (22 commits)
  ARM: dts: change compatible strings for EXYNOS5250 hdmi subsystem
  drm/exynos: add support for exynos5420 mixer
  drm/exynos: add new compatible strings for hdmi subsystem
  drm/exynos: fix interlace resolutions for exynos5420
  drm/exynos: use of_get_named_gpio to get hdmi hpd gpio
  drm/exynos: make sure to handle an error case to vm_mmap call
  drm/exynos: exynos_drm_ipp: Remove redundant break statement
  drm/exynos: add mout_hdmi clock in hdmi driver to change parent
  drm/exynos: Prepare/Unprepare HDMI subsystem clocks
  drm/exynos: Clean up logs for DRM_ERROR / DRM_DEBUG_KMS
  drm/exynos: Remove tracking log functions
  drm/exynos: hdmi: use drm_display_mode to check the supported modes
  drm/exynos: fimd: Add support for S3C64xx SoCs
  drm/exynos: fimd: Add support for FIMD variants with clock selection
  drm/exynos: fimd: Add support for FIMD versions without SHADOWCON register
  drm/exynos: fimd: Hold pointer to driver data in context struct
  drm/exynos: do not use mode_set_base function directly
  drm/exynos: Remove redundant use of of_match_ptr macro
  drm/exynos: remove ignoring return value warning in hdmi
  drm/exynos: fix WINDOWS_NR checking to vidi driver
  ...
parents d482e5fa 0d1fc829

Documentation/devicetree/bindings/video/exynos_hdmi.txt

+5 −2
Original line number Diff line number Diff line 
Device-Tree bindings for drm hdmi driver



Required properties:

- compatible: value should be "samsung,exynos5-hdmi".

- compatible: value should be one among the following:

	1) "samsung,exynos5-hdmi" <DEPRECATED>

	2) "samsung,exynos4210-hdmi"

	3) "samsung,exynos4212-hdmi"

- reg: physical base address of the hdmi and length of memory mapped

	region.

- interrupts: interrupt number to the cpu.
@@ -15,7 +18,7 @@ Required properties: 
Example:



	hdmi {

		compatible = "samsung,exynos5-hdmi";

		compatible = "samsung,exynos4212-hdmi";

		reg = <0x14530000 0x100000>;

		interrupts = <0 95 0>;

		hpd-gpio = <&gpx3 7 0xf 1 3>;

Documentation/devicetree/bindings/video/exynos_hdmiddc.txt

+5 −2
Original line number Diff line number Diff line 
Device-Tree bindings for hdmiddc driver



Required properties:

- compatible: value should be "samsung,exynos5-hdmiddc".

- compatible: value should be one of the following

	1) "samsung,exynos5-hdmiddc" <DEPRECATED>

	2) "samsung,exynos4210-hdmiddc"



- reg: I2C address of the hdmiddc device.



Example:



	hdmiddc {

		compatible = "samsung,exynos5-hdmiddc";

		compatible = "samsung,exynos4210-hdmiddc";

		reg = <0x50>;

	};

Documentation/devicetree/bindings/video/exynos_hdmiphy.txt

+5 −2
Original line number Diff line number Diff line 
Device-Tree bindings for hdmiphy driver



Required properties:

- compatible: value should be "samsung,exynos5-hdmiphy".

- compatible: value should be one of the following:

	1) "samsung,exynos5-hdmiphy" <DEPRECATED>

	2) "samsung,exynos4210-hdmiphy".

	3) "samsung,exynos4212-hdmiphy".

- reg: I2C address of the hdmiphy device.



Example:



	hdmiphy {

		compatible = "samsung,exynos5-hdmiphy";

		compatible = "samsung,exynos4210-hdmiphy";

		reg = <0x38>;

	};

Documentation/devicetree/bindings/video/exynos_mixer.txt

+7 −2
Original line number Diff line number Diff line 
Device-Tree bindings for mixer driver



Required properties:

- compatible: value should be "samsung,exynos5-mixer".

- compatible: value should be one of the following:

	1) "samsung,exynos5-mixer" <DEPRECATED>

	2) "samsung,exynos4210-mixer"

	3) "samsung,exynos5250-mixer"

	4) "samsung,exynos5420-mixer"



- reg: physical base address of the mixer and length of memory mapped

	region.

- interrupts: interrupt number to the cpu.
@@ -9,7 +14,7 @@ Required properties: 
Example:



	mixer {

		compatible = "samsung,exynos5-mixer";

		compatible = "samsung,exynos5250-mixer";

		reg = <0x14450000 0x10000>;

		interrupts = <0 94 0>;

	};

arch/arm/boot/dts/cros5250-common.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ 
		samsung,i2c-max-bus-freq = <66000>;



		hdmiddc@50 {

			compatible = "samsung,exynos5-hdmiddc";

			compatible = "samsung,exynos4210-hdmiddc";

			reg = <0x50>;

		};

	};
@@ -224,7 +224,7 @@ 
		samsung,i2c-max-bus-freq = <378000>;



		hdmiphy@38 {

			compatible = "samsung,exynos5-hdmiphy";

			compatible = "samsung,exynos4212-hdmiphy";

			reg = <0x38>;

		};

	};