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

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

Merge tag 'renesas-arm64-dt-for-v5.4-tag1' of... 

Merge tag 'renesas-arm64-dt-for-v5.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/dt

Renesas ARM64 DT updates for v5.4

  - CAN, BT, and WLAN support for the HiHope RZ/G2[MN] boards,
  - Sound support for RZ/G2M,
  - Sort nodes in various SoC and board DTSes,
  - Small fixes and improvements.

* tag 'renesas-arm64-dt-for-v5.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: (23 commits)
  arm64: dts: renesas: ulcb: Sort nodes
  arm64: dts: renesas: ulcb-kf: Sort nodes
  arm64: dts: renesas: salvator-common: Sort nodes
  arm64: dts: renesas: r8a7796: salvator-xs: Sort nodes
  arm64: dts: renesas: r8a7796: salvator-x: Sort nodes
  arm64: dts: renesas: r8a7795: salvator-xs: Sort nodes
  arm64: dts: renesas: r8a7795: salvator-x: Sort nodes
  arm64: dts: renesas: r8a7795-es1: salvator-x: Sort nodes
  arm64: dts: renesas: r8a77965: Sort nodes
  arm64: dts: renesas: r8a7795-es1: Sort nodes
  arm64: dts: renesas: r8a7795: Sort nodes
  arm64: dts: renesas: r8a774a1: Add SSIU support for sound
  arm64: dts: renesas: r8a774a1: Use extended audio dmac registers
  arm64: dts: renesas: hihope-common: Add WLAN support
  arm64: dts: renesas: hihope-common: Add BT support
  arm64: dts: renesas: hihope-common: Add PCA9654 I/O expander
  arm64: dts: renesas: hihope-rzg2-ex: Enable CAN interfaces
  arm64: dts: renesas: r8a774a1: Add CANFD support
  arm64: dts: renesas: r8a774a1: Add missing assigned-clocks for CAN[01]
  arm64: dts: renesas: r8a774c0: Add missing assigned-clocks for CAN[01]
  ...

Link: https://lore.kernel.org/r/20190802120355.1430-2-geert+renesas@glider.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2a2bb58a 0a05b3d7

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

+78 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
/ {

	aliases {

		serial0 = &scif2;

		serial1 = &hscif0;

	};



	chosen {
@@ -31,6 +32,13 @@ 
	leds {

		compatible = "gpio-leds";



		bt_active_led {

			label = "blue:bt";

			gpios = <&gpio7  0 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "hci0-power";

			default-state = "off";

		};



		led0 {

			gpios = <&gpio6 11 GPIO_ACTIVE_HIGH>;

		};
@@ -46,6 +54,13 @@ 
		led3 {

			gpios = <&gpio0  0 GPIO_ACTIVE_HIGH>;

		};



		wlan_active_led {

			label = "yellow:wlan";

			gpios = <&gpio7  1 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "phy0tx";

			default-state = "off";

		};

	};



	reg_1p8v: regulator0 {
@@ -90,6 +105,17 @@ 
			  1800000 0>;

	};



	wlan_en_reg: regulator-wlan_en {

		compatible = "regulator-fixed";

		regulator-name = "wlan-en-regulator";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		startup-delay-us = <70000>;



		gpio = <&gpio_expander 1 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	x302_clk: x302-clock {

		compatible = "fixed-clock";

		#clock-cells = <0>;
@@ -153,6 +179,19 @@ 
	};

};



&hscif0 {

	pinctrl-0 = <&hscif0_pins>;

	pinctrl-names = "default";



	uart-has-rtscts;

	status = "okay";



	bluetooth {

		compatible = "ti,wl1837-st";

		enable-gpios = <&gpio_expander 2 GPIO_ACTIVE_HIGH>;

	};

};



&hsusb {

	dr_mode = "otg";

	status = "okay";
@@ -162,6 +201,13 @@ 
	clock-frequency = <400000>;

	status = "okay";



	gpio_expander: gpio@20 {

		compatible = "onnn,pca9654";

		reg = <0x20>;

		gpio-controller;

		#gpio-cells = <2>;

	};



	versaclock5: clock-generator@6a {

		compatible = "idt,5p49v5923";

		reg = <0x6a>;
@@ -187,6 +233,11 @@ 
	pinctrl-0 = <&scif_clk_pins>;

	pinctrl-names = "default";



	hscif0_pins: hscif0 {

		groups = "hscif0_data", "hscif0_ctrl";

		function = "hscif0";

	};



	scif2_pins: scif2 {

		groups = "scif2_data_a";

		function = "scif2";
@@ -209,6 +260,12 @@ 
		power-source = <1800>;

	};



	sdhi2_pins: sd2 {

		groups = "sdhi2_data4", "sdhi2_ctrl";

		function = "sdhi2";

		power-source = <1800>;

	};



	sdhi3_pins: sd3 {

		groups = "sdhi3_data8", "sdhi3_ctrl", "sdhi3_ds";

		function = "sdhi3";
@@ -268,6 +325,27 @@ 
	status = "okay";

};



&sdhi2 {

	status = "okay";

	pinctrl-0 = <&sdhi2_pins>;

	pinctrl-names = "default";



	vmmc-supply = <&wlan_en_reg>;

	bus-width = <4>;

	non-removable;

	cap-power-off-card;

	keep-power-in-suspend;



	#address-cells = <1>;

	#size-cells = <0>;

	wlcore: wlcore@2 {

		compatible = "ti,wl1837";

		reg = <2>;

		interrupt-parent = <&gpio2>;

		interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;

	};

};



&sdhi3 {

	pinctrl-0 = <&sdhi3_pins>;

	pinctrl-1 = <&sdhi3_pins>;

arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi

+22 −0
Original line number Diff line number Diff line
@@ -31,6 +31,18 @@ 
	};

};



&can0 {

	pinctrl-0 = <&can0_pins>;

	pinctrl-names = "default";

	status = "okay";

};



&can1 {

	pinctrl-0 = <&can1_pins>;

	pinctrl-names = "default";

	status = "okay";

};



&pciec0 {

	status = "okay";

};
@@ -60,4 +72,14 @@ 
			drive-strength = <12>;

		};

	};



	can0_pins: can0 {

		groups = "can0_data_a";

		function = "can0";

	};



	can1_pins: can1 {

		groups = "can1_data";

		function = "can1";

	};

};

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

+261 −21
Original line number Diff line number Diff line
@@ -1128,6 +1128,8 @@ 
				 <&cpg CPG_CORE R8A774A1_CLK_CANFD>,

				 <&can_clk>;

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

			assigned-clocks = <&cpg CPG_CORE R8A774A1_CLK_CANFD>;

			assigned-clock-rates = <40000000>;

			power-domains = <&sysc R8A774A1_PD_ALWAYS_ON>;

			resets = <&cpg 916>;

			status = "disabled";
@@ -1142,11 +1144,38 @@ 
				 <&cpg CPG_CORE R8A774A1_CLK_CANFD>,

				 <&can_clk>;

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

			assigned-clocks = <&cpg CPG_CORE R8A774A1_CLK_CANFD>;

			assigned-clock-rates = <40000000>;

			power-domains = <&sysc R8A774A1_PD_ALWAYS_ON>;

			resets = <&cpg 915>;

			status = "disabled";

		};



		canfd: can@e66c0000 {

			compatible = "renesas,r8a774a1-canfd",

				     "renesas,rcar-gen3-canfd";

			reg = <0 0xe66c0000 0 0x8000>;

			interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cpg CPG_MOD 914>,

				 <&cpg CPG_CORE R8A774A1_CLK_CANFD>,

				 <&can_clk>;

			clock-names = "fck", "canfd", "can_clk";

			assigned-clocks = <&cpg CPG_CORE R8A774A1_CLK_CANFD>;

			assigned-clock-rates = <40000000>;

			power-domains = <&sysc R8A774A1_PD_ALWAYS_ON>;

			resets = <&cpg 914>;

			status = "disabled";



			channel0 {

				status = "disabled";

			};



			channel1 {

				status = "disabled";

			};

		};



		pwm0: pwm@e6e30000 {

			compatible = "renesas,pwm-r8a774a1", "renesas,pwm-rcar";

			reg = <0 0xe6e30000 0 0x8>;
@@ -1653,7 +1682,7 @@ 
				<0 0xec5a0000 0 0x100>,  /* ADG */

				<0 0xec540000 0 0x1000>, /* SSIU */

				<0 0xec541000 0 0x280>,  /* SSI */

				<0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/

				<0 0xec760000 0 0x200>;  /* Audio DMAC peri peri*/

			reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";



			clocks = <&cpg CPG_MOD 1005>,
@@ -1777,56 +1806,267 @@ 
				};

			};



			rcar_sound,ssiu {

				ssiu00: ssiu-0 {

					dmas = <&audma0 0x15>, <&audma1 0x16>;

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

				};

				ssiu01: ssiu-1 {

					dmas = <&audma0 0x35>, <&audma1 0x36>;

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

				};

				ssiu02: ssiu-2 {

					dmas = <&audma0 0x37>, <&audma1 0x38>;

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

				};

				ssiu03: ssiu-3 {

					dmas = <&audma0 0x47>, <&audma1 0x48>;

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

				};

				ssiu04: ssiu-4 {

					dmas = <&audma0 0x3F>, <&audma1 0x40>;

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

				};

				ssiu05: ssiu-5 {

					dmas = <&audma0 0x43>, <&audma1 0x44>;

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

				};

				ssiu06: ssiu-6 {

					dmas = <&audma0 0x4F>, <&audma1 0x50>;

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

				};

				ssiu07: ssiu-7 {

					dmas = <&audma0 0x53>, <&audma1 0x54>;

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

				};

				ssiu10: ssiu-8 {

					dmas = <&audma0 0x49>, <&audma1 0x4a>;

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

				};

				ssiu11: ssiu-9 {

					dmas = <&audma0 0x4B>, <&audma1 0x4C>;

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

				};

				ssiu12: ssiu-10 {

					dmas = <&audma0 0x57>, <&audma1 0x58>;

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

				};

				ssiu13: ssiu-11 {

					dmas = <&audma0 0x59>, <&audma1 0x5A>;

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

				};

				ssiu14: ssiu-12 {

					dmas = <&audma0 0x5F>, <&audma1 0x60>;

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

				};

				ssiu15: ssiu-13 {

					dmas = <&audma0 0xC3>, <&audma1 0xC4>;

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

				};

				ssiu16: ssiu-14 {

					dmas = <&audma0 0xC7>, <&audma1 0xC8>;

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

				};

				ssiu17: ssiu-15 {

					dmas = <&audma0 0xCB>, <&audma1 0xCC>;

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

				};

				ssiu20: ssiu-16 {

					dmas = <&audma0 0x63>, <&audma1 0x64>;

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

				};

				ssiu21: ssiu-17 {

					dmas = <&audma0 0x67>, <&audma1 0x68>;

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

				};

				ssiu22: ssiu-18 {

					dmas = <&audma0 0x6B>, <&audma1 0x6C>;

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

				};

				ssiu23: ssiu-19 {

					dmas = <&audma0 0x6D>, <&audma1 0x6E>;

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

				};

				ssiu24: ssiu-20 {

					dmas = <&audma0 0xCF>, <&audma1 0xCE>;

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

				};

				ssiu25: ssiu-21 {

					dmas = <&audma0 0xEB>, <&audma1 0xEC>;

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

				};

				ssiu26: ssiu-22 {

					dmas = <&audma0 0xED>, <&audma1 0xEE>;

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

				};

				ssiu27: ssiu-23 {

					dmas = <&audma0 0xEF>, <&audma1 0xF0>;

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

				};

				ssiu30: ssiu-24 {

					dmas = <&audma0 0x6f>, <&audma1 0x70>;

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

				};

				ssiu31: ssiu-25 {

					dmas = <&audma0 0x21>, <&audma1 0x22>;

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

				};

				ssiu32: ssiu-26 {

					dmas = <&audma0 0x23>, <&audma1 0x24>;

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

				};

				ssiu33: ssiu-27 {

					dmas = <&audma0 0x25>, <&audma1 0x26>;

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

				};

				ssiu34: ssiu-28 {

					dmas = <&audma0 0x27>, <&audma1 0x28>;

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

				};

				ssiu35: ssiu-29 {

					dmas = <&audma0 0x29>, <&audma1 0x2A>;

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

				};

				ssiu36: ssiu-30 {

					dmas = <&audma0 0x2B>, <&audma1 0x2C>;

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

				};

				ssiu37: ssiu-31 {

					dmas = <&audma0 0x2D>, <&audma1 0x2E>;

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

				};

				ssiu40: ssiu-32 {

					dmas =	<&audma0 0x71>, <&audma1 0x72>;

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

				};

				ssiu41: ssiu-33 {

					dmas = <&audma0 0x17>, <&audma1 0x18>;

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

				};

				ssiu42: ssiu-34 {

					dmas = <&audma0 0x19>, <&audma1 0x1A>;

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

				};

				ssiu43: ssiu-35 {

					dmas = <&audma0 0x1B>, <&audma1 0x1C>;

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

				};

				ssiu44: ssiu-36 {

					dmas = <&audma0 0x1D>, <&audma1 0x1E>;

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

				};

				ssiu45: ssiu-37 {

					dmas = <&audma0 0x1F>, <&audma1 0x20>;

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

				};

				ssiu46: ssiu-38 {

					dmas = <&audma0 0x31>, <&audma1 0x32>;

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

				};

				ssiu47: ssiu-39 {

					dmas = <&audma0 0x33>, <&audma1 0x34>;

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

				};

				ssiu50: ssiu-40 {

					dmas = <&audma0 0x73>, <&audma1 0x74>;

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

				};

				ssiu60: ssiu-41 {

					dmas = <&audma0 0x75>, <&audma1 0x76>;

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

				};

				ssiu70: ssiu-42 {

					dmas = <&audma0 0x79>, <&audma1 0x7a>;

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

				};

				ssiu80: ssiu-43 {

					dmas = <&audma0 0x7b>, <&audma1 0x7c>;

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

				};

				ssiu90: ssiu-44 {

					dmas = <&audma0 0x7d>, <&audma1 0x7e>;

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

				};

				ssiu91: ssiu-45 {

					dmas = <&audma0 0x7F>, <&audma1 0x80>;

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

				};

				ssiu92: ssiu-46 {

					dmas = <&audma0 0x81>, <&audma1 0x82>;

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

				};

				ssiu93: ssiu-47 {

					dmas = <&audma0 0x83>, <&audma1 0x84>;

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

				};

				ssiu94: ssiu-48 {

					dmas = <&audma0 0xA3>, <&audma1 0xA4>;

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

				};

				ssiu95: ssiu-49 {

					dmas = <&audma0 0xA5>, <&audma1 0xA6>;

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

				};

				ssiu96: ssiu-50 {

					dmas = <&audma0 0xA7>, <&audma1 0xA8>;

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

				};

				ssiu97: ssiu-51 {

					dmas = <&audma0 0xA9>, <&audma1 0xAA>;

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

				};

			};



			rcar_sound,ssi {

				ssi0: ssi-0 {

					interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;

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

					dmas = <&audma0 0x01>, <&audma1 0x02>;

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

				};

				ssi1: ssi-1 {

					interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;

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

					dmas = <&audma0 0x03>, <&audma1 0x04>;

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

				};

				ssi2: ssi-2 {

					interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;

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

					dmas = <&audma0 0x05>, <&audma1 0x06>;

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

				};

				ssi3: ssi-3 {

					interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;

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

					dmas = <&audma0 0x07>, <&audma1 0x08>;

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

				};

				ssi4: ssi-4 {

					interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;

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

					dmas = <&audma0 0x09>, <&audma1 0x0a>;

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

				};

				ssi5: ssi-5 {

					interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;

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

					dmas = <&audma0 0x0b>, <&audma1 0x0c>;

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

				};

				ssi6: ssi-6 {

					interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;

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

					dmas = <&audma0 0x0d>, <&audma1 0x0e>;

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

				};

				ssi7: ssi-7 {

					interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;

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

					dmas = <&audma0 0x0f>, <&audma1 0x10>;

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

				};

				ssi8: ssi-8 {

					interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;

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

					dmas = <&audma0 0x11>, <&audma1 0x12>;

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

				};

				ssi9: ssi-9 {

					interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;

					dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;

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

					dmas = <&audma0 0x13>, <&audma1 0x14>;

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

				};

			};

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

+4 −0
Original line number Diff line number Diff line
@@ -973,6 +973,8 @@ 
				 <&cpg CPG_CORE R8A774C0_CLK_CANFD>,

				 <&can_clk>;

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

			assigned-clocks = <&cpg CPG_CORE R8A774C0_CLK_CANFD>;

			assigned-clock-rates = <40000000>;

			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;

			resets = <&cpg 916>;

			status = "disabled";
@@ -987,6 +989,8 @@ 
				 <&cpg CPG_CORE R8A774C0_CLK_CANFD>,

				 <&can_clk>;

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

			assigned-clocks = <&cpg CPG_CORE R8A774C0_CLK_CANFD>;

			assigned-clock-rates = <40000000>;

			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;

			resets = <&cpg 915>;

			status = "disabled";

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

+13 −13
Original line number Diff line number Diff line
@@ -52,12 +52,6 @@ 
	status = "okay";

};



&sound_card {

	dais = <&rsnd_port0	/* ak4613 */

		&rsnd_port1	/* HDMI0  */

		&rsnd_port2>;	/* HDMI1  */

};



&hdmi0 {

	status = "okay";
@@ -108,6 +102,13 @@ 
	status = "okay";

};



&pfc {

	usb2_pins: usb2 {

		groups = "usb2";

		function = "usb2";

	};

};



&rcar_sound {

	ports {

		/* rsnd_port0 is on salvator-common */
@@ -138,17 +139,16 @@ 
	};

};



&pfc {

	usb2_pins: usb2 {

		groups = "usb2";

		function = "usb2";

	};

};



&sata {

	status = "okay";

};



&sound_card {

	dais = <&rsnd_port0	/* ak4613 */

		&rsnd_port1	/* HDMI0  */

		&rsnd_port2>;	/* HDMI1  */

};



&usb2_phy2 {

	pinctrl-0 = <&usb2_pins>;

	pinctrl-names = "default";