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

Merge tag 'renesas-arm64-dt2-for-v4.19' of... 

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

Second Round of Renesas ARM64 Based SoC DT Updates for v4.19

Corrections:

* Remove non-existing STBE region from Ether-AVB node in DT of
  R-Car E3 (r8a77990) SoC

Cleanups:

* Consistently use rwdt as label for Renesas Watchdog Timer devices
* Add second port to rcar_sound placeholder in DT of R-Car M3-N (r8a77965) SoC
* Fix adv7482 decimal unit addresses in DT of Salvator-X and -XS boards

Enhancements:

* Describe in DT:
  - INTC-EX of R-Car V3H (r8a77980) SoC
  - USB3.0 of R-Car E3 (r8a77980) SoC
  - All SCIF and HSCIF devices of R-Car D3 (r8a77995) SoC.
    Previously only SCIF2, used as the debug consile, was described.
  - All IPMMU devicesof R-Car M3-N (r8a77965), V3H (r8a77980) and
    E3 (r8a77990) SoCs
* Enable USB3.0 in DT of R-Car E3 (r8a77980) based Ebisu board
* Prefer HSCIF1 over SCIF1 in DT of Salvator-X and -XS boards

* tag 'renesas-arm64-dt2-for-v4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  arm64: dts: renesas: r8a77980: add INTC-EX support
  arm64: dts: renesas: r8a77990: Enable USB3.0 host for Ebisu board
  arm64: dts: renesas: r8a77995: Add SCIF {0,1,3,4,5} and all HSCIF device nodes
  arm64: dts: renesas: r8a779{65,80,90}: Add IPMMU devices nodes
  arm64: dts: renesas: Unify the labels for RWDT
  arm64: dts: renesas: salvator-common: Prefer HSCIF1 over SCIF1
  arm64: dts: renesas: r8a77965: Add second port to rcar_sound placeholder
  arm64: dts: renesas: salvator-common: Fix adv7482 decimal unit addresses
  arm64: dts: renesas: r8a77990: Remove non-existing STBE region

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d15d9e32 9a6c158f

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

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ 
		#size-cells = <2>;

		ranges;



		wdt0: watchdog@e6020000 {

		rwdt: watchdog@e6020000 {

			compatible = "renesas,r8a7795-wdt", "renesas,rcar-gen3-wdt";

			reg = <0 0xe6020000 0 0x0c>;

			clocks = <&cpg CPG_MOD 402>;

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

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ 
		#size-cells = <2>;

		ranges;



		wdt0: watchdog@e6020000 {

		rwdt: watchdog@e6020000 {

			compatible = "renesas,r8a7796-wdt",

				     "renesas,rcar-gen3-wdt";

			reg = <0 0xe6020000 0 0x0c>;

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

+93 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ 
		#size-cells = <2>;

		ranges;



		wdt0: watchdog@e6020000 {

		rwdt: watchdog@e6020000 {

			compatible = "renesas,r8a77965-wdt",

				     "renesas,rcar-gen3-wdt";

			reg = <0 0xe6020000 0 0x0c>;
@@ -704,6 +704,95 @@ 
			dma-channels = <16>;

		};



		ipmmu_ds0: mmu@e6740000 {

			compatible = "renesas,ipmmu-r8a77965";

			reg = <0 0xe6740000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 0>;

			power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_ds1: mmu@e7740000 {

			compatible = "renesas,ipmmu-r8a77965";

			reg = <0 0xe7740000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 1>;

			power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_hc: mmu@e6570000 {

			compatible = "renesas,ipmmu-r8a77965";

			reg = <0 0xe6570000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 2>;

			power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_ir: mmu@ff8b0000 {

			compatible = "renesas,ipmmu-r8a77965";

			reg = <0 0xff8b0000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 3>;

			power-domains = <&sysc R8A77965_PD_A3IR>;

			#iommu-cells = <1>;

		};



		ipmmu_mm: mmu@e67b0000 {

			compatible = "renesas,ipmmu-r8a77965";

			reg = <0 0xe67b0000 0 0x1000>;

			interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>;

			power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_mp: mmu@ec670000 {

			compatible = "renesas,ipmmu-r8a77965";

			reg = <0 0xec670000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 4>;

			power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_pv0: mmu@fd800000 {

			compatible = "renesas,ipmmu-r8a77965";

			reg = <0 0xfd800000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 6>;

			power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_rt: mmu@ffc80000 {

			compatible = "renesas,ipmmu-r8a77965";

			reg = <0 0xffc80000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 10>;

			power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_vc0: mmu@fe6b0000 {

			compatible = "renesas,ipmmu-r8a77965";

			reg = <0 0xfe6b0000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 12>;

			power-domains = <&sysc R8A77965_PD_A3VC>;

			#iommu-cells = <1>;

		};



		ipmmu_vi0: mmu@febd0000 {

			compatible = "renesas,ipmmu-r8a77965";

			reg = <0 0xfebd0000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 14>;

			power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_vp0: mmu@fe990000 {

			compatible = "renesas,ipmmu-r8a77965";

			reg = <0 0xfe990000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 16>;

			power-domains = <&sysc R8A77965_PD_A3VP>;

			#iommu-cells = <1>;

		};



		avb: ethernet@e6800000 {

			compatible = "renesas,etheravb-r8a77965",

				     "renesas,etheravb-rcar-gen3";
@@ -1269,6 +1358,9 @@ 
				port@0 {

					reg = <0>;

				};

				port@1 {

					reg = <1>;

				};

			};

		};

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

+79 −0
Original line number Diff line number Diff line
@@ -234,6 +234,22 @@ 
			#power-domain-cells = <1>;

		};



		intc_ex: interrupt-controller@e61c0000 {

			compatible = "renesas,intc-ex-r8a77980", "renesas,irqc";

			#interrupt-cells = <2>;

			interrupt-controller;

			reg = <0 0xe61c0000 0 0x200>;

			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH

				      GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 407>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			resets = <&cpg 407>;

		};



		i2c0: i2c@e6500000 {

			compatible = "renesas,i2c-r8a77980",

				     "renesas,rcar-gen3-i2c";
@@ -427,6 +443,69 @@ 
			};

		};



		ipmmu_ds1: mmu@e7740000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xe7740000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 0>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_vip0: mmu@e7b00000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xe7b00000 0 0x1000>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_vip1: mmu@e7960000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xe7960000 0 0x1000>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_ir: mmu@ff8b0000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xff8b0000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 3>;

			power-domains = <&sysc R8A77980_PD_A3IR>;

			#iommu-cells = <1>;

		};



		ipmmu_mm: mmu@e67b0000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xe67b0000 0 0x1000>;

			interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_rt: mmu@ffc80000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xffc80000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 10>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_vc0: mmu@fe6b0000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xfe6b0000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 12>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		ipmmu_vi0: mmu@febd0000 {

			compatible = "renesas,ipmmu-r8a77980";

			reg = <0 0xfebd0000 0 0x1000>;

			renesas,ipmmu-main = <&ipmmu_mm 14>;

			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;

			#iommu-cells = <1>;

		};



		avb: ethernet@e6800000 {

			compatible = "renesas,etheravb-r8a77980",

				     "renesas,etheravb-rcar-gen3";

arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts

+12 −0
Original line number Diff line number Diff line
@@ -71,6 +71,11 @@ 
		groups = "usb0_b";

		function = "usb0";

	};



	usb30_pins: usb30 {

		groups = "usb30";

		function = "usb30";

	};

};



&rwdt {
@@ -88,3 +93,10 @@ 


	status = "okay";

};



&xhci0 {

	pinctrl-0 = <&usb30_pins>;

	pinctrl-names = "default";



	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE