Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

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

Pull "Second Round of Renesas ARM64 Based SoC DT Updates for v4.14" from Simon Horman:

* Add PFC device node to R-Car D3 (r8a77995)

  This is a step towards enabling devices that use multiplexed pins
  - including ethernet - on boards that use the r8a7796 SoC.

* Add USB nodes to R-Car M3-W (r8a7796)

  This is a step towards enabling USB devices on boards that
  use the r8a7796 SoC.

* Use newly added Gen-3 fallback compat string

  This is consistent with ongoing efforts to use per-generation
  fallback strings where appropriate across devices found
  on R-Car SoCs. The aim of the effort being to strike a balance
  between the limited information available about the compatibility
  of devices found on different SoCs and the desire to ease enabling
  devices on new SoCs.

  This has no run-time effect due to the presence of a per-SoC
  compat string.

* Cleanup whitespace and extra LVDS port label

  Minor cleanups, no run-time effect.

* tag 'renesas-arm64-dt2-for-v4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  arm64: dts: r8a77995: add pfc device node
  arm64: dts: r8a7796: Add HSUSB device node
  arm64: dts: r8a7796: Add USB-DMAC device nodes
  arm64: dts: r8a7796: Add USB3.0 host device node
  arm64: dts: r8a7796: add USB2.0 Host (EHCI/OHCI) device nodes
  arm64: dts: r8a7796: add usb2_phy device nodes
  arm64: dts: r8a7795: correct whitespace of companion property
  arm64: dts: r8a7795: Use R-Car SATA Gen3 fallback compat string
  arm64: dts: salvator-common: Remove extra LVDS port label
parents a282ac2d 1fa0b494

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

+6 −5
Original line number Diff line number Diff line
@@ -1451,7 +1451,8 @@ 
		};



		sata: sata@ee300000 {

			compatible = "renesas,sata-r8a7795";

			compatible = "renesas,sata-r8a7795",

				     "renesas,rcar-gen3-sata";

			reg = <0 0xee300000 0 0x200000>;

			interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 815>;

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

+105 −8
Original line number Diff line number Diff line
@@ -1223,36 +1223,133 @@ 
			dma-channels = <16>;

		};



		usb_dmac0: dma-controller@e65a0000 {

			compatible = "renesas,r8a7796-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 = <&sysc R8A7796_PD_ALWAYS_ON>;

			resets = <&cpg 330>;

			#dma-cells = <1>;

			dma-channels = <2>;

		};



		usb_dmac1: dma-controller@e65b0000 {

			compatible = "renesas,r8a7796-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 = <&sysc R8A7796_PD_ALWAYS_ON>;

			resets = <&cpg 331>;

			#dma-cells = <1>;

			dma-channels = <2>;

		};



		hsusb: usb@e6590000 {

			/* placeholder */

			compatible = "renesas,usbhs-r8a7796",

				     "renesas,rcar-gen3-usbhs";

			reg = <0 0xe6590000 0 0x100>;

			interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 704>;

			dmas = <&usb_dmac0 0>, <&usb_dmac0 1>,

			       <&usb_dmac1 0>, <&usb_dmac1 1>;

			dma-names = "ch0", "ch1", "ch2", "ch3";

			renesas,buswait = <11>;

			phys = <&usb2_phy0>;

			phy-names = "usb";

			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;

			resets = <&cpg 704>;

			status = "disabled";

		};



		xhci0: usb@ee000000 {

			/* placeholder */

			compatible = "renesas,xhci-r8a7796",

				     "renesas,rcar-gen3-xhci";

			reg = <0 0xee000000 0 0xc00>;

			interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 328>;

			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;

			resets = <&cpg 328>;

			status = "disabled";

		};



		ohci0: usb@ee080000 {

			/* placeholder */

			compatible = "generic-ohci";

			reg = <0 0xee080000 0 0x100>;

			interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 703>;

			phys = <&usb2_phy0>;

			phy-names = "usb";

			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;

			resets = <&cpg 703>;

			status = "disabled";

		};



		ehci0: usb@ee080100 {

			/* placeholder */

			compatible = "generic-ehci";

			reg = <0 0xee080100 0 0x100>;

			interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 703>;

			phys = <&usb2_phy0>;

			phy-names = "usb";

			companion= <&ohci0>;

			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;

			resets = <&cpg 703>;

			status = "disabled";

		};



		usb2_phy0: usb-phy@ee080200 {

			/* placeholder */

			compatible = "renesas,usb2-phy-r8a7796",

				     "renesas,rcar-gen3-usb2-phy";

			reg = <0 0xee080200 0 0x700>;

			interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 703>;

			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;

			resets = <&cpg 703>;

			#phy-cells = <0>;

			status = "disabled";

		};



		ohci1: usb@ee0a0000 {

			/* placeholder */

			compatible = "generic-ohci";

			reg = <0 0xee0a0000 0 0x100>;

			interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 702>;

			phys = <&usb2_phy1>;

			phy-names = "usb";

			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;

			resets = <&cpg 702>;

			status = "disabled";

		};



		ehci1: usb@ee0a0100 {

			/* placeholder */

			compatible = "generic-ehci";

			reg = <0 0xee0a0100 0 0x100>;

			interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 702>;

			phys = <&usb2_phy1>;

			phy-names = "usb";

			companion= <&ohci1>;

			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;

			resets = <&cpg 702>;

			status = "disabled";

		};



		usb2_phy1: usb-phy@ee0a0200 {

			/* placeholder */

			compatible = "renesas,usb2-phy-r8a7796",

				     "renesas,rcar-gen3-usb2-phy";

			reg = <0 0xee0a0200 0 0x700>;

			clocks = <&cpg CPG_MOD 702>;

			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;

			resets = <&cpg 702>;

			#phy-cells = <0>;

			status = "disabled";

		};



		sdhi0: sd@ee100000 {

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

+5 −0
Original line number Diff line number Diff line
@@ -122,6 +122,11 @@ 
			reg = <0 0xe6160000 0 0x0200>;

		};



		pfc: pfc@e6060000 {

			compatible = "renesas,pfc-r8a77995";

			reg = <0 0xe6060000 0 0x508>;

		};



		prr: chipid@fff00044 {

			compatible = "renesas,prr";

			reg = <0 0xfff00044 0 4>;

arch/arm64/boot/dts/renesas/salvator-common.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -268,10 +268,6 @@ 
				remote-endpoint = <&adv7123_in>;

			};

		};

		port@3 {

			lvds_connector: endpoint {

			};

		};

	};

};