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

Commit 1f1ba836 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

From Kukjin Kim:

This includes supporting legacy i2c controller and ARM down clock
support for exynos5 and small changes.

[olof: It contains a dependency on samsung/hdmi for HDMI DT bindings, for some reason.]

* 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: EXYNOS: Clock settings for SATA and SATA PHY
  ARM: EXYNOS: Add ARM down clock support
  ARM: EXYNOS: Fix i2c suspend/resume for legacy controller
  ARM: EXYNOS: Add aliases for i2c controller
  ARM: EXYNOS: Setup legacy i2c controller interrupts
  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
  ARM: EXYNOS: Add dp clock support for EXYNOS5
  ARM: SAMSUNG: call clk_get_rate for debugfs rate files
  ARM: SAMSUNG: add clock_tree debugfs file in clock

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 97b129be b8edec0f

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>;

	};

};