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

Commit e642779b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/hdmi-samsung' of... 

Merge branch 'next/hdmi-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt

From Kukjin Kim:
This is for adding support for DT based exynos5250 hdmi and it adds
device node for hdmi, mixer, hdmiphy and hdmiddc.

* 'next/hdmi-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: removing exynos-drm device registration from non-dt platforms
  ARM: EXYNOS: add clocks for exynos5 hdmi
  ARM: dts: add device tree support for exynos5 hdmiddc
  ARM: dts: add device tree support for exynos5 hdmiphy
  ARM: dts: add device tree support for exynos5 mixer
  ARM: dts: add device tree support for exynos5 hdmi
parents 02d1ea0d 0a9d5ac3

Documentation/devicetree/bindings/drm/exynos/hdmi.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
Device-Tree bindings for drm hdmi driver



Required properties:

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

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

	region.

- interrupts: interrupt number to the cpu.

- hpd-gpio: following information about the hotplug gpio pin.

	a) phandle of the gpio controller node.

	b) pin number within the gpio controller.

	c) pin function mode.

	d) optional flags and pull up/down.

	e) drive strength.



Example:



	hdmi {

		compatible = "samsung,exynos5-hdmi";

		reg = <0x14530000 0x100000>;

		interrupts = <0 95 0>;

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

	};

Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
Device-Tree bindings for hdmiddc driver



Required properties:

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

- reg: I2C address of the hdmiddc device.



Example:



	hdmiddc {

		compatible = "samsung,exynos5-hdmiddc";

		reg = <0x50>;

	};

Documentation/devicetree/bindings/drm/exynos/hdmiphy.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
Device-Tree bindings for hdmiphy driver



Required properties:

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

- reg: I2C address of the hdmiphy device.



Example:



	hdmiphy {

		compatible = "samsung,exynos5-hdmiphy";

		reg = <0x38>;

	};

Documentation/devicetree/bindings/drm/exynos/mixer.txt

0 → 100644
+15 −0
Original line number Diff line number Diff line 
Device-Tree bindings for mixer driver



Required properties:

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

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

	region.

- interrupts: interrupt number to the cpu.



Example:



	mixer {

		compatible = "samsung,exynos5-mixer";

		reg = <0x14450000 0x10000>;

		interrupts = <0 94 0>;

	};

arch/arm/boot/dts/exynos5250-smdk5250.dts

+23 −1
Original line number Diff line number Diff line
@@ -56,7 +56,15 @@ 
	};



	i2c@12C80000 {

		status = "disabled";

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-max-bus-freq = <66000>;

		gpios = <&gpa0 6 3 3 0>,

			<&gpa0 7 3 3 0>;



		hdmiddc@50 {

			compatible = "samsung,exynos5-hdmiddc";

			reg = <0x50>;

		};

	};



	i2c@12C90000 {
@@ -79,6 +87,16 @@ 
		status = "disabled";

	};



	i2c@12CE0000 {

		samsung,i2c-sda-delay = <100>;

		samsung,i2c-max-bus-freq = <66000>;



		hdmiphy@38 {

			compatible = "samsung,exynos5-hdmiphy";

			reg = <0x38>;

		};

	};



	dwmmc_0: dwmmc0@12200000 {

		num-slots = <1>;

		supports-highspeed;
@@ -166,4 +184,8 @@ 
	spi_2: spi@12d40000 {

		status = "disabled";

	};



	hdmi {

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

	};

};