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

Merge tag 'exynos-dt-1' of... 

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

From Kukjin Kim:
Update exynos DT for
- usb3phy and dwc3 for exynos5250
- keypad for exynos4412
- TMU clock for exynos4210
- MFC clock for exynos4
- DP controller for exynos5250
- G2D clock for exynos4
- some exynos boards

* tag 'exynos-dt-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

: (456 commits)
  ARM: dts: add ohci and ehci controller nodes for EXYNOS5440
  ARM: dts: Update G2D documentation for clock entries
  ARM: dts: Add clock entries to G2D node for exynos4x12
  ARM: dts: Add clock entries to G2D node for exynos4210
  ARM: dts: Remove duplicate and add missing G2D nodes
  clk: exynos4: Add additional G2D clocks
  ARM: dts: Document DP clock in samsung,exynos5-dp binding
  ARM: dts: add pin state information for DP HPD support to Exynos5250
  ARM: dts: add dts node for the ahci sata exynos5440
  ARM: dts: add vmmc regulator support for ODROID-X
  ARM: dts: add max77686 node entry for ODROID-X
  ARM: dts: Enable RTC by default on EXYNOS5440
  ARM: dts: Add display timing node to exynos5250-arndale.dts
  ARM: dts: Add clock provider information for DP controller in Exynos5250 SoC
  ARM: dts: Add DT node for DP controller for Arndale Board
  ARM: dts: Remove combiner IRQ node from exynos4x12.dtsi
  ARM: dts: add max8997 device node for exynos4210-origen board
  ARM: dts: Enable TMU on Origen4210 board
  ARM: dts: Add TMU clock entries to exynos4210.dtsi
  ARM: dts: Update MFC documentation for clock entries
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 18c0e596 a3808905

Documentation/devicetree/bindings/clock/exynos4-clock.txt

+2 −1
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ Exynos4 SoC and this is specified where applicable. 
  sclk_spi0_isp       174     Exynos4x12

  sclk_spi1_isp       175     Exynos4x12

  sclk_uart_isp       176     Exynos4x12

  sclk_fimg2d         177



	      [Peripheral Clock Gates]
@@ -129,7 +130,7 @@ Exynos4 SoC and this is specified where applicable. 
  smmu_mfcl           274

  smmu_mfcr           275

  g3d                 276

  g2d                 277     Exynos4210

  g2d                 277

  rotator             278     Exynos4210

  mdma                279     Exynos4210

  smmu_g2d            280     Exynos4210

Documentation/devicetree/bindings/gpu/samsung-g2d.txt

+5 −0
Original line number Diff line number Diff line
@@ -10,11 +10,16 @@ Required properties: 
	  mapped region.



  - interrupts : G2D interrupt number to the CPU.

  - clocks : from common clock binding: handle to G2D clocks.

  - clock-names : from common clock binding: must contain "sclk_fimg2d" and

		  "fimg2d", corresponding to entries in the clocks property.



Example:

	g2d@12800000 {

		compatible = "samsung,s5pv210-g2d";

		reg = <0x12800000 0x1000>;

		interrupts = <0 89 0>;

		clocks = <&clock 177>, <&clock 277>;

		clock-names = "sclk_fimg2d", "fimg2d";

		status = "disabled";

	};

Documentation/devicetree/bindings/media/s5p-mfc.txt

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ Required properties: 
	  mapped region.



  - interrupts : MFC interrupt number to the CPU.

  - clocks : from common clock binding: handle to mfc clocks.

  - clock-names : from common clock binding: must contain "sclk_mfc" and "mfc",

		  corresponding to entries in the clocks property.



  - samsung,mfc-r : Base address of the first memory bank used by MFC

		    for DMA contiguous memory allocation and its size.
@@ -34,6 +37,8 @@ mfc: codec@13400000 { 
	reg = <0x13400000 0x10000>;

	interrupts = <0 94 0>;

	samsung,power-domain = <&pd_mfc>;

	clocks = <&clock 170>, <&clock 273>;

	clock-names = "sclk_mfc", "mfc";

};



Board specific DT entry:

Documentation/devicetree/bindings/usb/exynos-usb.txt

+34 −0
Original line number Diff line number Diff line
@@ -48,3 +48,37 @@ Example: 
		clocks = <&clock 285>;

		clock-names = "usbhost";

	};



DWC3

Required properties:

 - compatible: should be "samsung,exynos5250-dwusb3" for USB 3.0 DWC3

	       controller.

 - #address-cells, #size-cells : should be '1' if the device has sub-nodes

				 with 'reg' property.

 - ranges: allows valid 1:1 translation between child's address space and

	   parent's address space

 - clocks: Clock IDs array as required by the controller.

 - clock-names: names of clocks correseponding to IDs in the clock property



Sub-nodes:

The dwc3 core should be added as subnode to Exynos dwc3 glue.

- dwc3 :

   The binding details of dwc3 can be found in:

   Documentation/devicetree/bindings/usb/dwc3.txt



Example:

	usb@12000000 {

		compatible = "samsung,exynos5250-dwusb3";

		clocks = <&clock 286>;

		clock-names = "usbdrd30";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		dwc3 {

			compatible = "synopsys,dwc3";

			reg = <0x12000000 0x10000>;

			interrupts = <0 72 0>;

			usb-phy = <&usb2_phy &usb3_phy>;

		};

	};

Documentation/devicetree/bindings/video/exynos_dp.txt

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ Required properties for dp-controller: 
		of memory mapped region.

	-interrupts:

		interrupt combiner values.

	-clocks:

		from common clock binding: handle to dp clock.

	-clock-names:

		from common clock binding: Shall be "dp".

	-interrupt-parent:

		phandle to Interrupt combiner node.

	-samsung,color-space:
@@ -61,6 +65,8 @@ SOC specific portion: 
		reg = <0x145b0000 0x10000>;

		interrupts = <10 3>;

		interrupt-parent = <&combiner>;

		clocks = <&clock 342>;

		clock-names = "dp";



		dptx-phy {

			reg = <0x10040720>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE