Commit 89cb3a4c authored Sep 23, 2018 by Olof Johansson

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

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

Renesas ARM64 Based SoC DT Updates for v4.20

* Correct whitespace around assignments

* R-Car Gen-3 SoCs:
  - Enable SDR104 for SD devices
  - Include R-Car product name in DTSI files to ease maintenance
* R-Car Gen-3 SoC based boards: Convert to new LVDS DT bindings
* R-Car Gen 3 Salvator-X and Salvator-XS boards:
  - Override secondary addresses of ADV748x to avoid address conflicts
* R-Car Gen 3 based Salvator-XS board: Enable SATA

* R-Car M3-N (r8a77965) SoC:
  - Add FDP1 device nodes
  - Move arm_cc630p and timer nodes to restore sort-order of file
  - Correct clock/reset for usb2_phy1
  - Correct HS-USB compat string
  - Add OPPs table for cpu devices enabling CPUFreq support
  - Add CAN device placeholder nodes to facilitate adding
    initial device tree for KF daughter board
  - Attach SYS-DMAC to the IPMMU
* R-Car M3-N (r8a77965) based ULCB board:
  - Initial device tree for board and KF daughter board

* R-Car E3 (r8a77990) SoC:
  - Add SYS-DMAC, I2C VIN, CSI-2, MSIOF device nodes
  - Add BRG support to SCIF2 which allows an increase in serial clock accuracy
  - Use CPG/MSSR and SYSC binding definitions
* R-Car E3 (r8a77990) based Ebisu board: Enable PWM

* R-Car D3 (r8a77995) SoC: Attach the SYS-DMAC to the IPMMU
* R-Car D3 (r8a77995) based Draak board: Sort device nodes

* R-Car V3H (r8a77980) based V3HSK board:
  - Move lvds0 node to restore sort-order of file
* R-Car V3H (r8a77980) SoC:
  - Add RWDT, CSI2 and VIN, Cortex-A53 PMU nodes
  - Move IPMMU and CAN clock nodes to restore sort-order of file

* R-Car V3M (r8a77970) SoC:
  - Add MMC nodes
  - Move CAN clock node to restore sort-order of file
* R-Car V3M (r8a77970) based V3MSK board: Add eMMC support
* R-Car V3H (r8a77980) based Condor board: Add PCIe, DU, LVDS and HDMI support

* RZ/G2M (r8a774a1) SoC:
  - Initial device tree
  - Add SYS-DMAC, SCIF, HSCIF, INTC-EX, EtherAVB, RWDT, pinctl, GPIO,
    SDHI, I2C, IIC-DVFS, thermal, IPMMU, MSIOF, Cortex-A53 CPU core,
    PWM, Audio, FCPF, FCPV, USB2.0, USB-DMAC, HSUSB and USB3.0 device nodes

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

: (58 commits)
  arm64: dts: r8a77965: add FDP1 device nodes
  arm64: dts: renesas: draak: Sort device nodes
  arm64: dts: renesas: enable SDR104 on R-Car Gen3
  arm64: dts: renesas: r8a77990: Add SYS-DMAC device nodes
  arm64: dts: renesas: r8a77990: Add I2C device nodes
  arm64: dts: renesas: r8a77990: Add VIN and CSI-2 device nodes
  arm64: dts: renesas: r8a77990: Add all MSIOF nodes
  arm64: dts: renesas: r8a7795: Move arm_cc630p node
  arm64: dts: renesas: r8a77990: Add BRG support to SCIF2
  arm64: dts: renesas: r8a77990: Use CPG/MSSR and SYSC binding definitions
  arm64: dts: renesas: salvator-xs: Improve SATA switch settings comments
  arm64: dts: renesas: r8a77965: Fix clock/reset for usb2_phy1
  arm64: dts: renesas: r8a77965: Fix HS-USB compatible
  arm64: dts: renesas: r8a77965: Move timer node
  arm64: dts: renesas: v3hsk: Move lvds0 node
  arm64: dts: renesas: Fix whitespace around assignments
  arm64: dts: renesas: r8a77965: m3nulcb-kf: Initial device tree
  arm64: dts: renesas: condor: add PCIe support
  arm64: dts: renesas: r8a77980: add PCIe support
  arm64: dts: renesas: r8a774a1: Add USB3.0 device nodes
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

parents fc48cf43 450d6079

arch/arm64/boot/dts/renesas/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,8 @@ dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb
		dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-m3ulcb-kf.dtb
		dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-xs.dtb
		dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-salvator-x.dtb r8a77965-salvator-xs.dtb
		dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-m3nulcb.dtb
		dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-m3nulcb-kf.dtb
		dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-eagle.dtb r8a77970-v3msk.dtb
		dtb-$(CONFIG_ARCH_R8A77980) += r8a77980-condor.dtb r8a77980-v3hsk.dtb
		dtb-$(CONFIG_ARCH_R8A77990) += r8a77990-ebisu.dtb

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

0 → 100644

+1664 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -40,12 +40,11 @@ &du {
		<&cpg CPG_MOD 723>,
		<&cpg CPG_MOD 722>,
		<&cpg CPG_MOD 721>,
		<&cpg CPG_MOD 727>,
		<&versaclock5 1>,
		<&x21_clk>,
		<&x22_clk>,
		<&versaclock5 2>;
		clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",
		clock-names = "du.0", "du.1", "du.2", "du.3",
		"dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";
		};

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

+9 −9

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* Device Tree Source for the r8a7795 ES1.x SoC
		* Device Tree Source for the R-Car H3 (R8A77950) ES1.x SoC
		*
		* Copyright (C) 2015 Renesas Electronics Corp.
		*/

arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts

+1 −2

Original line number	Diff line number	Diff line
		@@ -41,11 +41,10 @@ &du {
		<&cpg CPG_MOD 723>,
		<&cpg CPG_MOD 722>,
		<&cpg CPG_MOD 721>,
		<&cpg CPG_MOD 727>,
		<&versaclock5 1>,
		<&versaclock5 3>,
		<&versaclock5 4>,
		<&versaclock5 2>;
		clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",
		clock-names = "du.0", "du.1", "du.2", "du.3",
		"dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";
		};