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

Merge tag 'renesas-arm64-dt-for-v5.3' of... 

Merge tag 'renesas-arm64-dt-for-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into arm/dt

Renesas ARM64 Based SoC DT Updates for v5.3

* Renesas SoCs
  - Revise usb2_phy nodes and phys properties according to updated bindings
  - Use ip=on for bootargs

* R-Car Gen 3 and RZ/G2M (r8a774a1) SoCs
  - Add dynamic power coefficient
  - Create thermal zone to support IPA

* R-Car E3 (r8a77990) and D3 (r8a77995) SoCs
  - Point LVDS0 to its companion LVDS1

* R-Car E3 (r8a77990) SoC
  - Corresct register range of DU

* R-Car E3 (r8a77990) based Ebisu board
  - Remove renesas, no-ether-link property

* R-Car D3 (r8a77995) based Draak board:
  - Remove unnecessary index from vin4 port

* RZ/G2M (r8a774a1) based HiHope main and sub-boards:
  - Initial support
  - Describe CPU capacity and topoligy
  - Enable CMT, HDMI, LEDs, PCIe RWDT, SCIF, SDHI, TMU, and USB 2.0 and 3.0

* RZ/G2E (r8a774c0) SoC based EK874 board:
  - Clean up CPU compatible strings
  - Enable: Bluetooth, HDMI audio and video, TPU, USB 3.0 and WLAN

* tag 'renesas-arm64-dt-for-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

: (53 commits)
  arm64: dts: renesas: hihope-common: Remove "label" from LEDs
  arm64: dts: renesas: hihope-common: Add HDMI support
  arm64: dts: renesas: r8a774a1: Add HDMI encoder instance
  arm64: dts: renesas: r8a774a1: Add dynamic power coefficient
  arm64: dts: renesas: r8a774a1: Create thermal zone to support IPA
  arm64: dts: renesas: r8a774a1: Add CPU capacity-dmips-mhz
  arm64: dts: renesas: r8a774a1: Add CPU topology on r8a774a1 SoC
  arm64: dts: renesas: hihope-common: Add LEDs support
  arm64: dts: renesas: hihope-common: Enable USB3.0
  arm64: dts: renesas: hihope-common: Add USB 2.0 support
  arm64: dts: renesas: r8a774a1: Fix USB 2.0 clocks
  arm64: dts: renesas: r8a774a1: Add TMU device nodes
  arm64: dts: renesas: r8a774a1: Add CMT device nodes
  arm64: dts: renesas: hihope-common: Add uSD and eMMC
  arm64: dts: renesas: r8a77990: Fix register range of display node
  arm64: dts: renesas: cat874: Enable usb role switch support
  arm64: dts: renesas: cat874: Enable USB3.0 host/peripheral device node
  arm64: dts: renesas: r8a7799[05]: Point LVDS0 to its companion LVDS1
  arm64: dts: renesas: hihope-common: Add RWDT support
  arm64: dts: renesas: hihope-rzg2-ex: Enable PCIe support
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents cd75dd00 f6130381

arch/arm64/boot/dts/renesas/Makefile

+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m.dtb

dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-ex.dtb

dtb-$(CONFIG_ARCH_R8A774C0) += r8a774c0-cat874.dtb r8a774c0-ek874.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb r8a7795-h3ulcb.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-h3ulcb-kf.dtb

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

0 → 100644
+325 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Device Tree Source for the HiHope RZ/G2[MN] main board common parts

 *

 * Copyright (C) 2019 Renesas Electronics Corp.

 */



#include <dt-bindings/gpio/gpio.h>



/ {

	aliases {

		serial0 = &scif2;

	};



	chosen {

		bootargs = "ignore_loglevel";

		stdout-path = "serial0:115200n8";

	};



	hdmi0-out {

		compatible = "hdmi-connector";

		type = "a";



		port {

			hdmi0_con: endpoint {

				remote-endpoint = <&rcar_dw_hdmi0_out>;

			};

		};

	};



	leds {

		compatible = "gpio-leds";



		led0 {

			gpios = <&gpio6 11 GPIO_ACTIVE_HIGH>;

		};



		led1 {

			gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>;

		};



		led2 {

			gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>;

		};



		led3 {

			gpios = <&gpio0  0 GPIO_ACTIVE_HIGH>;

		};

	};



	reg_1p8v: regulator0 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-1.8V";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-boot-on;

		regulator-always-on;

	};



	reg_3p3v: regulator1 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-3.3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-boot-on;

		regulator-always-on;

	};



	vbus0_usb2: regulator-vbus0-usb2 {

		compatible = "regulator-fixed";



		regulator-name = "USB20_VBUS0";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;



		gpio = <&gpio6 16 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	vccq_sdhi0: regulator-vccq-sdhi0 {

		compatible = "regulator-gpio";



		regulator-name = "SDHI0 VccQ";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;



		gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>;

		gpios-states = <1>;

		states = <3300000 1

			  1800000 0>;

	};



	x302_clk: x302-clock {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <33000000>;

	};



	x304_clk: x304-clock {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <25000000>;

	};

};



&du {

	clocks = <&cpg CPG_MOD 724>,

		 <&cpg CPG_MOD 723>,

		 <&cpg CPG_MOD 722>,

		 <&versaclock5 1>,

		 <&x302_clk>,

		 <&versaclock5 2>;

	clock-names = "du.0", "du.1", "du.2",

		      "dclkin.0", "dclkin.1", "dclkin.2";

	status = "okay";

};



&ehci0 {

	status = "okay";

};



&ehci1 {

	status = "okay";

};



&extal_clk {

	clock-frequency = <16666666>;

};



&extalr_clk {

	clock-frequency = <32768>;

};



&gpio6 {

	usb1-reset {

		gpio-hog;

		gpios = <10 GPIO_ACTIVE_LOW>;

		output-low;

		line-name = "usb1-reset";

	};

};



&hdmi0 {

	status = "okay";



	ports {

		port@1 {

			reg = <1>;

			rcar_dw_hdmi0_out: endpoint {

				remote-endpoint = <&hdmi0_con>;

			};

		};

	};

};



&hsusb {

	dr_mode = "otg";

	status = "okay";

};



&i2c4 {

	clock-frequency = <400000>;

	status = "okay";



	versaclock5: clock-generator@6a {

		compatible = "idt,5p49v5923";

		reg = <0x6a>;

		#clock-cells = <1>;

		clocks = <&x304_clk>;

		clock-names = "xin";

	};

};



&ohci0 {

	status = "okay";

};



&ohci1 {

	status = "okay";

};



&pcie_bus_clk {

	clock-frequency = <100000000>;

};



&pfc {

	pinctrl-0 = <&scif_clk_pins>;

	pinctrl-names = "default";



	scif2_pins: scif2 {

		groups = "scif2_data_a";

		function = "scif2";

	};



	scif_clk_pins: scif_clk {

		groups = "scif_clk_a";

		function = "scif_clk";

	};



	sdhi0_pins: sd0 {

		groups = "sdhi0_data4", "sdhi0_ctrl";

		function = "sdhi0";

		power-source = <3300>;

	};



	sdhi0_pins_uhs: sd0_uhs {

		groups = "sdhi0_data4", "sdhi0_ctrl";

		function = "sdhi0";

		power-source = <1800>;

	};



	sdhi3_pins: sd3 {

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

		function = "sdhi3";

		power-source = <1800>;

	};



	usb0_pins: usb0 {

		groups = "usb0";

		function = "usb0";

	};



	usb1_pins: usb1 {

		mux {

			groups = "usb1";

			function = "usb1";

		};



		ovc {

			pins = "GP_6_27";

			bias-pull-up;

		};

	};



	usb30_pins: usb30 {

		groups = "usb30";

		function = "usb30";

	};

};



&rwdt {

	timeout-sec = <60>;

	status = "okay";

};



&scif2 {

	pinctrl-0 = <&scif2_pins>;

	pinctrl-names = "default";



	status = "okay";

};



&scif_clk {

	clock-frequency = <14745600>;

};



&sdhi0 {

	pinctrl-0 = <&sdhi0_pins>;

	pinctrl-1 = <&sdhi0_pins_uhs>;

	pinctrl-names = "default", "state_uhs";



	vmmc-supply = <&reg_3p3v>;

	vqmmc-supply = <&vccq_sdhi0>;

	cd-gpios = <&gpio3 12 GPIO_ACTIVE_LOW>;

	bus-width = <4>;

	sd-uhs-sdr50;

	sd-uhs-sdr104;

	status = "okay";

};



&sdhi3 {

	pinctrl-0 = <&sdhi3_pins>;

	pinctrl-1 = <&sdhi3_pins>;

	pinctrl-names = "default", "state_uhs";



	vmmc-supply = <&reg_3p3v>;

	vqmmc-supply = <&reg_1p8v>;

	bus-width = <8>;

	mmc-hs200-1_8v;

	non-removable;

	fixed-emmc-driver-type = <1>;

};



&usb_extal_clk {

	clock-frequency = <50000000>;

};



&usb2_phy0 {

	pinctrl-0 = <&usb0_pins>;

	pinctrl-names = "default";



	vbus-supply = <&vbus0_usb2>;

	status = "okay";

};



&usb2_phy1 {

	pinctrl-0 = <&usb1_pins>;

	pinctrl-names = "default";



	status = "okay";

};



&usb3_peri0 {

	phys = <&usb3_phy0>;

	phy-names = "usb";



	companion = <&xhci0>;



	status = "okay";

};



&usb3_phy0 {

	status = "okay";

};



&usb3s0_clk {

	clock-frequency = <100000000>;

};



&xhci0 {

	pinctrl-0 = <&usb30_pins>;

	pinctrl-names = "default";



	status = "okay";

};

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

0 → 100644
+63 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Device Tree Source for the RZ/G2[MN] HiHope sub board common parts

 *

 * Copyright (C) 2019 Renesas Electronics Corp.

 */



/ {

	aliases {

		ethernet0 = &avb;

	};



	chosen {

		bootargs = "ignore_loglevel rw root=/dev/nfs ip=on";

	};

};



&avb {

	pinctrl-0 = <&avb_pins>;

	pinctrl-names = "default";

	phy-handle = <&phy0>;

	phy-mode = "rgmii-txid";

	status = "okay";



	phy0: ethernet-phy@0 {

		rxc-skew-ps = <1500>;

		reg = <0>;

		interrupt-parent = <&gpio2>;

		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;

		reset-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;

	};

};



&pciec0 {

	status = "okay";

};



&pciec1 {

	status = "okay";

};



&pfc {

	pinctrl-0 = <&scif_clk_pins>;

	pinctrl-names = "default";



	avb_pins: avb {

		mux {

			groups = "avb_link", "avb_mdio", "avb_mii";

			function = "avb";

		};



		pins_mdio {

			groups = "avb_mdio";

			drive-strength = <24>;

		};



		pins_mii_tx {

			pins = "PIN_AVB_TX_CTL", "PIN_AVB_TXC", "PIN_AVB_TD0",

			       "PIN_AVB_TD1", "PIN_AVB_TD2", "PIN_AVB_TD3";

			drive-strength = <12>;

		};

	};

};

arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dts

0 → 100644
+15 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Device Tree Source for the HiHope RZ/G2M sub board

 *

 * Copyright (C) 2019 Renesas Electronics Corp.

 */



#include "r8a774a1-hihope-rzg2m.dts"

#include "hihope-rzg2-ex.dtsi"



/ {

	model = "HopeRun HiHope RZ/G2M with sub board";

	compatible = "hoperun,hihope-rzg2-ex", "hoperun,hihope-rzg2m",

		     "renesas,r8a774a1";

};

arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m.dts

0 → 100644
+26 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Device Tree Source for the HiHope RZ/G2M main board

 *

 * Copyright (C) 2019 Renesas Electronics Corp.

 */



/dts-v1/;

#include "r8a774a1.dtsi"

#include "hihope-common.dtsi"



/ {

	model = "HopeRun HiHope RZ/G2M main board based on r8a774a1";

	compatible = "hoperun,hihope-rzg2m", "renesas,r8a774a1";



	memory@48000000 {

		device_type = "memory";

		/* first 128MB is reserved for secure area. */

		reg = <0x0 0x48000000 0x0 0x78000000>;

	};



	memory@600000000 {

		device_type = "memory";

		reg = <0x6 0x00000000 0x0 0x80000000>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE