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

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

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

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

Renesas ARM64 Based SoC DT Updates for v4.7

* Use USB3.0 fallback compatibility string in DT for r8a7795 SoC
* Add CAN support to DT for r8a7795 SoC

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

:
  arm64: dts: r8a7795: Use USB3.0 fallback compatibility string
  arm64: dts: r8a7795: Add CAN support
  arm64: dts: r8a7795: Add CAN external clock support

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0bab7359 81ae0ac3

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

+40 −2
Original line number Diff line number Diff line
@@ -115,6 +115,14 @@ 
		clock-frequency = <0>;

	};



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

	can_clk: can {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <0>;

		status = "disabled";

	};



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

	scif_clk: scif {

		compatible = "fixed-clock";
@@ -515,6 +523,36 @@ 
			#size-cells = <0>;

		};



		can0: can@e6c30000 {

			compatible = "renesas,can-r8a7795",

				     "renesas,rcar-gen3-can";

			reg = <0 0xe6c30000 0 0x1000>;

			interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 916>,

			       <&cpg CPG_CORE R8A7795_CLK_CANFD>,

			       <&can_clk>;

			clock-names = "clkp1", "clkp2", "can_clk";

			assigned-clocks = <&cpg CPG_CORE R8A7795_CLK_CANFD>;

			assigned-clock-rates = <40000000>;

			power-domains = <&cpg>;

			status = "disabled";

		};



		can1: can@e6c38000 {

			compatible = "renesas,can-r8a7795",

				     "renesas,rcar-gen3-can";

			reg = <0 0xe6c38000 0 0x1000>;

			interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 915>,

			       <&cpg CPG_CORE R8A7795_CLK_CANFD>,

			       <&can_clk>;

			clock-names = "clkp1", "clkp2", "can_clk";

			assigned-clocks = <&cpg CPG_CORE R8A7795_CLK_CANFD>;

			assigned-clock-rates = <40000000>;

			power-domains = <&cpg>;

			status = "disabled";

		};



		hscif0: serial@e6540000 {

			compatible = "renesas,hscif-r8a7795",

				     "renesas,rcar-gen3-hscif",
@@ -944,7 +982,7 @@ 
		};



		xhci0: usb@ee000000 {

			compatible = "renesas,xhci-r8a7795";

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

			reg = <0 0xee000000 0 0xc00>;

			interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 328>;
@@ -953,7 +991,7 @@ 
		};



		xhci1: usb@ee0400000 {

			compatible = "renesas,xhci-r8a7795";

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

			reg = <0 0xee040000 0 0xc00>;

			interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 327>;