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

Merge tag 'renesas-arm64-dt-for-v4.6' of... 

Merge tag 'renesas-arm64-dt-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt64

Renesas ARM64 Based SoC DT Updates for v4.6

* Use SCIF fallback compatibility strings
* Add Baud Rate Generator (BRG) support for (H)SCIF
* Enable SCIF_CLK frequency and pins
* Enable USB 3.0 host
* Add Add USB-DMAC device nodes
* Complete SYS-DMAC device nodes

* tag 'renesas-arm64-dt-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  arm64: dts: salvator-x: Enable SCIF_CLK frequency and pins
  arm64: dts: r8a7795: Add BRG support for (H)SCIF
  arm64: dts: r8a7795: Rename the serial port clock to fck
  arm64: dts: r8a7795: Add SCIF fallback compatibility strings
  arm64: dts: r8a7795: Add USB-DMAC device nodes
  arm64: dts: salvator-x: enable usb3.0 host channel 0
  arm64: dts: r8a7795: Add USB3.0 host device nodes
  arm64: dts: r8a7795: Complete SYS-DMAC nodes

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4a6e0a77 a3fc85e2

arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts

+16 −0
Original line number Diff line number Diff line
@@ -93,6 +93,9 @@ 
};



&pfc {

	pinctrl-0 = <&scif_clk_pins>;

	pinctrl-names = "default";



	scif1_pins: scif1 {

		renesas,groups = "scif1_data_a", "scif1_ctrl";

		renesas,function = "scif1";
@@ -101,6 +104,10 @@ 
		renesas,groups = "scif2_data_a";

		renesas,function = "scif2";

	};

	scif_clk_pins: scif_clk {

		renesas,groups = "scif_clk_a";

		renesas,function = "scif_clk";

	};



	i2c2_pins: i2c2 {

		renesas,groups = "i2c2_a";
@@ -138,6 +145,11 @@ 
	status = "okay";

};



&scif_clk {

	clock-frequency = <14745600>;

	status = "okay";

};



&i2c2 {

	pinctrl-0 = <&i2c2_pins>;

	pinctrl-names = "default";
@@ -249,3 +261,7 @@ 
		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;

	};

};



&xhci0 {

	status = "okay";

};

arch/arm64/boot/dts/renesas/r8a7795.dtsi

+213 −36
Original line number Diff line number Diff line
@@ -99,6 +99,14 @@ 
		clock-frequency = <0>;

	};



	/* External SCIF clock - to be overridden by boards that provide it */

	scif_clk: scif {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <0>;

		status = "disabled";

	};



	soc {

		compatible = "simple-bus";

		interrupt-parent = <&gic>;
@@ -333,15 +341,102 @@ 
		};



		dmac0: dma-controller@e6700000 {

			/* Empty node for now */

			compatible = "renesas,dmac-r8a7795",

				     "renesas,rcar-dmac";

			reg = <0 0xe6700000 0 0x10000>;

			interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "error",

					"ch0", "ch1", "ch2", "ch3",

					"ch4", "ch5", "ch6", "ch7",

					"ch8", "ch9", "ch10", "ch11",

					"ch12", "ch13", "ch14", "ch15";

			clocks = <&cpg CPG_MOD 219>;

			clock-names = "fck";

			power-domains = <&cpg>;

			#dma-cells = <1>;

			dma-channels = <16>;

		};



		dmac1: dma-controller@e7300000 {

			/* Empty node for now */

			compatible = "renesas,dmac-r8a7795",

				     "renesas,rcar-dmac";

			reg = <0 0xe7300000 0 0x10000>;

			interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "error",

					"ch0", "ch1", "ch2", "ch3",

					"ch4", "ch5", "ch6", "ch7",

					"ch8", "ch9", "ch10", "ch11",

					"ch12", "ch13", "ch14", "ch15";

			clocks = <&cpg CPG_MOD 218>;

			clock-names = "fck";

			power-domains = <&cpg>;

			#dma-cells = <1>;

			dma-channels = <16>;

		};



		dmac2: dma-controller@e7310000 {

			/* Empty node for now */

			compatible = "renesas,dmac-r8a7795",

				     "renesas,rcar-dmac";

			reg = <0 0xe7310000 0 0x10000>;

			interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "error",

					"ch0", "ch1", "ch2", "ch3",

					"ch4", "ch5", "ch6", "ch7",

					"ch8", "ch9", "ch10", "ch11",

					"ch12", "ch13", "ch14", "ch15";

			clocks = <&cpg CPG_MOD 217>;

			clock-names = "fck";

			power-domains = <&cpg>;

			#dma-cells = <1>;

			dma-channels = <16>;

		};



		avb: ethernet@e6800000 {
@@ -387,11 +482,15 @@ 
		};



		hscif0: serial@e6540000 {

			compatible = "renesas,hscif-r8a7795", "renesas,hscif";

			compatible = "renesas,hscif-r8a7795",

				     "renesas,rcar-gen3-hscif",

				     "renesas,hscif";

			reg = <0 0xe6540000 0 96>;

			interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 520>;

			clock-names = "sci_ick";

			clocks = <&cpg CPG_MOD 520>,

				 <&cpg CPG_CORE R8A7795_CLK_S3D1>,

				 <&scif_clk>;

			clock-names = "fck", "brg_int", "scif_clk";

			dmas = <&dmac1 0x31>, <&dmac1 0x30>;

			dma-names = "tx", "rx";

			power-domains = <&cpg>;
@@ -399,11 +498,15 @@ 
		};



		hscif1: serial@e6550000 {

			compatible = "renesas,hscif-r8a7795", "renesas,hscif";

			compatible = "renesas,hscif-r8a7795",

				     "renesas,rcar-gen3-hscif",

				     "renesas,hscif";

			reg = <0 0xe6550000 0 96>;

			interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 519>;

			clock-names = "sci_ick";

			clocks = <&cpg CPG_MOD 519>,

				 <&cpg CPG_CORE R8A7795_CLK_S3D1>,

				 <&scif_clk>;

			clock-names = "fck", "brg_int", "scif_clk";

			dmas = <&dmac1 0x33>, <&dmac1 0x32>;

			dma-names = "tx", "rx";

			power-domains = <&cpg>;
@@ -411,11 +514,15 @@ 
		};



		hscif2: serial@e6560000 {

			compatible = "renesas,hscif-r8a7795", "renesas,hscif";

			compatible = "renesas,hscif-r8a7795",

				     "renesas,rcar-gen3-hscif",

				     "renesas,hscif";

			reg = <0 0xe6560000 0 96>;

			interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 518>;

			clock-names = "sci_ick";

			clocks = <&cpg CPG_MOD 518>,

				 <&cpg CPG_CORE R8A7795_CLK_S3D1>,

				 <&scif_clk>;

			clock-names = "fck", "brg_int", "scif_clk";

			dmas = <&dmac1 0x35>, <&dmac1 0x34>;

			dma-names = "tx", "rx";

			power-domains = <&cpg>;
@@ -423,11 +530,15 @@ 
		};



		hscif3: serial@e66a0000 {

			compatible = "renesas,hscif-r8a7795", "renesas,hscif";

			compatible = "renesas,hscif-r8a7795",

				     "renesas,rcar-gen3-hscif",

				     "renesas,hscif";

			reg = <0 0xe66a0000 0 96>;

			interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 517>;

			clock-names = "sci_ick";

			clocks = <&cpg CPG_MOD 517>,

				 <&cpg CPG_CORE R8A7795_CLK_S3D1>,

				 <&scif_clk>;

			clock-names = "fck", "brg_int", "scif_clk";

			dmas = <&dmac0 0x37>, <&dmac0 0x36>;

			dma-names = "tx", "rx";

			power-domains = <&cpg>;
@@ -435,11 +546,15 @@ 
		};



		hscif4: serial@e66b0000 {

			compatible = "renesas,hscif-r8a7795", "renesas,hscif";

			compatible = "renesas,hscif-r8a7795",

				     "renesas,rcar-gen3-hscif",

				     "renesas,hscif";

			reg = <0 0xe66b0000 0 96>;

			interrupts = <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 516>;

			clock-names = "sci_ick";

			clocks = <&cpg CPG_MOD 516>,

				 <&cpg CPG_CORE R8A7795_CLK_S3D1>,

				 <&scif_clk>;

			clock-names = "fck", "brg_int", "scif_clk";

			dmas = <&dmac0 0x39>, <&dmac0 0x38>;

			dma-names = "tx", "rx";

			power-domains = <&cpg>;
@@ -447,11 +562,14 @@ 
		};



		scif0: serial@e6e60000 {

			compatible = "renesas,scif-r8a7795", "renesas,scif";

			compatible = "renesas,scif-r8a7795",

				     "renesas,rcar-gen3-scif", "renesas,scif";

			reg = <0 0xe6e60000 0 64>;

			interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 207>;

			clock-names = "sci_ick";

			clocks = <&cpg CPG_MOD 207>,

				 <&cpg CPG_CORE R8A7795_CLK_S3D1>,

				 <&scif_clk>;

			clock-names = "fck", "brg_int", "scif_clk";

			dmas = <&dmac1 0x51>, <&dmac1 0x50>;

			dma-names = "tx", "rx";

			power-domains = <&cpg>;
@@ -459,11 +577,14 @@ 
		};



		scif1: serial@e6e68000 {

			compatible = "renesas,scif-r8a7795", "renesas,scif";

			compatible = "renesas,scif-r8a7795",

				     "renesas,rcar-gen3-scif", "renesas,scif";

			reg = <0 0xe6e68000 0 64>;

			interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 206>;

			clock-names = "sci_ick";

			clocks = <&cpg CPG_MOD 206>,

				 <&cpg CPG_CORE R8A7795_CLK_S3D1>,

				 <&scif_clk>;

			clock-names = "fck", "brg_int", "scif_clk";

			dmas = <&dmac1 0x53>, <&dmac1 0x52>;

			dma-names = "tx", "rx";

			power-domains = <&cpg>;
@@ -471,11 +592,14 @@ 
		};



		scif2: serial@e6e88000 {

			compatible = "renesas,scif-r8a7795", "renesas,scif";

			compatible = "renesas,scif-r8a7795",

				     "renesas,rcar-gen3-scif", "renesas,scif";

			reg = <0 0xe6e88000 0 64>;

			interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 310>;

			clock-names = "sci_ick";

			clocks = <&cpg CPG_MOD 310>,

				 <&cpg CPG_CORE R8A7795_CLK_S3D1>,

				 <&scif_clk>;

			clock-names = "fck", "brg_int", "scif_clk";

			dmas = <&dmac1 0x13>, <&dmac1 0x12>;

			dma-names = "tx", "rx";

			power-domains = <&cpg>;
@@ -483,11 +607,14 @@ 
		};



		scif3: serial@e6c50000 {

			compatible = "renesas,scif-r8a7795", "renesas,scif";

			compatible = "renesas,scif-r8a7795",

				     "renesas,rcar-gen3-scif", "renesas,scif";

			reg = <0 0xe6c50000 0 64>;

			interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 204>;

			clock-names = "sci_ick";

			clocks = <&cpg CPG_MOD 204>,

				 <&cpg CPG_CORE R8A7795_CLK_S3D1>,

				 <&scif_clk>;

			clock-names = "fck", "brg_int", "scif_clk";

			dmas = <&dmac0 0x57>, <&dmac0 0x56>;

			dma-names = "tx", "rx";

			power-domains = <&cpg>;
@@ -495,11 +622,14 @@ 
		};



		scif4: serial@e6c40000 {

			compatible = "renesas,scif-r8a7795", "renesas,scif";

			compatible = "renesas,scif-r8a7795",

				     "renesas,rcar-gen3-scif", "renesas,scif";

			reg = <0 0xe6c40000 0 64>;

			interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 203>;

			clock-names = "sci_ick";

			clocks = <&cpg CPG_MOD 203>,

				 <&cpg CPG_CORE R8A7795_CLK_S3D1>,

				 <&scif_clk>;

			clock-names = "fck", "brg_int", "scif_clk";

			dmas = <&dmac0 0x59>, <&dmac0 0x58>;

			dma-names = "tx", "rx";

			power-domains = <&cpg>;
@@ -507,11 +637,14 @@ 
		};



		scif5: serial@e6f30000 {

			compatible = "renesas,scif-r8a7795", "renesas,scif";

			compatible = "renesas,scif-r8a7795",

				     "renesas,rcar-gen3-scif", "renesas,scif";

			reg = <0 0xe6f30000 0 64>;

			interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 202>;

			clock-names = "sci_ick";

			clocks = <&cpg CPG_MOD 202>,

				 <&cpg CPG_CORE R8A7795_CLK_S3D1>,

				 <&scif_clk>;

			clock-names = "fck", "brg_int", "scif_clk";

			dmas = <&dmac1 0x5b>, <&dmac1 0x5a>;

			dma-names = "tx", "rx";

			power-domains = <&cpg>;
@@ -775,5 +908,49 @@ 
			clocks = <&cpg CPG_MOD 815>;

			status = "disabled";

		};



		xhci0: usb@ee000000 {

			compatible = "renesas,xhci-r8a7795";

			reg = <0 0xee000000 0 0xc00>;

			interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 328>;

			power-domains = <&cpg>;

			status = "disabled";

		};



		xhci1: usb@ee0400000 {

			compatible = "renesas,xhci-r8a7795";

			reg = <0 0xee040000 0 0xc00>;

			interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 327>;

			power-domains = <&cpg>;

			status = "disabled";

		};



		usb_dmac0: dma-controller@e65a0000 {

			compatible = "renesas,r8a7795-usb-dmac",

				     "renesas,usb-dmac";

			reg = <0 0xe65a0000 0 0x100>;

			interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "ch0", "ch1";

			clocks = <&cpg CPG_MOD 330>;

			power-domains = <&cpg>;

			#dma-cells = <1>;

			dma-channels = <2>;

		};



		usb_dmac1: dma-controller@e65b0000 {

			compatible = "renesas,r8a7795-usb-dmac",

				     "renesas,usb-dmac";

			reg = <0 0xe65b0000 0 0x100>;

			interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "ch0", "ch1";

			clocks = <&cpg CPG_MOD 331>;

			power-domains = <&cpg>;

			#dma-cells = <1>;

			dma-channels = <2>;

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE