Merge tag 'renesas-arm-dt2-for-v4.21' of... (857f0021) · Commits · 戴 / test

Merge tag 'renesas-arm-dt2-for-v4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Second Round of Renesas ARM Based SoC DT Updates for v4.21 * RZ/G1N (r8a7744) SoC - Describe in DT: SYS-DMAC, GPIO, Ethernet AVB, SMP, [H]SCIF{A|B}, I2C, USB 2.0 and 3.0 hosts, USB-DMAC, HSUSB, RWDT, Audio, CAN, IRQC, thermal, CMT, VIN, VSP, IPMMU, PMU, TPU, QSPI MSIOF, and PCIE - iWave G20D-Q7 board - Initial support - Enable eMMC, SDHI and SPIO NOR support - Add camera daughterboard * RZ/G1M (r8a7743) SoC - Remove legacy "renesas,rcar-thermal" compatibility * tag 'renesas-arm-dt2-for-v4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas : (34 commits) ARM: dts: r8a7744-iwg20m: Add SPI NOR support ARM: dts: iwg20d-q7-common: Move cmt/rwdt node out of RZ/G1M SOM ARM: dts: r8a7744: Add PCIe Controller device node ARM: dts: r8a7744: Add xhci support ARM: dts: r8a7744: Add MSIOF[012] support ARM: dts: r8a7744: Add QSPI support ARM: dts: r8a7744-iwg20d-q7-dbcm-ca: Add device tree for camera DB ARM: dts: r8a7744: Add TPU support ARM: dts: r8a7744: Add PWM SoC support ARM: dts: r8a7744: Add IPMMU DT nodes ARM: dts: r8a7744: Add VSP support ARM: dts: r8a7744: add VIN dt support ARM: dts: r8a7744: Add CMT SoC specific support ARM: dts: r8a7744: Add thermal device to DT ARM: dts: r8a7744: Add IRQC support ARM: dts: r8a7744: Add CAN support ARM: dts: r8a7744: Add audio support ARM: dts: r8a7744: Add RWDT node ARM: dts: r8a7744: Add USB-DMAC and HSUSB device nodes ARM: dts: r8a7744: USB 2.0 host support ... Signed-off-by:

Olof Johansson <olof@lixom.net>

arch/arm/boot/dts/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -836,6 +836,8 @@ dtb-$(CONFIG_ARCH_RENESAS) += \
		r8a7743-iwg20d-q7.dtb \
		r8a7743-iwg20d-q7-dbcm-ca.dtb \
		r8a7743-sk-rzg1m.dtb \
		r8a7744-iwg20d-q7.dtb \
		r8a7744-iwg20d-q7-dbcm-ca.dtb \
		r8a7745-iwg22d-sodimm.dtb \
		r8a7745-iwg22d-sodimm-dbhd-ca.dtb \
		r8a7745-sk-rzg1e.dtb \

arch/arm/boot/dts/iwg20d-q7-common.dtsi

+9 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,10 @@
		status = "okay";
		};

		&cmt0 {
		status = "okay";
		};

		&hsusb {
		status = "okay";
		pinctrl-0 = <&usb0_pins>;
		@@ -230,6 +234,11 @@
		};
		};

		&rwdt {
		timeout-sec = <60>;
		status = "okay";
		};

		&scif0 {
		pinctrl-0 = <&scif0_pins>;
		pinctrl-names = "default";

arch/arm/boot/dts/r8a7743-iwg20m.dtsi

+0 −9

Original line number	Diff line number	Diff line
		@@ -31,10 +31,6 @@
		};
		};

		&cmt0 {
		status = "okay";
		};

		&extal_clk {
		clock-frequency = <20000000>;
		};
		@@ -88,11 +84,6 @@
		};
		};

		&rwdt {
		timeout-sec = <60>;
		status = "okay";
		};

		&sdhi0 {
		pinctrl-0 = <&sdhi0_pins>;
		pinctrl-names = "default";

arch/arm/boot/dts/r8a7743.dtsi

+1 −2

Original line number	Diff line number	Diff line
		@@ -348,8 +348,7 @@

		thermal: thermal@e61f0000 {
		compatible = "renesas,thermal-r8a7743",
		"renesas,rcar-gen2-thermal",
		"renesas,rcar-thermal";
		"renesas,rcar-gen2-thermal";
		reg = <0 0xe61f0000 0 0x10>, <0 0xe61f0100 0 0x38>;
		interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&cpg CPG_MOD 522>;

arch/arm/boot/dts/r8a7744-iwg20d-q7-dbcm-ca.dts

0 → 100644

+17 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* Device Tree Source for the iWave Systems RZ/G1N Qseven board development
		* platform with camera daughter board
		*
		* Copyright (C) 2018 Renesas Electronics Corp.
		*/

		/dts-v1/;
		#include "r8a7744-iwg20m.dtsi"
		#include "iwg20d-q7-common.dtsi"
		#include "iwg20d-q7-dbcm-ca.dtsi"

		/ {
		model = "iWave Systems RZ/G1N Qseven development platform with camera add-on";
		compatible = "iwave,g20d", "iwave,g20m", "renesas,r8a7744";
		};

Admin message