Commit 2de1a7a8 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge most of tag 'tags/exynos-dt' of... 

Merge most of tag 'tags/exynos-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git into next/dt

From Kukjin Kim, these are device-tree updates for Exynos. Among the changes:
- add MIPI PHY node for exynos4
- update regulator for origen and exynos5250-arndale
- add support HDMI for exynos5250, exynos5420

* commit '93457b9c':
  ARM: dts: Add HDMI related I2C nodes for Arndale board
  ARM: dts: enable hdmi subsystem for exynos5420 smdk board
  ARM: dts: add dt nodes for hdmi subsystem for exynos5420
  ARM: dts: add i2c device nodes for Exynos5420
  ARM: dts: add clocks to hdmi dt node for exynos5250
  ARM: dts: add mixer clocks to mixer node for Exynos5250
  of/documentation: update with clock information for exynos hdmi subsystem
  ARM: dts: Disable Exynos5250 I2S controllers by default
  ARM: dts: Add reg property to regulator nodes in exynos5250-arndale
  ARM: dts: Add fixed voltage regulator to simple bus for origen
  ARM: dts: Add MIPI PHY node to exynos4.dtsi
parents d31a408f 93457b9c

Documentation/devicetree/bindings/video/exynos_hdmi.txt

+13 −1
Original line number Diff line number Diff line
@@ -12,7 +12,19 @@ Required properties: 
	a) phandle of the gpio controller node.

	b) pin number within the gpio controller.

	c) optional flags and pull up/down.



- clocks: list of clock IDs from SoC clock driver.

	a) hdmi: Gate of HDMI IP bus clock.

	b) sclk_hdmi: Gate of HDMI special clock.

	c) sclk_pixel: Pixel special clock, one of the two possible inputs of

		HDMI clock mux.

	d) sclk_hdmiphy: HDMI PHY clock output, one of two possible inputs of

		HDMI clock mux.

	e) mout_hdmi: It is required by the driver to switch between the 2

		parents i.e. sclk_pixel and sclk_hdmiphy. If hdmiphy is stable

		after configuration, parent is set to sclk_hdmiphy else

		sclk_pixel.

- clock-names: aliases as per driver requirements for above clock IDs:

	"hdmi", "sclk_hdmi", "sclk_pixel", "sclk_hdmiphy" and "mout_hdmi".

Example:



	hdmi {

Documentation/devicetree/bindings/video/exynos_mixer.txt

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ Required properties: 
- reg: physical base address of the mixer and length of memory mapped

	region.

- interrupts: interrupt number to the cpu.

- clocks: list of clock IDs from SoC clock driver.

	a) mixer: Gate of Mixer IP bus clock.

	b) sclk_hdmi: HDMI Special clock, one of the two possible inputs of

               mixer mux.



Example:

arch/arm/boot/dts/exynos4.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -49,6 +49,12 @@ 
		reg = <0x10000000 0x100>;

	};



	mipi_phy: video-phy@10020710 {

		compatible = "samsung,s5pv210-mipi-video-phy";

		reg = <0x10020710 8>;

		#phy-cells = <1>;

	};



	pd_mfc: mfc-power-domain@10023C40 {

		compatible = "samsung,exynos4210-pd";

		reg = <0x10023C40 0x20>;
@@ -161,6 +167,8 @@ 
			clock-names = "csis", "sclk_csis";

			bus-width = <4>;

			samsung,power-domain = <&pd_cam>;

			phys = <&mipi_phy 0>;

			phy-names = "csis";

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -174,6 +182,8 @@ 
			clock-names = "csis", "sclk_csis";

			bus-width = <2>;

			samsung,power-domain = <&pd_cam>;

			phys = <&mipi_phy 2>;

			phy-names = "csis";

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

arch/arm/boot/dts/exynos4210-origen.dts

+14 −7
Original line number Diff line number Diff line
@@ -32,14 +32,21 @@ 
		bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc";

	};



	mmc_reg: voltage-regulator {

	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		mmc_reg: regulator@0 {

			compatible = "regulator-fixed";

			reg = <0>;

			regulator-name = "VMEM_VDD_2.8V";

			regulator-min-microvolt = <2800000>;

			regulator-max-microvolt = <2800000>;

			gpio = <&gpx1 1 0>;

			enable-active-high;

		};

	};



	tmu@100C0000 {

		status = "okay";

arch/arm/boot/dts/exynos4412-origen.dts

+14 −7
Original line number Diff line number Diff line
@@ -32,14 +32,21 @@ 
		reg = <0x0203F000 0x1000>;

	};



	mmc_reg: voltage-regulator {

	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		mmc_reg: regulator@0 {

			compatible = "regulator-fixed";

			reg = <0>;

			regulator-name = "VMEM_VDD_2.8V";

			regulator-min-microvolt = <2800000>;

			regulator-max-microvolt = <2800000>;

			gpio = <&gpx1 1 0>;

			enable-active-high;

		};

	};



	pinctrl@11000000 {

		keypad_rows: keypad-rows {

CRA Git | Maintained and supported by SUSTech CRA and CCSE