Commit c71fbbcd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-dt-bindings-for-v4.14' of... 

Merge tag 'renesas-dt-bindings-for-v4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Pull "Renesas ARM Based SoC DT Bindings Updates for v4.14" from Simon Horman:

* Document R-Car D3 (r8a77995) SoC and Draak board

* Document reserved SRAM for the SMP jump stub on R-Car Gen2 and RZ/G1 SoCs

  Geert Uytterhoeven says, "+Renesas R-Car Gen2 and RZ/G1 SoCs need a small
  piece of SRAM for the jump stub +for secondary CPU bringup and CPU
  hotplug.  +This memory is reserved by adding a child node to a
  "mmio-sram" node..."

* Add a VSP channel index to DU vsps

  Laurent Pinchart says, "multiple LIF instances in the VSP. The current DT
  bindings don't support specifying that kind of SoC integration scheme.
  Extend them with a VSP channel index."

* Add R-Car M3-W (r8a7796) HDMI TX DT bindings

  This is compatible with existing R-Car H3 (r8a7795) support

* tag 'renesas-dt-bindings-for-v4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Document Renesas Draak board DT bindings
  ARM: shmobile: Document R-Car D3 SoC DT bindings
  dt-bindings: display: rcar-du: Add a VSP channel index to the vsps DT property
  dt-bindings: sram: Document renesas,smp-sram
  dt-bindings: display: renesas: Add R-Car M3-W HDMI TX DT bindings
parents 1ade1fb0 100acb0b

Documentation/devicetree/bindings/arm/shmobile.txt

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ SoCs: 
    compatible = "renesas,r8a7795"

  - R-Car M3-W (R8A77960)

    compatible = "renesas,r8a7796"

  - R-Car D3 (R8A77995)

    compatible = "renesas,r8a77995"





Boards:
@@ -53,6 +55,8 @@ Boards: 
    compatible = "renesas,blanche", "renesas,r8a7792"

  - BOCK-W

    compatible = "renesas,bockw", "renesas,r8a7778"

  - Draak (RTP0RC77995SEB0010S)

    compatible = "renesas,draak", "renesas,r8a77995"

  - Genmai (RTK772100BC00000BR)

    compatible = "renesas,genmai", "renesas,r7s72100"

  - GR-Peach (X28A-M01-E/F)

Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required properties: 


- compatible : Shall contain one or more of

  - "renesas,r8a7795-hdmi" for R8A7795 (R-Car H3) compatible HDMI TX

  - "renesas,r8a7796-hdmi" for R8A7796 (R-Car M3-W) compatible HDMI TX

  - "renesas,rcar-gen3-hdmi" for the generic R-Car Gen3 compatible HDMI TX



    When compatible with generic versions, nodes must list the SoC-specific

Documentation/devicetree/bindings/display/renesas,du.txt

+30 −21
Original line number Diff line number Diff line
@@ -36,8 +36,10 @@ Required Properties: 
      When supplied they must be named "dclkin.x" with "x" being the input

      clock numerical index.



  - vsps: A list of phandles to the VSP nodes that handle the memory

    interfaces for the DU channels.

  - vsps: A list of phandle and channel index tuples to the VSPs that handle

    the memory interfaces for the DU channels. The phandle identifies the VSP

    instance that serves the DU channel, and the channel index identifies the

    LIF instance in that VSP.



Required nodes:
@@ -59,24 +61,24 @@ corresponding to each DU output. 
 R8A7796 (M3-W)	DPAD		HDMI		LVDS		-





Example: R8A7790 (R-Car H2) DU

Example: R8A7795 (R-Car H3) ES2.0 DU



	du: du@feb00000 {

		compatible = "renesas,du-r8a7790";

		reg = <0 0xfeb00000 0 0x70000>,

		      <0 0xfeb90000 0 0x1c>,

		      <0 0xfeb94000 0 0x1c>;

		reg-names = "du", "lvds.0", "lvds.1";

		interrupt-parent = <&gic>;

		interrupts = <0 256 IRQ_TYPE_LEVEL_HIGH>,

			     <0 268 IRQ_TYPE_LEVEL_HIGH>,

			     <0 269 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp7_clks R8A7790_CLK_DU0>,

		         <&mstp7_clks R8A7790_CLK_DU1>,

		         <&mstp7_clks R8A7790_CLK_DU2>,

		         <&mstp7_clks R8A7790_CLK_LVDS0>,

		         <&mstp7_clks R8A7790_CLK_LVDS1>;

		clock-names = "du.0", "du.1", "du.2", "lvds.0", "lvds.1";

	du: display@feb00000 {

		compatible = "renesas,du-r8a7795";

		reg = <0 0xfeb00000 0 0x80000>,

		      <0 0xfeb90000 0 0x14>;

		reg-names = "du", "lvds.0";

		interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 270 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cpg CPG_MOD 724>,

			 <&cpg CPG_MOD 723>,

			 <&cpg CPG_MOD 722>,

			 <&cpg CPG_MOD 721>,

			 <&cpg CPG_MOD 727>;

		clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0";

		vsps = <&vspd0 0>, <&vspd1 0>, <&vspd2 0>, <&vspd0 1>;



		ports {

			#address-cells = <1>;
@@ -89,12 +91,19 @@ Example: R8A7790 (R-Car H2) DU 
			};

			port@1 {

				reg = <1>;

				du_out_lvds0: endpoint {

				du_out_hdmi0: endpoint {

					remote-endpoint = <&dw_hdmi0_in>;

				};

			};

			port@2 {

				reg = <2>;

				du_out_lvds1: endpoint {

				du_out_hdmi1: endpoint {

					remote-endpoint = <&dw_hdmi1_in>;

				};

			};

			port@3 {

				reg = <3>;

				du_out_lvds0: endpoint {

				};

			};

		};

Documentation/devicetree/bindings/sram/renesas,smp-sram.txt

0 → 100644
+27 −0
Original line number Diff line number Diff line 
* Renesas SMP SRAM



Renesas R-Car Gen2 and RZ/G1 SoCs need a small piece of SRAM for the jump stub

for secondary CPU bringup and CPU hotplug.

This memory is reserved by adding a child node to a "mmio-sram" node, cfr.

Documentation/devicetree/bindings/sram/sram.txt.



Required child node properties:

  - compatible: Must be "renesas,smp-sram",

  - reg: Address and length of the reserved SRAM.

    The full physical (bus) address must be aligned to a 256 KiB boundary.





Example:



	icram1:	sram@e63c0000 {

		compatible = "mmio-sram";

		reg = <0 0xe63c0000 0 0x1000>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0 0 0xe63c0000 0x1000>;



		smp-sram@0 {

			compatible = "renesas,smp-sram";

			reg = <0 0x10>;

		};

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE